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

package/base.ts

@@ -12,8 +12,8 @@
  * Do not edit the class manually.
  */
 
-
 import { Configuration } from "./configuration";
+import { defaultStorage } from './storage';
 // Some imports not used depending on template conditions
 // @ts-ignore
 import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
@@ -34,7 +34,6 @@ export const COLLECTION_FORMATS = {
 export interface LoginClass {
     accessToken: string;
     permissions: Array<string>;
-    newPasswordRequired: boolean;
 }
 
 export enum Environment {
@@ -42,6 +41,13 @@ export enum Environment {
     Test = 'https://apiv2-test.emil.de',
 }
 
+let _retry_count = 0
+let _retry = null
+
+export function resetRetry() {
+    _retry_count = 0
+}
+
 /**
  *
  * @export
@@ -52,6 +58,11 @@ export interface RequestArgs {
     options: AxiosRequestConfig;
 }
 
+interface TokenData {
+    accessToken?: string;
+    username?: string;
+}
+
 const NETWORK_ERROR_MESSAGE = "Network Error";
 
 /**
@@ -62,20 +73,25 @@ const NETWORK_ERROR_MESSAGE = "Network Error";
 export class BaseAPI {
     protected configuration: Configuration;
     private lastRequestConfig?: AxiosRequestConfig;
+    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.configuration = new Configuration({
                 basePath: this.basePath,
+                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;
     }
@@ -98,6 +114,12 @@ export class BaseAPI {
         this.configuration.username = username;
         this.configuration.accessToken = `Bearer ${accessToken}`;
 
+        this.tokenData = {
+            username,
+            accessToken,
+        }
+
+        defaultStorage.set<TokenData>('TOKEN', this.tokenData);
     }
 
     async refreshToken(): Promise<string> {
@@ -119,6 +141,12 @@ export class BaseAPI {
 
         const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
+        this.tokenData = {
+            accessToken,
+            username
+        };
+        defaultStorage.set<TokenData>('TOKEN', this.tokenData);
+
         return accessToken;
     }
 
@@ -140,25 +168,19 @@ export class BaseAPI {
             },
             async (err) => {
                 let originalConfig = err.config;
-                if (err.response) {
+                if (err.response && !(err.response instanceof XMLHttpRequest)) {
                     // Access Token was expired
-                    if (err.response.status === 401 && !originalConfig._retry) {
+                    if ((err.response.status === 401 || err.response.status === 403) && !originalConfig._retry) {
                         originalConfig._retry = true;
                         try {
                             const tokenString = await this.refreshToken();
                             const accessToken = `Bearer ${tokenString}`;
 
-                            const localVarHeaderParameter = {} as any;
-                            localVarHeaderParameter['Authorization'] = accessToken;
-
-                            originalConfig.headers = {
-                                ...originalConfig.headers,
-                                ...localVarHeaderParameter,
-                            };
+                            originalConfig.headers['Authorization'] = `Bearer ${accessToken}`
 
                             this.configuration.accessToken = accessToken;
 
-                            return axios(originalConfig);
+                            return axios.request(originalConfig);
                         } catch (_error) {
                             if (_error.response && _error.response.data) {
                                 return Promise.reject(_error.response.data);
@@ -166,37 +188,30 @@ export class BaseAPI {
                             return Promise.reject(_error);
                         }
                     }
-                    if (err.response.status === 403 && err.response.data) {
-                        return Promise.reject(err.response.data);
-                    }
-                } else if (err.message === NETWORK_ERROR_MESSAGE && !originalConfig._retry) {
+                } 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}`;
 
-                        const localVarHeaderParameter = {} as any;
-                        localVarHeaderParameter['Authorization'] = accessToken;
-
-                        this.lastRequestConfig.headers = {
-                            ...originalConfig.headers,
-                            ...localVarHeaderParameter,
-                        };
-
-                        originalConfig = {
-                            ...this.lastRequestConfig,
-                        }
-
-                        originalConfig._retry = true;
+                        _retry = true;
+                        originalConfig.headers['Authorization'] = accessToken;
 
                         this.configuration.accessToken = accessToken;
 
-                        return axios(originalConfig);
+                        return axios.request({
+                            ...originalConfig,
+                        });
                     } catch (_error) {
                         if (_error.response && _error.response.data) {
                             return Promise.reject(_error.response.data);
                         }
                         return Promise.reject(_error);
-                    }                    
+                    }
                 }
                 return Promise.reject(err);
             }

package/dist/base.d.ts

@@ -25,12 +25,12 @@ export declare const COLLECTION_FORMATS: {
 export interface LoginClass {
     accessToken: string;
     permissions: Array<string>;
-    newPasswordRequired: boolean;
 }
 export declare enum Environment {
     Production = "https://apiv2.emil.de",
     Test = "https://apiv2-test.emil.de"
 }
+export declare function resetRetry(): void;
 /**
  *
  * @export
@@ -50,6 +50,7 @@ export declare class BaseAPI {
     protected axios: AxiosInstance;
     protected configuration: Configuration;
     private lastRequestConfig?;
+    private tokenData?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
     selectEnvironment(env: Environment): void;
     authorize(username: string, password: string): Promise<void>;

package/dist/base.js

@@ -78,8 +78,9 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RequiredError = exports.BaseAPI = exports.Environment = exports.COLLECTION_FORMATS = exports.BASE_PATH = void 0;
+exports.RequiredError = exports.BaseAPI = exports.resetRetry = exports.Environment = exports.COLLECTION_FORMATS = exports.BASE_PATH = void 0;
 var configuration_1 = require("./configuration");
+var storage_1 = require("./storage");
 // Some imports not used depending on template conditions
 // @ts-ignore
 var axios_1 = __importDefault(require("axios"));
@@ -99,6 +100,12 @@ var Environment;
     Environment["Production"] = "https://apiv2.emil.de";
     Environment["Test"] = "https://apiv2-test.emil.de";
 })(Environment = exports.Environment || (exports.Environment = {}));
+var _retry_count = 0;
+var _retry = null;
+function resetRetry() {
+    _retry_count = 0;
+}
+exports.resetRetry = resetRetry;
 var NETWORK_ERROR_MESSAGE = "Network Error";
 /**
  *
@@ -109,8 +116,10 @@ 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;
@@ -118,6 +127,8 @@ var BaseAPI = /** @class */ (function () {
         else {
             this.configuration = new configuration_1.Configuration({
                 basePath: this.basePath,
+                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);
@@ -147,6 +158,11 @@ var BaseAPI = /** @class */ (function () {
                         accessToken = response.data.accessToken;
                         this.configuration.username = username;
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
+                        this.tokenData = {
+                            username: username,
+                            accessToken: accessToken,
+                        };
+                        storage_1.defaultStorage.set('TOKEN', this.tokenData);
                         return [2 /*return*/];
                 }
             });
@@ -174,6 +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,
+                            username: username
+                        };
+                        storage_1.defaultStorage.set('TOKEN', this.tokenData);
                         return [2 /*return*/, accessToken];
                 }
             });
@@ -194,13 +215,13 @@ var BaseAPI = /** @class */ (function () {
         axios.interceptors.response.use(function (res) {
             return res;
         }, function (err) { return __awaiter(_this, void 0, void 0, function () {
-            var originalConfig, tokenString, accessToken, localVarHeaderParameter, _error_1, tokenString, accessToken, localVarHeaderParameter, _error_2;
+            var originalConfig, tokenString, accessToken, _error_1, tokenString, accessToken, _error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         originalConfig = err.config;
-                        if (!err.response) return [3 /*break*/, 5];
-                        if (!(err.response.status === 401 && !originalConfig._retry)) return [3 /*break*/, 4];
+                        if (!(err.response && !(err.response instanceof XMLHttpRequest))) return [3 /*break*/, 5];
+                        if (!((err.response.status === 401 || err.response.status === 403) && !originalConfig._retry)) return [3 /*break*/, 4];
                         originalConfig._retry = true;
                         _a.label = 1;
                     case 1:
@@ -209,24 +230,22 @@ var BaseAPI = /** @class */ (function () {
                     case 2:
                         tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        localVarHeaderParameter = {};
-                        localVarHeaderParameter['Authorization'] = accessToken;
-                        originalConfig.headers = __assign(__assign({}, originalConfig.headers), localVarHeaderParameter);
+                        originalConfig.headers['Authorization'] = "Bearer ".concat(accessToken);
                         this.configuration.accessToken = accessToken;
-                        return [2 /*return*/, axios(originalConfig)];
+                        return [2 /*return*/, axios.request(originalConfig)];
                     case 3:
                         _error_1 = _a.sent();
                         if (_error_1.response && _error_1.response.data) {
                             return [2 /*return*/, Promise.reject(_error_1.response.data)];
                         }
                         return [2 /*return*/, Promise.reject(_error_1)];
-                    case 4:
-                        if (err.response.status === 403 && err.response.data) {
-                            return [2 /*return*/, Promise.reject(err.response.data)];
-                        }
-                        return [3 /*break*/, 9];
+                    case 4: return [3 /*break*/, 9];
                     case 5:
-                        if (!(err.message === NETWORK_ERROR_MESSAGE && !originalConfig._retry)) return [3 /*break*/, 9];
+                        if (!(err.message === NETWORK_ERROR_MESSAGE
+                            && err.isAxiosError
+                            && originalConfig.headers.hasOwnProperty('Authorization')
+                            && _retry_count < 4)) return [3 /*break*/, 9];
+                        _retry_count++;
                         _a.label = 6;
                     case 6:
                         _a.trys.push([6, 8, , 9]);
@@ -234,13 +253,10 @@ var BaseAPI = /** @class */ (function () {
                     case 7:
                         tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        localVarHeaderParameter = {};
-                        localVarHeaderParameter['Authorization'] = accessToken;
-                        this.lastRequestConfig.headers = __assign(__assign({}, originalConfig.headers), localVarHeaderParameter);
-                        originalConfig = __assign({}, this.lastRequestConfig);
-                        originalConfig._retry = true;
+                        _retry = true;
+                        originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
-                        return [2 /*return*/, axios(originalConfig)];
+                        return [2 /*return*/, axios.request(__assign({}, originalConfig))];
                     case 8:
                         _error_2 = _a.sent();
                         if (_error_2.response && _error_2.response.data) {

package/dist/storage.d.ts

@@ -0,0 +1,15 @@
+export interface IStorageConverter<D, SD> {
+    toStorageData(data: D): SD;
+    fromStorageData(storageData: SD): D;
+}
+export interface IStorage {
+    get<T>(key: string, converter?: IStorageConverter<T, any>): T | null;
+    set<T>(key: string, value: T, converter?: IStorageConverter<T, any>): void;
+}
+export declare class LocalStorage implements IStorage {
+    readonly storage: Storage;
+    constructor();
+    get<T>(key: string, converter?: IStorageConverter<T, any>): T | null;
+    set<T>(key: string, value: T, converter?: IStorageConverter<T, any>): void;
+}
+export declare const defaultStorage: IStorage;

package/dist/storage.js

@@ -0,0 +1,32 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.defaultStorage = exports.LocalStorage = void 0;
+var LocalStorage = /** @class */ (function () {
+    function LocalStorage() {
+        this.storage = localStorage;
+    }
+    LocalStorage.prototype.get = function (key, converter) {
+        var jsonValue = this.storage.getItem(key);
+        if (jsonValue === null) {
+            return null;
+        }
+        var value = JSON.parse(jsonValue);
+        if (converter !== undefined) {
+            return converter.fromStorageData(value);
+        }
+        else {
+            return value;
+        }
+    };
+    LocalStorage.prototype.set = function (key, value, converter) {
+        var valueToStore = value;
+        if (converter !== undefined) {
+            valueToStore = converter.toStorageData(value);
+        }
+        var jsonValue = JSON.stringify(valueToStore);
+        this.storage.setItem(key, jsonValue);
+    };
+    return LocalStorage;
+}());
+exports.LocalStorage = LocalStorage;
+exports.defaultStorage = new LocalStorage();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emilgroup/insurance-sdk",
-  "version": "1.3.0",
+  "version": "1.4.0-beta.1",
   "description": "OpenAPI client for @emilgroup/insurance-sdk",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [
@@ -18,8 +18,7 @@
     "prepare": "npm run build"
   },
   "dependencies": {
-    "axios": "^0.26.1"
-    
+    "axios": "^0.27.2"
   },
   "devDependencies": {
    

package/storage.ts

@@ -0,0 +1,41 @@
+export interface IStorageConverter<D, SD> {
+  toStorageData( data: D ): SD;
+  fromStorageData( storageData: SD ): D;
+}
+
+export interface IStorage {
+  get<T>( key: string, converter?: IStorageConverter<T, any> ): T | null;
+  set<T>( key: string, value: T, converter?: IStorageConverter<T, any> ): void;
+}
+
+export class LocalStorage implements IStorage {
+  readonly storage: Storage;
+
+  constructor() {
+    this.storage = localStorage;
+  }
+
+  get<T>( key: string, converter?: IStorageConverter<T, any> ): T | null {
+    const jsonValue = this.storage.getItem( key );
+    if ( jsonValue === null ) {
+      return null;
+    }
+    const value = JSON.parse( jsonValue );
+    if ( converter !== undefined ) {
+      return converter.fromStorageData( value );
+    } else {
+      return value as T;
+    }
+  }
+
+  set<T>( key: string, value: T, converter?: IStorageConverter<T, any> ): void {
+    let valueToStore: any = value;
+    if ( converter !== undefined ) {
+      valueToStore = converter.toStorageData( value );
+    }
+    const jsonValue = JSON.stringify( valueToStore );
+    this.storage.setItem( key, jsonValue );
+  }
+}
+
+export const defaultStorage: IStorage = new LocalStorage();