From e1490273ad6d21a0d31986f11fc4e14b84364217 Mon Sep 17 00:00:00 2001
From: Serein <2075337935@qq.com>
Date: Sun, 4 Aug 2024 18:45:36 +0800
Subject: [PATCH] fix: response data struct

---
 src/Infrastructure/Network/NetworkClient.cc          | 3 +--
 src/Infrastructure/Network/Response/LoginResEntity.h | 4 ++--
 src/Infrastructure/Network/network.cc                | 2 +-
 3 files changed, 4 insertions(+), 5 deletions(-)

diff --git a/src/Infrastructure/Network/NetworkClient.cc b/src/Infrastructure/Network/NetworkClient.cc
index d49cdcf5..18cff822 100644
--- a/src/Infrastructure/Network/NetworkClient.cc
+++ b/src/Infrastructure/Network/NetworkClient.cc
@@ -57,10 +57,9 @@ JsonResult NetworkClient::handleResponse(http::response<http::dynamic_body> resp
     }
 
     nlohmann::basic_json<> res;
-    debug(), res.dump();
-
     try {
         res = nlohmann::json::parse(beast::buffers_to_string(response.body().data()));
+        debug(), res.dump();
     } catch (const nlohmann::json::parse_error& e) {
         return Err(Error(Error::JsonDes, e.what()));
     }
diff --git a/src/Infrastructure/Network/Response/LoginResEntity.h b/src/Infrastructure/Network/Response/LoginResEntity.h
index d96923b1..4ffe6a29 100644
--- a/src/Infrastructure/Network/Response/LoginResEntity.h
+++ b/src/Infrastructure/Network/Response/LoginResEntity.h
@@ -9,9 +9,9 @@ namespace evento {
 struct LoginResEntity {
     std::string accessToken;  // expires in 1 hour
     std::string refreshToken; // expires in 7 days, save it!
-    UserInfoEntity user;
+    UserInfoEntity userInfo;
 
-    NLOHMANN_DEFINE_TYPE_INTRUSIVE(LoginResEntity, accessToken, refreshToken, user);
+    NLOHMANN_DEFINE_TYPE_INTRUSIVE(LoginResEntity, accessToken, refreshToken, userInfo);
 };
 
 } // namespace evento
\ No newline at end of file
diff --git a/src/Infrastructure/Network/network.cc b/src/Infrastructure/Network/network.cc
index c64cba39..935701fa 100644
--- a/src/Infrastructure/Network/network.cc
+++ b/src/Infrastructure/Network/network.cc
@@ -46,7 +46,7 @@ void start_sast_link() {
                 std::string const service = "refresh-token";
 
                 keychain::Error err;
-                keychain::setPassword(package, service, entity.user.id, entity.refreshToken, err);
+                keychain::setPassword(package, service, entity.userInfo.id, entity.refreshToken, err);
 
                 if (err.code != 0) {
                     spdlog::error("Failed to save refresh token: {}\n", err.message);