@emilgroup/customer-sdk-node 1.3.0 → 1.6.0

package/base.ts

@@ -61,6 +61,8 @@ export interface RequestArgs {
     options: AxiosRequestConfig;
 }
 
+const NETWORK_ERROR_MESSAGE = "Network Error";
+
 /**
  *
  * @export
@@ -68,6 +70,7 @@ export interface RequestArgs {
  */
 export class BaseAPI {
     protected configuration: Configuration | undefined;
+    private lastRequestConfig?: AxiosRequestConfig;
     private username?: string;
     private password?: string;
     private isCustomerToken = false;
@@ -156,10 +159,10 @@ export class BaseAPI {
         const response = await globalAxios.request<LoginClass>(options);
 
         const { data: { accessToken } } = response;
-        const refreshToken = this.extractRefreshToken(response)
-
         this.configuration.username = username;
         this.configuration.accessToken = `Bearer ${accessToken}`;
+
+        const refreshToken = this.extractRefreshToken(response);
         this.configuration.refreshToken = refreshToken;
     }
 
@@ -184,14 +187,14 @@ export class BaseAPI {
 
         if (response.data.authenticationResult) {
             const { accessToken } = response.data.authenticationResult;
-            const refreshToken = this.extractRefreshToken(response)
     
             this.configuration.username = username;
             this.configuration.tenantSlug = tenantSlug;
             this.configuration.accessToken = `Bearer ${accessToken}`;
-            this.configuration.refreshToken = refreshToken;
-
             this.isCustomerToken = true;
+
+            const refreshToken = this.extractRefreshToken(response);
+            this.configuration.refreshToken = refreshToken;
         }
 
         return response;
@@ -213,12 +216,12 @@ export class BaseAPI {
 
         if (response.data.authenticationResult) {
             const { accessToken } = response.data.authenticationResult;
-            const refreshToken = this.extractRefreshToken(response)
     
             this.configuration.accessToken = `Bearer ${accessToken}`;
-            this.configuration.refreshToken = refreshToken;
-
             this.isCustomerToken = true;
+
+            const refreshToken = this.extractRefreshToken(response);
+            this.configuration.refreshToken = refreshToken;
         }
 
         return response;
@@ -226,6 +229,7 @@ export class BaseAPI {
 
     async refreshTokenTenant(): Promise<string> {
         const { username, refreshToken } = this.configuration;
+        
 
         if (!username || !refreshToken) {
             return '';
@@ -241,7 +245,6 @@ export class BaseAPI {
             data: { username: username },
             withCredentials: true,
         };
-
         const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
         return accessToken;
@@ -265,14 +268,14 @@ export class BaseAPI {
             withCredentials: true,
         };
 
-        const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
+       const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
         return accessToken;
     }
 
     private extractRefreshToken(response: AxiosResponse): string {
-        if (response.headers && response.headers['set-cookie'] 
-                && response.headers['set-cookie'].length > 0) {
+        if (response.headers && response.headers['set-cookie']
+            && response.headers['set-cookie'].length > 0) {
 
             return `${response.headers['set-cookie'][0].split(';')[0]};`;
         }
@@ -281,12 +284,19 @@ export class BaseAPI {
     }
 
     private attachInterceptor(axios: AxiosInstance) {
+        axios.interceptors.request.use((config) => {
+            if (config.url?.indexOf('refresh-token') === -1) {
+                this.lastRequestConfig = config;
+            }
+
+            return config;
+        });
         axios.interceptors.response.use(
             (res) => {
                 return res;
             },
             async (err) => {
-                const originalConfig = err.config;
+                let originalConfig = err.config;
                 if (err.response) {
                     // Access Token was expired
                     if (err.response.status === 401 && !originalConfig._retry) {
@@ -321,6 +331,39 @@ export class BaseAPI {
                     if (err.response.status === 403 && err.response.data) {
                         return Promise.reject(err.response.data);
                     }
+                } else if (err.message === NETWORK_ERROR_MESSAGE && !originalConfig._retry) {
+                    try {
+                        let tokenString: string;
+                        if (this.isCustomerToken) {
+                            tokenString = await this.refreshTokenCustomer();
+                        } else {
+                            tokenString = await this.refreshTokenTenant();
+                        }
+                        const accessToken = `Bearer ${tokenString}`;
+
+                        const localVarHeaderParameter = {} as any;
+                        localVarHeaderParameter['Authorization'] = accessToken;
+
+                        this.lastRequestConfig.headers = {
+                            ...originalConfig.headers,
+                            ...localVarHeaderParameter,
+                        };
+
+                        originalConfig = {
+                            ...this.lastRequestConfig,
+                        }
+
+                        originalConfig._retry = true;
+
+                        this.configuration.accessToken = accessToken;
+
+                        return axios(originalConfig);
+                    } catch (_error) {
+                        if (_error.response && _error.response.data) {
+                            return Promise.reject(_error.response.data);
+                        }
+                        return Promise.reject(_error);
+                    }                    
                 }
                 return Promise.reject(err);
             }