@emilgroup/insurance-sdk 1.4.0-beta.0 → 1.4.0-beta.1

package/base.ts

@@ -59,8 +59,8 @@ export interface RequestArgs {
 }
 
 interface TokenData {
-    accessToken: string;
-    username: string;
+    accessToken?: string;
+    username?: string;
 }
 
 const NETWORK_ERROR_MESSAGE = "Network Error";
@@ -73,26 +73,25 @@ const NETWORK_ERROR_MESSAGE = "Network Error";
 export class BaseAPI {
     protected configuration: Configuration;
     private lastRequestConfig?: AxiosRequestConfig;
-    private tokenData: TokenData;
+    private tokenData?: TokenData;
 
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
+        this.tokenData = defaultStorage.get<TokenData>('TOKEN') || {};
+        
         if (configuration) {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
         } else {
-            this.tokenData = defaultStorage.get<TokenData>('TOKEN');
-            const { accessToken, username } = this.tokenData;
-
             this.configuration = new Configuration({
                 basePath: this.basePath,
-                accessToken: accessToken ? `Bearer ${accessToken}` : '',
-                username,
+                accessToken: this.tokenData?.accessToken ? `Bearer ${this.tokenData.accessToken}` : null,
+                username: this.tokenData?.username ? this.tokenData.username : null,
             });
         }
 
         this.attachInterceptor(axios);
     }
-    
+
     selectEnvironment(env: Environment) {
         this.configuration.basePath = env;
     }
@@ -142,12 +141,11 @@ export class BaseAPI {
 
         const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
-        this.tokenData.accessToken = accessToken;
-
-        defaultStorage.set<TokenData>('TOKEN', {
-            ...this.tokenData,
+        this.tokenData = {
             accessToken,
-        });
+            username
+        };
+        defaultStorage.set<TokenData>('TOKEN', this.tokenData);
 
         return accessToken;
     }
@@ -190,18 +188,18 @@ export class BaseAPI {
                             return Promise.reject(_error);
                         }
                     }
-                } else if(err.message === NETWORK_ERROR_MESSAGE 
+                } else if (err.message === NETWORK_ERROR_MESSAGE
                     && err.isAxiosError
                     && originalConfig.headers.hasOwnProperty('Authorization')
                     && _retry_count < 4
-                ){ 
+                ) {
                     _retry_count++;
                     try {
                         const tokenString = await this.refreshToken();
                         const accessToken = `Bearer ${tokenString}`;
 
                         _retry = true;
-                        originalConfig.headers['Authorization'] = accessToken; 
+                        originalConfig.headers['Authorization'] = accessToken;
 
                         this.configuration.accessToken = accessToken;
 
@@ -213,7 +211,7 @@ export class BaseAPI {
                             return Promise.reject(_error.response.data);
                         }
                         return Promise.reject(_error);
-                    }                    
+                    }
                 }
                 return Promise.reject(err);
             }

package/dist/base.d.ts

@@ -50,7 +50,7 @@ export declare class BaseAPI {
     protected axios: AxiosInstance;
     protected configuration: Configuration;
     private lastRequestConfig?;
-    private tokenData;
+    private tokenData?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
     selectEnvironment(env: Environment): void;
     authorize(username: string, password: string): Promise<void>;

package/dist/base.js

@@ -116,19 +116,19 @@ var BaseAPI = /** @class */ (function () {
     function BaseAPI(configuration, basePath, axios) {
         if (basePath === void 0) { basePath = exports.BASE_PATH; }
         if (axios === void 0) { axios = axios_1.default; }
+        var _a, _b;
         this.basePath = basePath;
         this.axios = axios;
+        this.tokenData = storage_1.defaultStorage.get('TOKEN') || {};
         if (configuration) {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
         }
         else {
-            this.tokenData = storage_1.defaultStorage.get('TOKEN');
-            var _a = this.tokenData, accessToken = _a.accessToken, username = _a.username;
             this.configuration = new configuration_1.Configuration({
                 basePath: this.basePath,
-                accessToken: accessToken ? "Bearer ".concat(accessToken) : '',
-                username: username,
+                accessToken: ((_a = this.tokenData) === null || _a === void 0 ? void 0 : _a.accessToken) ? "Bearer ".concat(this.tokenData.accessToken) : null,
+                username: ((_b = this.tokenData) === null || _b === void 0 ? void 0 : _b.username) ? this.tokenData.username : null,
             });
         }
         this.attachInterceptor(axios);
@@ -190,8 +190,11 @@ var BaseAPI = /** @class */ (function () {
                         return [4 /*yield*/, axios_1.default.request(options)];
                     case 1:
                         accessToken = (_a.sent()).data.accessToken;
-                        this.tokenData.accessToken = accessToken;
-                        storage_1.defaultStorage.set('TOKEN', __assign(__assign({}, this.tokenData), { accessToken: accessToken }));
+                        this.tokenData = {
+                            accessToken: accessToken,
+                            username: username
+                        };
+                        storage_1.defaultStorage.set('TOKEN', this.tokenData);
                         return [2 /*return*/, accessToken];
                 }
             });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emilgroup/insurance-sdk",
-  "version": "1.4.0-beta.0",
+  "version": "1.4.0-beta.1",
   "description": "OpenAPI client for @emilgroup/insurance-sdk",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [