2 files changed, 7 insertions, 8 deletions
diff --git a/battleNetApi/src/hearthstoneTokenBuilder.cpp b/battleNetApi/src/hearthstoneTokenBuilder.cpp
index 9509aa6..89466a5 100644
--- a/battleNetApi/src/hearthstoneTokenBuilder.cpp
+++ b/battleNetApi/src/hearthstoneTokenBuilder.cpp
@@ -26,7 +26,9 @@ HearthstoneTokenBuilder &HearthstoneTokenBuilder::buildToken() {
     // mCurrentToken = std::make_unique<Token>(...);
     return *this;
 }
+
 std::shared_ptr<Token> HearthstoneTokenBuilder::getToken() { return mCurrentToken; }
+
 HearthstoneTokenBuilder &HearthstoneTokenBuilder::allowUpdateSourceFile() {
     mUpdateSourceFile = true;
     return *this;
diff --git a/battleNetApi/src/token.cpp b/battleNetApi/src/token.cpp
index 6fcef1a..276c334 100644
--- a/battleNetApi/src/token.cpp
+++ b/battleNetApi/src/token.cpp
@@ -1,17 +1,14 @@
 #include "token.hpp"
 
-Token::Token(const std::string &iTokenText, const std::chrono::seconds &iExpirationTime)
-    : _tokenText{iTokenText}, _expirationTime{iExpirationTime} {}
+Token::Token(const std::string &iTokenText, const std::chrono::seconds &iLifetime)
+    : _tokenText{iTokenText}, _expirationTime{iLifetime + currentTime()} {}
 
 std::string Token::text() const { return _tokenText; }
 
 void Token::setText(const std::string &iTokenText) { _tokenText = iTokenText; }
 
-void Token::setExpirationTime(const std::chrono::seconds &iExpirationTime) {
-    _expirationTime = iExpirationTime;
+void Token::setLifetime(const std::chrono::seconds &iExpirationTime) {
+    _expirationTime = iExpirationTime + currentTime();
 }
 
-bool Token::isExpired() {
-    return _expirationTime <= std::chrono::duration_cast<std::chrono::seconds>(
-                                  std::chrono::steady_clock::now().time_since_epoch());
-}
+bool Token::isExpired() { return _expirationTime <= currentTime(); }