summaryrefslogtreecommitdiff
path: root/subprojects/battleNetApi/src
diff options
context:
space:
mode:
Diffstat (limited to 'subprojects/battleNetApi/src')
-rw-r--r--subprojects/battleNetApi/src/hearthstoneApi.cpp4
-rw-r--r--subprojects/battleNetApi/src/token.cpp11
2 files changed, 8 insertions, 7 deletions
diff --git a/subprojects/battleNetApi/src/hearthstoneApi.cpp b/subprojects/battleNetApi/src/hearthstoneApi.cpp
index d5b9aad..fb7c760 100644
--- a/subprojects/battleNetApi/src/hearthstoneApi.cpp
+++ b/subprojects/battleNetApi/src/hearthstoneApi.cpp
@@ -3,7 +3,9 @@
#include <format>
HearthstoneApi::HearthstoneApi()
- : mToken(std::format("{}/resources/token_info.txt", SOURCE_DIR_PATH)), m_header(generateRequestHeader()) {}
+ : mToken(std::format("{}/resources/token_info.txt", SOURCE_DIR_PATH), "2b50f1123b424d5e9c21971a110fdd04",
+ "MrMkhVMNdOeqPL4Q4XVQAsRPR14J7Yq6"),
+ m_header(generateRequestHeader()) {}
std::string HearthstoneApi::generateRequestHeader() {
return std::format("Authorization: Bearer {}", mToken.toString());
diff --git a/subprojects/battleNetApi/src/token.cpp b/subprojects/battleNetApi/src/token.cpp
index 056d80f..4e34490 100644
--- a/subprojects/battleNetApi/src/token.cpp
+++ b/subprojects/battleNetApi/src/token.cpp
@@ -6,7 +6,8 @@
#include <iostream>
#include <regex>
-Token::Token(const std::string &iTokenFilePath) : mFilePath{iTokenFilePath}, mToken{getValidToken()} {}
+Token::Token(const std::string &iTokenFilePath, const std::string &iUsername, const std::string &iPassword)
+ : mFilePath{iTokenFilePath}, mToken{getValidToken()}, mUsername{iUsername}, mPassword{iPassword} {}
std::string Token::toString() const { return mToken; }
@@ -35,9 +36,7 @@ void Token::refreshToken() const {
}
void Token::writeNewTokenToFile() const {
- const std::string kUser{"2b50f1123b424d5e9c21971a110fdd04"};
- const std::string kPassword{"MrMkhVMNdOeqPL4Q4XVQAsRPR14J7Yq6"};
- std::string aToken{getValidTokenWithApi(kUser, kPassword)};
+ std::string aToken{getValidTokenWithApi()};
if (not aToken.empty()) {
writeTokenToFile(aToken);
}
@@ -49,7 +48,7 @@ void Token::writeTokenToFile(const std::string &iToken) const {
token_file << iToken << " " << expires_at.count() << '\n';
}
-std::string Token::getValidTokenWithApi(const std::string &iUser, const std::string &iPassword) const {
+std::string Token::getValidTokenWithApi() const {
CURL *curl = curl_easy_init();
std::string token_info;
if (curl) {
@@ -58,7 +57,7 @@ std::string Token::getValidTokenWithApi(const std::string &iUser, const std::str
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYHOST, 0L);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curlCallbackStringOutput);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &token_info);
- curl_easy_setopt(curl, CURLOPT_USERPWD, std::format("{}:{}", iUser, iPassword).data());
+ curl_easy_setopt(curl, CURLOPT_USERPWD, std::format("{}:{}", mUsername, mPassword).data());
curl_easy_setopt(curl, CURLOPT_POSTFIELDS, "grant_type=client_credentials");
CURLcode result_code;
result_code = curl_easy_perform(curl);