edit

src/utils/api.ts

@@ -4,6 +4,7 @@ import { tokenManager } from './tokenManager';
 import config from '@/config';
 import { useAppBridge } from '@/hooks';
 
+
 class ApiClient {
   private instance: AxiosInstance;
   private isRefreshing = false;
@@ -11,9 +12,8 @@ class ApiClient {
     resolve: (value?: unknown) => void;
     reject: (error?: unknown) => void;
   }> = [];
-
+  private isNativeEnvironment: any;
-  //private isNativeEnvironment: boolean;
+  private requestRefreshToken: any;  
-  //private requestRefreshToken: () => Promise<any>;
 
   constructor() {
     this.instance = axios.create({
@@ -25,19 +25,7 @@ class ApiClient {
       },
     });
 
-    /*
-    
-    const { 
-      isNativeEnvironment,
-      openBiometricRegistrationPopup,
-      requestRefreshToken,
-      logout
-    } = useAppBridge();
-    this.isNativeEnvironment = isNativeEnvironment;
-    this.requestRefreshToken = requestRefreshToken;
-
     this.setupInterceptors();
-    */
   }
 
   private setupInterceptors(): void {
@@ -58,7 +46,7 @@ class ApiClient {
       (response: AxiosResponse) => response,
       async (error: AxiosError) => {
         const originalRequest = error.config as AxiosRequestConfig & { _retry?: boolean };
-
+        console.log('originalRequest ==> ',  JSON.stringify(originalRequest));
         if (error.response?.status === 401 && !originalRequest._retry) {
           if (this.isRefreshing) {
             return new Promise((resolve, reject) => {
@@ -76,7 +64,7 @@ class ApiClient {
           
           console.log('refreshToken!!');
             /*
-          this.requestRefreshToken().then((token) => {
+          this.requestRefreshToken1().then((token) => {
             console.log('requestRefreshToken +[' + JSON.stringify(token) + ']' );
           });
           
@@ -114,6 +102,16 @@ class ApiClient {
     
     this.failedQueue = [];
   }
+  /*
+  private async requestRefreshAccessToken(): Promise<any> {
+    const { 
+      isNativeEnvironment,
+      requestRefreshToken
+    } = useAppBridge();
+
+
+  }
+    */
 
   private async refreshAccessToken(): Promise<string> {
     const refreshToken = tokenManager.getRefreshToken();

src/widgets/sub-layout/index.tsx

@@ -67,7 +67,7 @@ export const SubLayout = () => {
       }
       console.log('token ' + JSON.stringify(token));
 
-      setLocalStorage(StorageKeys.Usrid, token.userId);
+      setLocalStorage(StorageKeys.Usrid, token.usrid);
       setLocalStorage(StorageKeys.TokenType, token.tokenType);
       setLocalStorage(StorageKeys.AccessToken, token.accessToken);
       setLocalStorage(StorageKeys.RefreshToken, token.refreshToken);
@@ -78,7 +78,7 @@ export const SubLayout = () => {
       setLocalStorage(StorageKeys.Requires2FA, token.requires2FA);
 
       useStore.getState().UserStore.setUserInfo({
-        usrid: token.userId,
+        usrid: token.usrid,
         tokenType: token.tokenType,
         accessToken: token.accessToken,
         refreshToken: token.refreshToken,