@emilgroup/billing-sdk-node 1.31.1-beta.2 → 1.32.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.31.1-beta.2 --save
+npm install @emilgroup/billing-sdk-node@1.32.0 --save
 ```
 or 
 ```
-yarn add @emilgroup/billing-sdk-node@1.31.1-beta.2
+yarn add @emilgroup/billing-sdk-node@1.32.0
 ```
 
 And then you can import `InvoicesApi`.

package/base.ts

@@ -79,7 +79,6 @@ export class BaseAPI {
     protected configuration: Configuration;
     private username?: string;
     private password?: string;
-    private permissions?: string;
 
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
@@ -150,10 +149,6 @@ export class BaseAPI {
         this.configuration.basePath = env;
     }
 
-    getPermissions(): Array<string> {
-        return this.permissions.split(',');
-    }
-
     async authorize(username: string, password: string): Promise<void> {
         const options: AxiosRequestConfig = {
             method: 'POST',
@@ -168,21 +163,20 @@ export class BaseAPI {
 
         const response = await globalAxios.request<LoginClass>(options);
 
-        const { data: { accessToken, permissions } } = response;
+        const { data: { accessToken } } = response;
         this.configuration.username = username;
         this.configuration.accessToken = `Bearer ${accessToken}`;
-        this.permissions = permissions;
 
         const refreshToken = this.extractRefreshToken(response)
         this.configuration.refreshToken = refreshToken;
     }
 
-    async refreshTokenInternal(): Promise<LoginClass> {
+    async refreshTokenInternal(): Promise<string> {
         const { username, refreshToken } = this.configuration;
         
 
         if (!username || !refreshToken) {
-            throw new Error('Failed to refresh token.');
+            return '';
         }
 
         const options: AxiosRequestConfig = {
@@ -196,9 +190,9 @@ export class BaseAPI {
             withCredentials: true,
         };
 
-        const response = await globalAxios.request<LoginClass>(options);
+        const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
 
-        return response.data;
+        return accessToken;
     }
 
     private extractRefreshToken(response: AxiosResponse): string {
@@ -227,9 +221,8 @@ export class BaseAPI {
                     if (err.response.status === 401 && !originalConfig._retry) {
                         originalConfig._retry = true;
                         try {
-                            const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                            const tokenString = await this.refreshTokenInternal();
                             const accessToken = `Bearer ${tokenString}`;
-                            this.permissions = permissions;
 
                             originalConfig.headers['Authorization'] = `Bearer ${accessToken}`
 
@@ -253,9 +246,8 @@ export class BaseAPI {
                 ){ 
                     _retry_count++;
                     try {
-                        const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                        const tokenString = await this.refreshTokenInternal();
                         const accessToken = `Bearer ${tokenString}`;
-                        this.permissions = permissions;
 
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken; 

package/dist/base.d.ts

@@ -53,16 +53,14 @@ export declare class BaseAPI {
     protected configuration: Configuration;
     private username?;
     private password?;
-    private permissions?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
     initialize(env?: Environment): Promise<void>;
     private loadCredentials;
     private readConfigFile;
     private readEnvVariables;
     selectEnvironment(env: Environment): void;
-    getPermissions(): Array<string>;
     authorize(username: string, password: string): Promise<void>;
-    refreshTokenInternal(): Promise<LoginClass>;
+    refreshTokenInternal(): Promise<string>;
     private extractRefreshToken;
     getConfiguration(): Configuration;
     private attachInterceptor;

package/dist/base.js

@@ -242,14 +242,11 @@ var BaseAPI = /** @class */ (function () {
     BaseAPI.prototype.selectEnvironment = function (env) {
         this.configuration.basePath = env;
     };
-    BaseAPI.prototype.getPermissions = function () {
-        return this.permissions.split(',');
-    };
     BaseAPI.prototype.authorize = function (username, password) {
         return __awaiter(this, void 0, void 0, function () {
-            var options, response, _a, accessToken, permissions, refreshToken;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var options, response, accessToken, refreshToken;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         options = {
                             method: 'POST',
@@ -263,11 +260,10 @@ var BaseAPI = /** @class */ (function () {
                         };
                         return [4 /*yield*/, axios_1.default.request(options)];
                     case 1:
-                        response = _b.sent();
-                        _a = response.data, accessToken = _a.accessToken, permissions = _a.permissions;
+                        response = _a.sent();
+                        accessToken = response.data.accessToken;
                         this.configuration.username = username;
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
-                        this.permissions = permissions;
                         refreshToken = this.extractRefreshToken(response);
                         this.configuration.refreshToken = refreshToken;
                         return [2 /*return*/];
@@ -277,13 +273,13 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.refreshTokenInternal = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, username, refreshToken, options, response;
+            var _a, username, refreshToken, options, accessToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.configuration, username = _a.username, refreshToken = _a.refreshToken;
                         if (!username || !refreshToken) {
-                            throw new Error('Failed to refresh token.');
+                            return [2 /*return*/, ''];
                         }
                         options = {
                             method: 'POST',
@@ -297,8 +293,8 @@ var BaseAPI = /** @class */ (function () {
                         };
                         return [4 /*yield*/, axios_1.default.request(options)];
                     case 1:
-                        response = _b.sent();
-                        return [2 /*return*/, response.data];
+                        accessToken = (_b.sent()).data.accessToken;
+                        return [2 /*return*/, accessToken];
                 }
             });
         });
@@ -318,27 +314,26 @@ var BaseAPI = /** @class */ (function () {
         axios.interceptors.response.use(function (res) {
             return res;
         }, function (err) { return __awaiter(_this, void 0, void 0, function () {
-            var originalConfig, _a, tokenString, permissions, accessToken, _error_1, _b, tokenString, permissions, accessToken, _error_2;
-            return __generator(this, function (_c) {
-                switch (_c.label) {
+            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];
                         originalConfig._retry = true;
-                        _c.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _c.trys.push([1, 3, , 4]);
+                        _a.trys.push([1, 3, , 4]);
                         return [4 /*yield*/, this.refreshTokenInternal()];
                     case 2:
-                        _a = _c.sent(), tokenString = _a.accessToken, permissions = _a.permissions;
+                        tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        this.permissions = permissions;
                         originalConfig.headers['Authorization'] = "Bearer ".concat(accessToken);
                         this.configuration.accessToken = accessToken;
                         return [2 /*return*/, axios.request(originalConfig)];
                     case 3:
-                        _error_1 = _c.sent();
+                        _error_1 = _a.sent();
                         if (_error_1.response && _error_1.response.data) {
                             return [2 /*return*/, Promise.reject(_error_1.response.data)];
                         }
@@ -354,20 +349,19 @@ var BaseAPI = /** @class */ (function () {
                             && originalConfig.headers.hasOwnProperty('Authorization')
                             && _retry_count < 4)) return [3 /*break*/, 9];
                         _retry_count++;
-                        _c.label = 6;
+                        _a.label = 6;
                     case 6:
-                        _c.trys.push([6, 8, , 9]);
+                        _a.trys.push([6, 8, , 9]);
                         return [4 /*yield*/, this.refreshTokenInternal()];
                     case 7:
-                        _b = _c.sent(), tokenString = _b.accessToken, permissions = _b.permissions;
+                        tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        this.permissions = permissions;
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
                         return [2 /*return*/, axios.request(__assign({}, originalConfig))];
                     case 8:
-                        _error_2 = _c.sent();
+                        _error_2 = _a.sent();
                         if (_error_2.response && _error_2.response.data) {
                             return [2 /*return*/, Promise.reject(_error_2.response.data)];
                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@emilgroup/billing-sdk-node",
-  "version": "1.31.1-beta.2",
+  "version": "1.32.0",
   "description": "OpenAPI client for @emilgroup/billing-sdk-node",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [