diff options
| -rw-r--r-- | subprojects/battleNetApi/src/token.cpp | 19 |
1 files changed, 10 insertions, 9 deletions
diff --git a/subprojects/battleNetApi/src/token.cpp b/subprojects/battleNetApi/src/token.cpp index ba87dd9..89f0d2a 100644 --- a/subprojects/battleNetApi/src/token.cpp +++ b/subprojects/battleNetApi/src/token.cpp @@ -15,10 +15,10 @@ std::string Token::toString() const { return mToken; } std::string Token::getValidToken() const { refreshToken(); - std::ifstream aTokenFile(mFilePath); + std::ifstream aTokenFile{mFilePath}; std::string aLine; std::getline(aTokenFile, aLine); - const std::string kToken = aLine.substr(0, aLine.find(" ")); + const std::string kToken{aLine.substr(0, aLine.find(" "))}; return kToken; } @@ -34,8 +34,10 @@ void Token::refreshToken() const { const auto kConversionStatus{ std::from_chars(kTimeLimitText.data(), kTimeLimitText.data() + kTimeLimitText.size(), aTimeLimit)}; if (kConversionStatus.ec == std::errc{}) { - if (std::chrono::duration_cast<std::chrono::seconds>(std::chrono::utc_clock::now().time_since_epoch()) - .count() >= aTimeLimit) { + const bool kTokenExpired{ + std::chrono::duration_cast<std::chrono::seconds>(std::chrono::utc_clock::now().time_since_epoch()) + .count() >= aTimeLimit}; + if (kTokenExpired) { writeNewTokenToFile(); } } @@ -51,12 +53,12 @@ void Token::writeNewTokenToFile() const { void Token::writeTokenToFile(const std::string &iToken) const { std::ofstream aTokenFile{mFilePath}; - std::chrono::seconds aExpiresAt = getCurrentTime() + std::chrono::hours(24); + std::chrono::seconds aExpiresAt{getCurrentTime() + std::chrono::hours(24)}; aTokenFile << iToken << " " << aExpiresAt.count() << '\n'; } std::string Token::getValidTokenWithApi() const { - CURL *aCurl = curl_easy_init(); + CURL *aCurl{curl_easy_init()}; std::string aTokenInfo; if (aCurl) { curl_easy_setopt(aCurl, CURLOPT_URL, "https://oauth.battle.net/token"); @@ -66,8 +68,7 @@ std::string Token::getValidTokenWithApi() const { curl_easy_setopt(aCurl, CURLOPT_WRITEDATA, &aTokenInfo); curl_easy_setopt(aCurl, CURLOPT_USERPWD, std::format("{}:{}", mUsername, mPassword).data()); curl_easy_setopt(aCurl, CURLOPT_POSTFIELDS, "grant_type=client_credentials"); - CURLcode result_code; - result_code = curl_easy_perform(aCurl); + CURLcode result_code{curl_easy_perform(aCurl)}; curl_easy_cleanup(aCurl); if (result_code != CURLE_OK) { std::cerr << "ERROR: token request failed" << std::endl; @@ -93,7 +94,7 @@ std::string Token::extractTokenWithRegex(const std::string &iText, const std::st } size_t Token::curlCallbackStringOutput(void *iPtr, size_t iSize, size_t iNmemb, std::string *iUserData) { - size_t newLength = iSize * iNmemb; + size_t newLength{iSize * iNmemb}; try { iUserData->append(static_cast<char *>(iPtr), newLength); } catch (std::bad_alloc &e) { |