From 23714f3026ed29c063ab71a2270916162c7504f1 Mon Sep 17 00:00:00 2001
From: larry-internxt <larryrider@users.noreply.github.com>
Date: Thu, 17 Apr 2025 13:21:02 +0200
Subject: [PATCH] fix(auth): fix credential renewal tokens

---
 src/services/auth.service.ts | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/src/services/auth.service.ts b/src/services/auth.service.ts
index c9bfb277..558e6954 100644
--- a/src/services/auth.service.ts
+++ b/src/services/auth.service.ts
@@ -83,14 +83,14 @@ export class AuthService {
    */
   public getAuthDetails = async (): Promise<LoginCredentials> => {
     let loginCreds = await ConfigService.instance.readUser();
-    if (!(loginCreds?.newToken && loginCreds?.token && loginCreds?.user?.mnemonic)) {
+    if (!loginCreds?.newToken || !loginCreds?.token || !loginCreds?.user?.mnemonic) {
       throw new MissingCredentialsError();
     }
 
     const oldTokenDetails = ValidationService.instance.validateTokenAndCheckExpiration(loginCreds.token);
     const newTokenDetails = ValidationService.instance.validateTokenAndCheckExpiration(loginCreds.newToken);
     const isValidMnemonic = ValidationService.instance.validateMnemonic(loginCreds.user.mnemonic);
-    if (!(oldTokenDetails.isValid && newTokenDetails.isValid && isValidMnemonic)) {
+    if (!oldTokenDetails.isValid || !newTokenDetails.isValid || !isValidMnemonic) {
       throw new InvalidCredentialsError();
     }
 
@@ -113,6 +113,10 @@ export class AuthService {
    * @returns The user details and its auth tokens
    */
   public refreshUserTokens = async (oldCreds: LoginCredentials): Promise<LoginCredentials> => {
+    SdkManager.init({
+      token: oldCreds.token,
+      newToken: oldCreds.newToken,
+    });
     const usersClient = SdkManager.instance.getUsers(true);
     const newCreds = await usersClient.getUserData({ userUuid: oldCreds.user.uuid });
 
@@ -127,6 +131,10 @@ export class AuthService {
       lastLoggedInAt: oldCreds.lastLoggedInAt,
       lastTokenRefreshAt: new Date().toISOString(),
     };
+    SdkManager.init({
+      token: newCreds.oldToken,
+      newToken: newCreds.newToken,
+    });
     return loginCreds;
   };
 }