@emilgroup/public-api-sdk-node 1.0.0 → 1.0.1

package/README.md

@@ -1,6 +1,6 @@
 # Emil Public Api SDK for Nodejs
 
-This TypeScript/JavaScript client utilizes [axios](https://github.com/axios/axios). The generated module can be used with client-based applications (i.e. React).
+This TypeScript/JavaScript client utilizes [axios](https://github.com/axios/axios). The generated Node module can be used with Nodejs based applications.
 
 Language level
 * ES5 - you must have a Promises/A+ library installed
@@ -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/public-api-sdk-node@1.0.0 --save
+npm install @emilgroup/public-api-sdk-node@1.0.1 --save
 ```
 or 
 ```
-yarn add @emilgroup/public-api-sdk-node@1.0.0
+yarn add @emilgroup/public-api-sdk-node@1.0.1
 ```
 
 And then you can import `PublicApi`.
@@ -31,15 +31,32 @@ import { PublicApi } from '@emilgroup/public-api-sdk-node'
 
 const publicApi = new PublicApi();
 ```
+## Credentials
 
-To use authentication protected endpoints, you have to first authorize. To do so, use the `authorize` function in `PublicApi`:
+To use authentication protected endpoints, you have to first authorize. To do so, the easiest way is to provide a configuration file under `~/.emil/credentials` with the following content:
+
+```shell
+emil_username=XXXXX@XXXX.XXX
+emil_password=XXXXXXXXXXXXXX
+```
+
+It is also possible to provide environment variables instead:
+
+```shell
+export EMIL_USERNAME=XXXXX@XXXX.XXX
+export EMIL_PASSWORD=XXXXXXXXXXXXXX
+```
+
+## Example
+
+Here is a basic functionning example:
 
 ```ts
 async function listDocuments(): Promise<Void> {
     try {
         const publicApi = new PublicApi();
 
-        await publicApi.authorize('username', 'password');
+        await publicApi.initialize(); // should be called only once per Api.
 
         const { data: { items } } = await publicApi.listDocuments();
 

package/api/documents-api.ts

@@ -22,6 +22,10 @@ import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObj
 import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } from '../base';
 // @ts-ignore
 import { CreateDocumentRequestDto } from '../models';
+// URLSearchParams not necessarily used
+// @ts-ignore
+import { URL, URLSearchParams } from 'url';
+const FormData = require('form-data');
 /**
  * DocumentsApi - axios parameter creator
  * @export

package/api/payment-setup-api.ts

@@ -24,6 +24,10 @@ import { BASE_PATH, COLLECTION_FORMATS, RequestArgs, BaseAPI, RequiredError } fr
 import { CompletePaymentSetupRequestDto } from '../models';
 // @ts-ignore
 import { InitiatePaymentSetupRequestDto } from '../models';
+// URLSearchParams not necessarily used
+// @ts-ignore
+import { URL, URLSearchParams } from 'url';
+const FormData = require('form-data');
 /**
  * PaymentSetupApi - axios parameter creator
  * @export

package/api/products-api.ts

@@ -26,6 +26,10 @@ import { CreateCustomApplicationRequestDto } from '../models';
 import { CreateEstimatedInvoiceRequestDto } from '../models';
 // @ts-ignore
 import { CreateLeadRequestDto } from '../models';
+// URLSearchParams not necessarily used
+// @ts-ignore
+import { URL, URLSearchParams } from 'url';
+const FormData = require('form-data');
 /**
  * ProductsApi - axios parameter creator
  * @export

package/api.ts

@@ -15,6 +15,10 @@
 
 import { Configuration } from './configuration';
 import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
+// URLSearchParams not necessarily used
+// @ts-ignore
+import { URL, URLSearchParams } from 'url';
+import FormData from 'form-data'
 // Some imports not used depending on template conditions
 // @ts-ignore
 import { DUMMY_BASE_URL, assertParamExists, setApiKeyToObject, setBasicAuthToObject, setBearerAuthToObject, setOAuthToObject, setSearchParams, serializeDataIfNeeded, toPathString, createRequestFunction } from './common';

package/base.ts

@@ -14,13 +14,20 @@
 
 
 import { Configuration } from "./configuration";
-import { defaultStorage } from "./common";
 // Some imports not used depending on template conditions
 // @ts-ignore
 import globalAxios, { AxiosPromise, AxiosInstance, AxiosRequestConfig, AxiosResponse } from 'axios';
-
+import * as fs from 'fs';
+import * as path from 'path';
+import * as os from 'os';
 
 export const BASE_PATH = "https://apiv2.emil.de".replace(/\/+$/, "");
+const CONFIG_DIRECTORY = '.emil';
+const CONFIG_FILENAME = 'credentials';
+const KEY_USERNAME = 'emil_username';
+const KEY_PASSWORD = 'emil_password';
+
+const filePath = os.homedir() + path.sep + CONFIG_DIRECTORY + path.sep + CONFIG_FILENAME;
 /**
  *
  * @export
@@ -59,13 +66,7 @@ export interface RequestArgs {
     options: AxiosRequestConfig;
 }
 
-interface TokenData {
-    accessToken?: string;
-    username?: string;
-}
-
 const NETWORK_ERROR_MESSAGE = "Network Error";
-const TOKEN_DATA = 'APP_TOKEN';
 
 /**
  *
@@ -73,31 +74,75 @@ const TOKEN_DATA = 'APP_TOKEN';
  * @class BaseAPI
  */
 export class BaseAPI {
-    protected configuration: Configuration | undefined;
-    private tokenData?: TokenData;
-
-    constructor(configuration?: Configuration,
-        protected basePath: string = BASE_PATH, 
-        protected axios: AxiosInstance = globalAxios) {
-        
-        this.loadTokenData();
+    protected configuration: Configuration;
+    private username?: string;
+    private password?: string;
 
+    constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
         } else {
-            const { accessToken, username } = this.tokenData;
-
             this.configuration = new Configuration({
                 basePath: this.basePath,
-                accessToken: accessToken ? `Bearer ${accessToken}` : '',
-                username,
             });
         }
 
         this.attachInterceptor(axios);
     }
 
+    async initialize(env: Environment = Environment.Production) {
+        this.configuration.basePath = env;
+
+        await this.loadCredentials();
+
+        if (this.username) {
+            await this.authorize(this.username, this.password);
+            this.password = null; // to avoid keeping password loaded in memory.
+        }
+    }
+
+    private async loadCredentials() {
+        try {
+            await this.readConfigFile();
+        } catch (error) {
+            console.warn(`No credentials file found. Check that ${filePath} exists.`);
+        }
+
+        this.readEnvVariables();
+
+        if (!this.username) {
+            console.info(`No credentials found in credentials file or environment variables. Either provide some or use 
+                authorize() function.`);
+        }
+    }
+
+    private async readConfigFile() {
+        const file = await fs.promises.readFile(filePath, 'utf-8');
+
+        const lines = file.split(os.EOL)
+            .filter(Boolean);
+
+        lines.forEach((line: string) => {
+            if (line.startsWith(KEY_USERNAME)) {
+                this.username = line.length > KEY_USERNAME.length + 1 ? line.substring(KEY_USERNAME.length + 1) : '';
+            } else if (line.startsWith(KEY_PASSWORD)) {
+                this.password = line.length > KEY_PASSWORD.length + 1 ? line.substring(KEY_PASSWORD.length + 1) : '';
+            }
+        });
+    }
+
+    private readEnvVariables(): boolean {
+        if (process.env.EMIL_USERNAME) {
+            this.username = process.env.EMIL_USERNAME;
+            this.password = process.env.EMIL_PASSWORD || '';
+
+            return true;
+        }
+
+        return false;
+    }
+    
     selectEnvironment(env: Environment) {
         this.configuration.basePath = env;
     }
@@ -117,21 +162,18 @@ export class BaseAPI {
         const response = await globalAxios.request<LoginClass>(options);
 
         const { data: { accessToken } } = response;
-
         this.configuration.username = username;
         this.configuration.accessToken = `Bearer ${accessToken}`;
-        this.tokenData.username = username;
-        this.tokenData.accessToken = accessToken;
 
-        this.storeTokenData({
-            ...this.tokenData
-        });
+        const refreshToken = this.extractRefreshToken(response)
+        this.configuration.refreshToken = refreshToken;
     }
 
     async refreshToken(): Promise<string> {
-        const { username } = this.configuration;
+        const { username, refreshToken } = this.configuration;
+        
 
-        if (!username) {
+        if (!username || !refreshToken) {
             return '';
         }
 
@@ -140,6 +182,7 @@ export class BaseAPI {
             url: `${this.configuration.basePath}/authservice/v1/refresh-token`,
             headers: {
                 'Content-Type': 'application/json',
+                Cookie: refreshToken,
             },
             data: { username: username },
             withCredentials: true,
@@ -150,20 +193,18 @@ export class BaseAPI {
         return accessToken;
     }
 
-    private storeTokenData(tokenData?: TokenData) {
-        if (typeof window !== 'undefined') {
-            defaultStorage().set<TokenData>(TOKEN_DATA, tokenData);
-        }
-    }
+    private extractRefreshToken(response: AxiosResponse): string {
+        if (response.headers && response.headers['set-cookie']
+            && response.headers['set-cookie'].length > 0) {
 
-    public loadTokenData() {
-        if (typeof window !== 'undefined') {
-            this.tokenData = defaultStorage().get<TokenData>(TOKEN_DATA) || {};
+            return `${response.headers['set-cookie'][0].split(';')[0]};`;
         }
+
+        return '';
     }
 
-    public cleanTokenData() {
-        this.storeTokenData(null);
+    getConfiguration(): Configuration {
+        return this.configuration;
     }
 
     private attachInterceptor(axios: AxiosInstance) {
@@ -173,25 +214,19 @@ export class BaseAPI {
             },
             async (err) => {
                 let originalConfig = err.config;
-                if (err.response && !(err.response instanceof XMLHttpRequest)) { // sometimes buggy and is of type request
+                if (err.response) {
                     // Access Token was expired
-                    if ((err.response.status === 401 || err.response.status === 403)
-                        && !originalConfig._retry) {
+                    if (err.response.status === 401 && !originalConfig._retry) {
                         originalConfig._retry = true;
                         try {
-                            let tokenString = await this.refreshToken();
+                            const tokenString = await this.refreshToken();
                             const accessToken = `Bearer ${tokenString}`;
 
-                            delete originalConfig.headers['Authorization']
-
-                            originalConfig.headers['Authorization'] = accessToken;
+                            originalConfig.headers['Authorization'] = `Bearer ${accessToken}`
 
                             this.configuration.accessToken = accessToken;
-                            this.tokenData.accessToken = tokenString;
-
-                            this.storeTokenData(this.tokenData);
 
-                            return axios(originalConfig);
+                            return axios.request(originalConfig);
                         } catch (_error) {
                             if (_error.response && _error.response.data) {
                                 return Promise.reject(_error.response.data);
@@ -199,22 +234,23 @@ export class BaseAPI {
                             return Promise.reject(_error);
                         }
                     }
-                } else if (err.message === NETWORK_ERROR_MESSAGE
+                    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 {
-                        let tokenString = await this.refreshToken();
+                        const tokenString = await this.refreshToken();
                         const accessToken = `Bearer ${tokenString}`;
 
                         _retry = true;
-                        originalConfig.headers['Authorization'] = accessToken;
+                        originalConfig.headers['Authorization'] = accessToken; 
 
                         this.configuration.accessToken = accessToken;
-                        this.tokenData.accessToken = tokenString;
-
-                        this.storeTokenData(this.tokenData);
 
                         return axios.request({
                             ...originalConfig,
@@ -224,7 +260,7 @@ export class BaseAPI {
                             return Promise.reject(_error.response.data);
                         }
                         return Promise.reject(_error);
-                    }
+                    }                    
                 }
                 return Promise.reject(err);
             }

package/common.ts

@@ -16,6 +16,7 @@
 import { Configuration } from "./configuration";
 import { RequiredError, RequestArgs } from "./base";
 import { AxiosInstance, AxiosResponse } from 'axios';
+import { URL, URLSearchParams } from 'url';
 /**
  *
  * @export

package/configuration.ts

@@ -74,6 +74,14 @@ export class Configuration {
      */
     formDataCtor?: new () => any;
 
+    /**
+     * parameter for automatically refreshing access token for oauth2 security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    refreshToken?: string;
+
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
         this.username = param.username;

package/dist/api/documents-api.js

@@ -85,6 +85,10 @@ var axios_1 = __importDefault(require("axios"));
 var common_1 = require("../common");
 // @ts-ignore
 var base_1 = require("../base");
+// URLSearchParams not necessarily used
+// @ts-ignore
+var url_1 = require("url");
+var FormData = require('form-data');
 /**
  * DocumentsApi - axios parameter creator
  * @export
@@ -109,7 +113,7 @@ var DocumentsApiAxiosParamCreator = function (configuration) {
                             // verify required parameter 'createDocumentRequestDto' is not null or undefined
                             (0, common_1.assertParamExists)('createTemporaryDocument', 'createDocumentRequestDto', createDocumentRequestDto);
                             localVarPath = "/publicapi/v1/documents";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -158,7 +162,7 @@ var DocumentsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('downloadDocument', 'code', code);
                             localVarPath = "/publicapi/v1/documents/download/{code}"
                                 .replace("{".concat("code", "}"), encodeURIComponent(String(code)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -207,7 +211,7 @@ var DocumentsApiAxiosParamCreator = function (configuration) {
                     switch (_a.label) {
                         case 0:
                             localVarPath = "/publicapi/v1/documents";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;

package/dist/api/payment-setup-api.js

@@ -85,6 +85,10 @@ var axios_1 = __importDefault(require("axios"));
 var common_1 = require("../common");
 // @ts-ignore
 var base_1 = require("../base");
+// URLSearchParams not necessarily used
+// @ts-ignore
+var url_1 = require("url");
+var FormData = require('form-data');
 /**
  * PaymentSetupApi - axios parameter creator
  * @export
@@ -109,7 +113,7 @@ var PaymentSetupApiAxiosParamCreator = function (configuration) {
                             // verify required parameter 'completePaymentSetupRequestDto' is not null or undefined
                             (0, common_1.assertParamExists)('completePaymentSetup', 'completePaymentSetupRequestDto', completePaymentSetupRequestDto);
                             localVarPath = "/publicapi/v1/payment-setup/complete";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -157,7 +161,7 @@ var PaymentSetupApiAxiosParamCreator = function (configuration) {
                             // verify required parameter 'initiatePaymentSetupRequestDto' is not null or undefined
                             (0, common_1.assertParamExists)('initiatePaymentSetup', 'initiatePaymentSetupRequestDto', initiatePaymentSetupRequestDto);
                             localVarPath = "/publicapi/v1/payment-setup/initiate";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;

package/dist/api/products-api.js

@@ -85,6 +85,10 @@ var axios_1 = __importDefault(require("axios"));
 var common_1 = require("../common");
 // @ts-ignore
 var base_1 = require("../base");
+// URLSearchParams not necessarily used
+// @ts-ignore
+var url_1 = require("url");
+var FormData = require('form-data');
 /**
  * ProductsApi - axios parameter creator
  * @export
@@ -113,7 +117,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('createEstimatedInvoice', 'createEstimatedInvoiceRequestDto', createEstimatedInvoiceRequestDto);
                             localVarPath = "/publicapi/v1/products/{product_code}/product-invoice"
                                 .replace("{".concat("product_code", "}"), encodeURIComponent(String(productCode)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -161,7 +165,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             // verify required parameter 'createLeadRequestDto' is not null or undefined
                             (0, common_1.assertParamExists)('createLead', 'createLeadRequestDto', createLeadRequestDto);
                             localVarPath = "/publicapi/v1/leads";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -213,7 +217,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('customApplication', 'createCustomApplicationRequestDto', createCustomApplicationRequestDto);
                             localVarPath = "/publicapi/v1/products/{product_code}/custom-application"
                                 .replace("{".concat("product_code", "}"), encodeURIComponent(String(productCode)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -258,7 +262,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                     switch (_a.label) {
                         case 0:
                             localVarPath = "/publicapi/v1/products/{product_code}/insured-object-types";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -305,7 +309,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('getInsuredObjects', 'productCode', productCode);
                             localVarPath = "/publicapi/v1/products/{product_code}/insured-objects"
                                 .replace("{".concat("product_code", "}"), encodeURIComponent(String(productCode)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -352,7 +356,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('getProductCustomCss', 'productCode', productCode);
                             localVarPath = "/publicapi/v1/products/{product_code}/custom-css"
                                 .replace("{".concat("product_code", "}"), encodeURIComponent(String(productCode)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -399,7 +403,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('getProductFactors', 'productCode', productCode);
                             localVarPath = "/publicapi/v1/products/{product_code}/product-factors"
                                 .replace("{".concat("product_code", "}"), encodeURIComponent(String(productCode)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -442,7 +446,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                     switch (_a.label) {
                         case 0:
                             localVarPath = "/publicapi/v1/leads/initiate";
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;
@@ -492,7 +496,7 @@ var ProductsApiAxiosParamCreator = function (configuration) {
                             (0, common_1.assertParamExists)('updateLead', 'createLeadRequestDto', createLeadRequestDto);
                             localVarPath = "/publicapi/v1/leads/{code}"
                                 .replace("{".concat("code", "}"), encodeURIComponent(String(code)));
-                            localVarUrlObj = new URL(localVarPath, common_1.DUMMY_BASE_URL);
+                            localVarUrlObj = new url_1.URL(localVarPath, common_1.DUMMY_BASE_URL);
                             if (configuration) {
                                 baseOptions = configuration.baseOptions;
                                 baseAccessToken = configuration.accessToken;

package/dist/base.d.ts

@@ -48,15 +48,19 @@ export interface RequestArgs {
 export declare class BaseAPI {
     protected basePath: string;
     protected axios: AxiosInstance;
-    protected configuration: Configuration | undefined;
-    private tokenData?;
+    protected configuration: Configuration;
+    private username?;
+    private password?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
+    initialize(env?: Environment): Promise<void>;
+    private loadCredentials;
+    private readConfigFile;
+    private readEnvVariables;
     selectEnvironment(env: Environment): void;
     authorize(username: string, password: string): Promise<void>;
     refreshToken(): Promise<string>;
-    private storeTokenData;
-    loadTokenData(): void;
-    cleanTokenData(): void;
+    private extractRefreshToken;
+    getConfiguration(): Configuration;
     private attachInterceptor;
 }
 /**

package/dist/base.js

@@ -38,6 +38,29 @@ var __assign = (this && this.__assign) || function () {
     };
     return __assign.apply(this, arguments);
 };
+var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
+}) : (function(o, m, k, k2) {
+    if (k2 === undefined) k2 = k;
+    o[k2] = m[k];
+}));
+var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
+    Object.defineProperty(o, "default", { enumerable: true, value: v });
+}) : function(o, v) {
+    o["default"] = v;
+});
+var __importStar = (this && this.__importStar) || function (mod) {
+    if (mod && mod.__esModule) return mod;
+    var result = {};
+    if (mod != null) for (var k in mod) if (k !== "default" && Object.prototype.hasOwnProperty.call(mod, k)) __createBinding(result, mod, k);
+    __setModuleDefault(result, mod);
+    return result;
+};
 var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
     function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
     return new (P || (P = Promise))(function (resolve, reject) {
@@ -80,11 +103,18 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequiredError = exports.BaseAPI = exports.resetRetry = exports.Environment = exports.COLLECTION_FORMATS = exports.BASE_PATH = void 0;
 var configuration_1 = require("./configuration");
-var common_1 = require("./common");
 // Some imports not used depending on template conditions
 // @ts-ignore
 var axios_1 = __importDefault(require("axios"));
+var fs = __importStar(require("fs"));
+var path = __importStar(require("path"));
+var os = __importStar(require("os"));
 exports.BASE_PATH = "https://apiv2.emil.de".replace(/\/+$/, "");
+var CONFIG_DIRECTORY = '.emil';
+var CONFIG_FILENAME = 'credentials';
+var KEY_USERNAME = 'emil_username';
+var KEY_PASSWORD = 'emil_password';
+var filePath = os.homedir() + path.sep + CONFIG_DIRECTORY + path.sep + CONFIG_FILENAME;
 /**
  *
  * @export
@@ -107,7 +137,6 @@ function resetRetry() {
 }
 exports.resetRetry = resetRetry;
 var NETWORK_ERROR_MESSAGE = "Network Error";
-var TOKEN_DATA = 'APP_TOKEN';
 /**
  *
  * @export
@@ -119,27 +148,101 @@ var BaseAPI = /** @class */ (function () {
         if (axios === void 0) { axios = axios_1.default; }
         this.basePath = basePath;
         this.axios = axios;
-        this.loadTokenData();
         if (configuration) {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
         }
         else {
-            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,
             });
         }
         this.attachInterceptor(axios);
     }
+    BaseAPI.prototype.initialize = function (env) {
+        if (env === void 0) { env = Environment.Production; }
+        return __awaiter(this, void 0, void 0, function () {
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        this.configuration.basePath = env;
+                        return [4 /*yield*/, this.loadCredentials()];
+                    case 1:
+                        _a.sent();
+                        if (!this.username) return [3 /*break*/, 3];
+                        return [4 /*yield*/, this.authorize(this.username, this.password)];
+                    case 2:
+                        _a.sent();
+                        this.password = null; // to avoid keeping password loaded in memory.
+                        _a.label = 3;
+                    case 3: return [2 /*return*/];
+                }
+            });
+        });
+    };
+    BaseAPI.prototype.loadCredentials = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var error_1;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0:
+                        _a.trys.push([0, 2, , 3]);
+                        return [4 /*yield*/, this.readConfigFile()];
+                    case 1:
+                        _a.sent();
+                        return [3 /*break*/, 3];
+                    case 2:
+                        error_1 = _a.sent();
+                        console.warn("No credentials file found. Check that ".concat(filePath, " exists."));
+                        return [3 /*break*/, 3];
+                    case 3:
+                        this.readEnvVariables();
+                        if (!this.username) {
+                            console.info("No credentials found in credentials file or environment variables. Either provide some or use \n                authorize() function.");
+                        }
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    BaseAPI.prototype.readConfigFile = function () {
+        return __awaiter(this, void 0, void 0, function () {
+            var file, lines;
+            var _this = this;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
+                    case 0: return [4 /*yield*/, fs.promises.readFile(filePath, 'utf-8')];
+                    case 1:
+                        file = _a.sent();
+                        lines = file.split(os.EOL)
+                            .filter(Boolean);
+                        lines.forEach(function (line) {
+                            if (line.startsWith(KEY_USERNAME)) {
+                                _this.username = line.length > KEY_USERNAME.length + 1 ? line.substring(KEY_USERNAME.length + 1) : '';
+                            }
+                            else if (line.startsWith(KEY_PASSWORD)) {
+                                _this.password = line.length > KEY_PASSWORD.length + 1 ? line.substring(KEY_PASSWORD.length + 1) : '';
+                            }
+                        });
+                        return [2 /*return*/];
+                }
+            });
+        });
+    };
+    BaseAPI.prototype.readEnvVariables = function () {
+        if (process.env.EMIL_USERNAME) {
+            this.username = process.env.EMIL_USERNAME;
+            this.password = process.env.EMIL_PASSWORD || '';
+            return true;
+        }
+        return false;
+    };
     BaseAPI.prototype.selectEnvironment = function (env) {
         this.configuration.basePath = env;
     };
     BaseAPI.prototype.authorize = function (username, password) {
         return __awaiter(this, void 0, void 0, function () {
-            var options, response, accessToken;
+            var options, response, accessToken, refreshToken;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -159,9 +262,8 @@ var BaseAPI = /** @class */ (function () {
                         accessToken = response.data.accessToken;
                         this.configuration.username = username;
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
-                        this.tokenData.username = username;
-                        this.tokenData.accessToken = accessToken;
-                        this.storeTokenData(__assign({}, this.tokenData));
+                        refreshToken = this.extractRefreshToken(response);
+                        this.configuration.refreshToken = refreshToken;
                         return [2 /*return*/];
                 }
             });
@@ -169,12 +271,12 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.refreshToken = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var username, options, accessToken;
-            return __generator(this, function (_a) {
-                switch (_a.label) {
+            var _a, username, refreshToken, options, accessToken;
+            return __generator(this, function (_b) {
+                switch (_b.label) {
                     case 0:
-                        username = this.configuration.username;
-                        if (!username) {
+                        _a = this.configuration, username = _a.username, refreshToken = _a.refreshToken;
+                        if (!username || !refreshToken) {
                             return [2 /*return*/, ''];
                         }
                         options = {
@@ -182,30 +284,28 @@ var BaseAPI = /** @class */ (function () {
                             url: "".concat(this.configuration.basePath, "/authservice/v1/refresh-token"),
                             headers: {
                                 'Content-Type': 'application/json',
+                                Cookie: refreshToken,
                             },
                             data: { username: username },
                             withCredentials: true,
                         };
                         return [4 /*yield*/, axios_1.default.request(options)];
                     case 1:
-                        accessToken = (_a.sent()).data.accessToken;
+                        accessToken = (_b.sent()).data.accessToken;
                         return [2 /*return*/, accessToken];
                 }
             });
         });
     };
-    BaseAPI.prototype.storeTokenData = function (tokenData) {
-        if (typeof window !== 'undefined') {
-            (0, common_1.defaultStorage)().set(TOKEN_DATA, tokenData);
-        }
-    };
-    BaseAPI.prototype.loadTokenData = function () {
-        if (typeof window !== 'undefined') {
-            this.tokenData = (0, common_1.defaultStorage)().get(TOKEN_DATA) || {};
+    BaseAPI.prototype.extractRefreshToken = function (response) {
+        if (response.headers && response.headers['set-cookie']
+            && response.headers['set-cookie'].length > 0) {
+            return "".concat(response.headers['set-cookie'][0].split(';')[0], ";");
         }
+        return '';
     };
-    BaseAPI.prototype.cleanTokenData = function () {
-        this.storeTokenData(null);
+    BaseAPI.prototype.getConfiguration = function () {
+        return this.configuration;
     };
     BaseAPI.prototype.attachInterceptor = function (axios) {
         var _this = this;
@@ -217,9 +317,8 @@ var BaseAPI = /** @class */ (function () {
                 switch (_a.label) {
                     case 0:
                         originalConfig = err.config;
-                        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];
+                        if (!err.response) return [3 /*break*/, 5];
+                        if (!(err.response.status === 401 && !originalConfig._retry)) return [3 /*break*/, 4];
                         originalConfig._retry = true;
                         _a.label = 1;
                     case 1:
@@ -228,21 +327,23 @@ var BaseAPI = /** @class */ (function () {
                     case 2:
                         tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        delete originalConfig.headers['Authorization'];
-                        originalConfig.headers['Authorization'] = accessToken;
+                        originalConfig.headers['Authorization'] = "Bearer ".concat(accessToken);
                         this.configuration.accessToken = accessToken;
-                        this.tokenData.accessToken = tokenString;
-                        this.storeTokenData(this.tokenData);
-                        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: return [3 /*break*/, 9];
+                    case 4:
+                        if (err.response.status === 403 && err.response.data) {
+                            return [2 /*return*/, Promise.reject(err.response.data)];
+                        }
+                        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++;
@@ -256,8 +357,6 @@ var BaseAPI = /** @class */ (function () {
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
-                        this.tokenData.accessToken = tokenString;
-                        this.storeTokenData(this.tokenData);
                         return [2 /*return*/, axios.request(__assign({}, originalConfig))];
                     case 8:
                         _error_2 = _a.sent();

package/dist/common.d.ts

@@ -12,6 +12,7 @@
 import { Configuration } from "./configuration";
 import { RequestArgs } from "./base";
 import { AxiosInstance, AxiosResponse } from 'axios';
+import { URL } from 'url';
 /**
  *
  * @export

package/dist/common.js

@@ -62,6 +62,7 @@ var __generator = (this && this.__generator) || function (thisArg, body) {
 Object.defineProperty(exports, "__esModule", { value: true });
 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");
 /**
  *
  * @export
@@ -187,7 +188,7 @@ var setSearchParams = function (url) {
     for (var _i = 1; _i < arguments.length; _i++) {
         objects[_i - 1] = arguments[_i];
     }
-    var searchParams = new URLSearchParams(url.search);
+    var searchParams = new url_1.URLSearchParams(url.search);
     for (var _a = 0, objects_1 = objects; _a < objects_1.length; _a++) {
         var object = objects_1[_a];
         for (var key in object) {

package/dist/configuration.d.ts

@@ -68,6 +68,13 @@ export declare class Configuration {
      * @type {new () => FormData}
      */
     formDataCtor?: new () => any;
+    /**
+     * parameter for automatically refreshing access token for oauth2 security
+     *
+     * @type {string}
+     * @memberof Configuration
+     */
+    refreshToken?: string;
     constructor(param?: ConfigurationParameters);
     /**
      * Check if the given MIME is a JSON MIME.

package/package.json

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