refacto... but there is a segfault

1 files changed, 5 insertions, 6 deletions

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);