@emilgroup/billing-sdk-node 1.1.0 → 1.3.0

package/README.md

@@ -17,11 +17,11 @@ Although this package can be used in both TypeScript and JavaScript, it is inten
 Navigate to the folder of your consuming project and run one of the following commands:
 
 ```
-npm install @emilgroup/billing-sdk-node@1.1.0 --save
+npm install @emilgroup/billing-sdk-node@1.3.0 --save
 ```
 or 
 ```
-yarn add @emilgroup/billing-sdk-node@1.1.0
+yarn add @emilgroup/billing-sdk-node@1.3.0
 ```
 
 And then you can import `InvoicesApi`.

package/base.ts

@@ -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
@@ -69,7 +75,6 @@ const NETWORK_ERROR_MESSAGE = "Network Error";
  */
 export class BaseAPI {
     protected configuration: Configuration;
-    private lastRequestConfig?: AxiosRequestConfig;
     private username?: string;
     private password?: string;
 
@@ -182,6 +187,7 @@ export class BaseAPI {
             data: { username: username },
             withCredentials: true,
         };
+
         const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
         return accessToken;
@@ -202,13 +208,6 @@ 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;
@@ -223,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);
@@ -244,28 +237,24 @@ 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) {
+                } 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);
@@ -291,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 BillingService
+ * The EMIL BillingService 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/correction-invoices-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/estimated-invoices-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/initial-invoices-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/invoices-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/recurring-invoices-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/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
@@ -49,7 +49,6 @@ export declare class BaseAPI {
     protected basePath: string;
     protected axios: AxiosInstance;
     protected configuration: Configuration;
-    private lastRequestConfig?;
     private username?;
     private password?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);

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
@@ -130,6 +130,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";
 /**
  *
@@ -303,17 +309,10 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.attachInterceptor = function (axios) {
         var _this = this;
-        axios.interceptors.request.use(function (config) {
-            var _a;
-            if (((_a = config.url) === null || _a === void 0 ? void 0 : _a.indexOf('refresh-token')) === -1) {
-                _this.lastRequestConfig = config;
-            }
-            return config;
-        });
         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:
@@ -328,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) {
@@ -345,7 +342,11 @@ var BaseAPI = /** @class */ (function () {
                         }
                         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]);
@@ -353,13 +354,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/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 BillingService
+ * The EMIL BillingService 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/create-custom-estimated-invoice-request-dto.d.ts

@@ -32,4 +32,4 @@ export declare const CreateCustomEstimatedInvoiceRequestDtoProviderEnum: {
     readonly Squarelife: "squarelife";
     readonly Janitos: "janitos";
 };
-export declare type CreateCustomEstimatedInvoiceRequestDtoProviderEnum = typeof CreateCustomEstimatedInvoiceRequestDtoProviderEnum[keyof typeof CreateCustomEstimatedInvoiceRequestDtoProviderEnum];
+export type CreateCustomEstimatedInvoiceRequestDtoProviderEnum = typeof CreateCustomEstimatedInvoiceRequestDtoProviderEnum[keyof typeof CreateCustomEstimatedInvoiceRequestDtoProviderEnum];

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

@@ -72,4 +72,4 @@ export declare const CreateInvoiceRequestDtoTypeEnum: {
     readonly Penalty: "penalty";
     readonly Other: "other";
 };
-export declare type CreateInvoiceRequestDtoTypeEnum = typeof CreateInvoiceRequestDtoTypeEnum[keyof typeof CreateInvoiceRequestDtoTypeEnum];
+export type CreateInvoiceRequestDtoTypeEnum = typeof CreateInvoiceRequestDtoTypeEnum[keyof typeof CreateInvoiceRequestDtoTypeEnum];

package/package.json

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