@emilgroup/account-sdk-node 1.1.0 → 1.3.0

package/README.md

@@ -10,18 +10,18 @@ Module system
 * CommonJS
 * ES6 module system
 
-Although this package can be used in both TypeScript and JavaScript, it is intended to be used with TypeScript. The definition should be automatically resolved via `package.json`. ([Reference](http://www.typescriptlang.org/docs/handbook/typings-for-npm-packages.html))
+Although this package can be used in both TypeScript and JavaScript, it is intended to be used with TypeScript. The definition should be automatically resolved via `package.json`. ([Reference](http://www.typescriptlang.org/docs/handbook/typings-for-npm-packages.html)). For more information, you can go to [Emil Api documentation](https://emil.stoplight.io/docs/emil-api/).
 
 ## Consuming
 
 Navigate to the folder of your consuming project and run one of the following commands:
 
 ```
-npm install @emilgroup/account-sdk-node@1.1.0 --save
+npm install @emilgroup/account-sdk-node@1.3.0 --save
 ```
 or 
 ```
-yarn add @emilgroup/account-sdk-node@1.1.0
+yarn add @emilgroup/account-sdk-node@1.3.0
 ```
 
 And then you can import `AccountsApi`.

package/api.ts

@@ -33,4 +33,5 @@ export * from './api/accounts-api';
 export enum Environment {
     Production = 'https://apiv2.emil.de',
     Test = 'https://apiv2-test.emil.de',
+    Development = 'https://apiv2-dev.emil.de',
 }

package/base.ts

@@ -21,7 +21,7 @@ import * as fs from 'fs';
 import * as path from 'path';
 import * as os from 'os';
 
-export const BASE_PATH = "http://localhost".replace(/\/+$/, "");
+export const BASE_PATH = "https://apiv2.emil.de".replace(/\/+$/, "");
 const CONFIG_DIRECTORY = '.emil';
 const CONFIG_FILENAME = 'credentials';
 const KEY_USERNAME = 'emil_username';
@@ -42,7 +42,6 @@ export const COLLECTION_FORMATS = {
 export interface LoginClass {
     accessToken: string;
     permissions: Array<string>;
-    newPasswordRequired: boolean;
 }
 
 export enum Environment {
@@ -50,6 +49,13 @@ export enum Environment {
     Test = 'https://apiv2-test.emil.de',
 }
 
+let _retry_count = 0
+let _retry = null
+
+export function resetRetry() {
+    _retry_count = 0
+}
+
 /**
  *
  * @export
@@ -60,6 +66,8 @@ export interface RequestArgs {
     options: AxiosRequestConfig;
 }
 
+const NETWORK_ERROR_MESSAGE = "Network Error";
+
 /**
  *
  * @export
@@ -154,15 +162,16 @@ 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;
     }
 
     async refreshToken(): Promise<string> {
         const { username, refreshToken } = this.configuration;
+        
 
         if (!username || !refreshToken) {
             return '';
@@ -204,7 +213,7 @@ export class BaseAPI {
                 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) {
@@ -213,17 +222,11 @@ export class BaseAPI {
                             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);
@@ -234,6 +237,30 @@ export class BaseAPI {
                     if (err.response.status === 403 && err.response.data) {
                         return Promise.reject(err.response.data);
                     }
+                } 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; 
+
+                        this.configuration.accessToken = accessToken;
+
+                        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);
             }
@@ -253,3 +280,4 @@ export class RequiredError extends Error {
         super(msg);
     }
 }
+

package/common.ts

@@ -136,3 +136,64 @@ export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxi
         return axios.request<T, R>(axiosRequestArgs);
     };
 }
+
+/* tslint:disable */
+/* eslint-disable */
+/**
+ * EMIL AccountService
+ * The EMIL AccountService API description
+ *
+ * The version of the OpenAPI document: 1.0
+ * 
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+
+
+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 );
+  }
+}
+
+let _defaultStorage: IStorage = null;
+
+export const defaultStorage = (): IStorage => {
+  return _defaultStorage || (_defaultStorage = new LocalStorage());
+};

package/dist/api/accounts-api.js

@@ -53,7 +53,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {

package/dist/api.d.ts

@@ -12,5 +12,6 @@
 export * from './api/accounts-api';
 export declare enum Environment {
     Production = "https://apiv2.emil.de",
-    Test = "https://apiv2-test.emil.de"
+    Test = "https://apiv2-test.emil.de",
+    Development = "https://apiv2-dev.emil.de"
 }

package/dist/api.js

@@ -33,4 +33,5 @@ var Environment;
 (function (Environment) {
     Environment["Production"] = "https://apiv2.emil.de";
     Environment["Test"] = "https://apiv2-test.emil.de";
+    Environment["Development"] = "https://apiv2-dev.emil.de";
 })(Environment = exports.Environment || (exports.Environment = {}));

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

package/dist/base.js

@@ -76,7 +76,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -101,7 +101,7 @@ 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");
 // Some imports not used depending on template conditions
 // @ts-ignore
@@ -109,7 +109,7 @@ var axios_1 = __importDefault(require("axios"));
 var fs = __importStar(require("fs"));
 var path = __importStar(require("path"));
 var os = __importStar(require("os"));
-exports.BASE_PATH = "http://localhost".replace(/\/+$/, "");
+exports.BASE_PATH = "https://apiv2.emil.de".replace(/\/+$/, "");
 var CONFIG_DIRECTORY = '.emil';
 var CONFIG_FILENAME = 'credentials';
 var KEY_USERNAME = 'emil_username';
@@ -130,6 +130,13 @@ 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";
 /**
  *
  * @export
@@ -253,9 +260,9 @@ var BaseAPI = /** @class */ (function () {
                     case 1:
                         response = _a.sent();
                         accessToken = response.data.accessToken;
-                        refreshToken = this.extractRefreshToken(response);
                         this.configuration.username = username;
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
+                        refreshToken = this.extractRefreshToken(response);
                         this.configuration.refreshToken = refreshToken;
                         return [2 /*return*/];
                 }
@@ -305,7 +312,7 @@ 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;
+            var originalConfig, tokenString, accessToken, _error_1, tokenString, accessToken, _error_2;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -320,11 +327,9 @@ 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) {
@@ -335,8 +340,31 @@ var BaseAPI = /** @class */ (function () {
                         if (err.response.status === 403 && err.response.data) {
                             return [2 /*return*/, Promise.reject(err.response.data)];
                         }
-                        _a.label = 5;
-                    case 5: return [2 /*return*/, Promise.reject(err)];
+                        return [3 /*break*/, 9];
+                    case 5:
+                        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]);
+                        return [4 /*yield*/, this.refreshToken()];
+                    case 7:
+                        tokenString = _a.sent();
+                        accessToken = "Bearer ".concat(tokenString);
+                        _retry = true;
+                        originalConfig.headers['Authorization'] = accessToken;
+                        this.configuration.accessToken = accessToken;
+                        return [2 /*return*/, axios.request(__assign({}, originalConfig))];
+                    case 8:
+                        _error_2 = _a.sent();
+                        if (_error_2.response && _error_2.response.data) {
+                            return [2 /*return*/, Promise.reject(_error_2.response.data)];
+                        }
+                        return [2 /*return*/, Promise.reject(_error_2)];
+                    case 9: return [2 /*return*/, Promise.reject(err)];
                 }
             });
         }); });

package/dist/common.d.ts

@@ -64,3 +64,29 @@ export declare const toPathString: (url: URL) => string;
  * @export
  */
 export declare const createRequestFunction: (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) => <T = unknown, R = AxiosResponse<T, any>>(axios?: AxiosInstance, basePath?: string) => Promise<R>;
+/**
+ * EMIL AccountService
+ * The EMIL AccountService API description
+ *
+ * The version of the OpenAPI document: 1.0
+ *
+ *
+ * NOTE: This class is auto generated by OpenAPI Generator (https://openapi-generator.tech).
+ * https://openapi-generator.tech
+ * Do not edit the class manually.
+ */
+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/common.js

@@ -38,7 +38,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     function verb(n) { return function (v) { return step([n, v]); }; }
     function step(op) {
         if (f) throw new TypeError("Generator is already executing.");
-        while (_) try {
+        while (g && (g = 0, op[0] && (_ = 0)), _) try {
             if (f = 1, y && (t = op[0] & 2 ? y["return"] : op[0] ? y["throw"] || ((t = y["return"]) && t.call(y), 0) : y.next) && !(t = t.call(y, op[1])).done) return t;
             if (y = 0, t) op = [op[0] & 2, t.value];
             switch (op[0]) {
@@ -60,7 +60,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
     }
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.createRequestFunction = exports.toPathString = exports.serializeDataIfNeeded = exports.setSearchParams = exports.setOAuthToObject = exports.setBearerAuthToObject = exports.setBasicAuthToObject = exports.setApiKeyToObject = exports.assertParamExists = exports.DUMMY_BASE_URL = void 0;
+exports.defaultStorage = exports.LocalStorage = exports.createRequestFunction = exports.toPathString = exports.serializeDataIfNeeded = exports.setSearchParams = exports.setOAuthToObject = exports.setBearerAuthToObject = exports.setBasicAuthToObject = exports.setApiKeyToObject = exports.assertParamExists = exports.DUMMY_BASE_URL = void 0;
 var base_1 = require("./base");
 var url_1 = require("url");
 /**
@@ -242,3 +242,36 @@ var createRequestFunction = function (axiosArgs, globalAxios, BASE_PATH, configu
     };
 };
 exports.createRequestFunction = createRequestFunction;
+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;
+var _defaultStorage = null;
+var defaultStorage = function () {
+    return _defaultStorage || (_defaultStorage = new LocalStorage());
+};
+exports.defaultStorage = defaultStorage;

package/dist/models/account-class.d.ts

@@ -122,11 +122,11 @@ export interface AccountClass {
      * @type {object}
      * @memberof AccountClass
      */
-    'metadata': object;
+    'metadata'?: object;
     /**
      * Optional field contain custom fields
      * @type {object}
      * @memberof AccountClass
      */
-    'customFields': object;
+    'customFields'?: object;
 }

package/dist/models/create-account-request-dto.d.ts

@@ -99,4 +99,4 @@ export declare const CreateAccountRequestDtoGenderEnum: {
     readonly Female: "female";
     readonly Unspecified: "unspecified";
 };
-export declare type CreateAccountRequestDtoGenderEnum = typeof CreateAccountRequestDtoGenderEnum[keyof typeof CreateAccountRequestDtoGenderEnum];
+export type CreateAccountRequestDtoGenderEnum = typeof CreateAccountRequestDtoGenderEnum[keyof typeof CreateAccountRequestDtoGenderEnum];

package/dist/models/update-account-request-dto.d.ts

@@ -105,4 +105,4 @@ export declare const UpdateAccountRequestDtoGenderEnum: {
     readonly Female: "female";
     readonly Unspecified: "unspecified";
 };
-export declare type UpdateAccountRequestDtoGenderEnum = typeof UpdateAccountRequestDtoGenderEnum[keyof typeof UpdateAccountRequestDtoGenderEnum];
+export type UpdateAccountRequestDtoGenderEnum = typeof UpdateAccountRequestDtoGenderEnum[keyof typeof UpdateAccountRequestDtoGenderEnum];

package/models/account-class.ts

@@ -127,12 +127,12 @@ export interface AccountClass {
      * @type {object}
      * @memberof AccountClass
      */
-    'metadata': object;
+    'metadata'?: object;
     /**
      * Optional field contain custom fields
      * @type {object}
      * @memberof AccountClass
      */
-    'customFields': object;
+    'customFields'?: object;
 }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emilgroup/account-sdk-node",
-  "version": "1.1.0",
+  "version": "1.3.0",
   "description": "OpenAPI client for @emilgroup/account-sdk-node",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [
@@ -18,12 +18,12 @@
     "prepare": "npm run build"
   },
   "dependencies": {
-    "axios": "^0.26.1",
+    "axios": "^0.27.2",
     "form-data": "^4.0.0",
     "url": "^0.11.0"
   },
   "devDependencies": {
-    "@types/node": "^12.11.5",
+   "@types/node": "^12.11.5",
     "typescript": "^4.0"
   }
 }