@emilgroup/customer-sdk-node 1.39.1-beta.1 → 1.39.1-beta.2

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/customer-sdk-node@1.39.1-beta.1 --save
+npm install @emilgroup/customer-sdk-node@1.39.1-beta.2 --save
 ```
 or 
 ```
-yarn add @emilgroup/customer-sdk-node@1.39.1-beta.1
+yarn add @emilgroup/customer-sdk-node@1.39.1-beta.2
 ```
 
 And then you can import `CustomersApi`.

package/base.ts

@@ -81,7 +81,6 @@ export class BaseAPI {
     private username?: string;
     private password?: string;
     private isCustomerToken = false;
-    private permissions?: string;
 
     constructor(configuration?: Configuration, protected basePath: string = BASE_PATH, protected axios: AxiosInstance = globalAxios) {
         if (configuration) {
@@ -152,10 +151,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',
@@ -170,10 +165,9 @@ 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;
@@ -240,12 +234,12 @@ export class BaseAPI {
         return response;
     }
 
-    async refreshTokenTenant(): Promise<LoginClass> {
+    async refreshTokenTenant(): Promise<string> {
         const { username, refreshToken } = this.configuration;
         
 
         if (!username || !refreshToken) {
-            throw new Error('Failed to refresh token.');
+            return '';
         }
 
         const options: AxiosRequestConfig = {
@@ -259,16 +253,16 @@ 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;
     }
 
-    async refreshTokenCustomer(): Promise<LoginClass> {
+    async refreshTokenCustomer(): Promise<string> {
         const { username, refreshToken, tenantSlug } = this.configuration;
 
         if (!username || !refreshToken) {
-            throw new Error('Failed to refresh token.');
+            return '';
         }
 
         const options: AxiosRequestConfig = {
@@ -282,9 +276,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 {
@@ -310,14 +304,12 @@ export class BaseAPI {
                         originalConfig._retry = true;
                         try {
                             let tokenString: string;
-                            let permissions: string;
                             if (this.isCustomerToken) {
-                                ({ accessToken: tokenString, permissions } = await this.refreshTokenCustomer());
+                                tokenString = await this.refreshTokenCustomer();
                             } else {
-                                ({ accessToken: tokenString, permissions } = await this.refreshTokenTenant());
+                                tokenString = await this.refreshTokenTenant();
                             }
                             const accessToken = `Bearer ${tokenString}`;
-                            this.permissions = permissions;
 
                             delete originalConfig.headers['Authorization']
 
@@ -344,14 +336,12 @@ export class BaseAPI {
                     _retry_count++;
                     try {
                         let tokenString: string;
-                        let permissions: string;
                         if (this.isCustomerToken) {
-                            ({ accessToken: tokenString, permissions } = await this.refreshTokenCustomer());
+                            tokenString = await this.refreshTokenCustomer();
                         } else {
-                            ({ accessToken: tokenString, permissions } = await this.refreshTokenTenant());
+                            tokenString = await this.refreshTokenTenant();
                         }
                         const accessToken = `Bearer ${tokenString}`;
-                        this.permissions = permissions;
 
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken; 

package/dist/base.d.ts

@@ -55,19 +55,17 @@ export declare class BaseAPI {
     private username?;
     private password?;
     private isCustomerToken;
-    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>;
     initiateAuthorization(username: string, password: string, tenantSlug: string): Promise<AxiosResponse<InitiateAuthResponseClass>>;
     respondToAuthorizationChallenge(respondToAuthChallengeRequestDto: RespondToAuthChallengeRequestDto): Promise<AxiosResponse<RespondToAuthChallengeClass>>;
-    refreshTokenTenant(): Promise<LoginClass>;
-    refreshTokenCustomer(): Promise<LoginClass>;
+    refreshTokenTenant(): Promise<string>;
+    refreshTokenCustomer(): Promise<string>;
     private extractRefreshToken;
     private attachInterceptor;
 }

package/dist/base.js

@@ -243,14 +243,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',
@@ -264,11 +261,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*/];
@@ -343,13 +339,13 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.refreshTokenTenant = 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',
@@ -363,21 +359,21 @@ 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];
                 }
             });
         });
     };
     BaseAPI.prototype.refreshTokenCustomer = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var _a, username, refreshToken, tenantSlug, options, response;
+            var _a, username, refreshToken, tenantSlug, options, accessToken;
             return __generator(this, function (_b) {
                 switch (_b.label) {
                     case 0:
                         _a = this.configuration, username = _a.username, refreshToken = _a.refreshToken, tenantSlug = _a.tenantSlug;
                         if (!username || !refreshToken) {
-                            throw new Error('Failed to refresh token.');
+                            return [2 /*return*/, ''];
                         }
                         options = {
                             method: 'POST',
@@ -391,8 +387,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];
                 }
             });
         });
@@ -409,38 +405,35 @@ 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, permissions, accessToken, _error_1, tokenString, permissions, accessToken, _error_2;
-            var _a, _b, _c, _d;
-            return __generator(this, function (_e) {
-                switch (_e.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*/, 8];
                         if (!(err.response.status === 401 && !originalConfig._retry)) return [3 /*break*/, 7];
                         originalConfig._retry = true;
-                        _e.label = 1;
+                        _a.label = 1;
                     case 1:
-                        _e.trys.push([1, 6, , 7]);
+                        _a.trys.push([1, 6, , 7]);
                         tokenString = void 0;
-                        permissions = void 0;
                         if (!this.isCustomerToken) return [3 /*break*/, 3];
                         return [4 /*yield*/, this.refreshTokenCustomer()];
                     case 2:
-                        (_a = _e.sent(), tokenString = _a.accessToken, permissions = _a.permissions);
+                        tokenString = _a.sent();
                         return [3 /*break*/, 5];
                     case 3: return [4 /*yield*/, this.refreshTokenTenant()];
                     case 4:
-                        (_b = _e.sent(), tokenString = _b.accessToken, permissions = _b.permissions);
-                        _e.label = 5;
+                        tokenString = _a.sent();
+                        _a.label = 5;
                     case 5:
                         accessToken = "Bearer ".concat(tokenString);
-                        this.permissions = permissions;
                         delete originalConfig.headers['Authorization'];
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
                         return [2 /*return*/, axios(originalConfig)];
                     case 6:
-                        _error_1 = _e.sent();
+                        _error_1 = _a.sent();
                         if (_error_1.response && _error_1.response.data) {
                             return [2 /*return*/, Promise.reject(_error_1.response.data)];
                         }
@@ -456,29 +449,27 @@ var BaseAPI = /** @class */ (function () {
                             && originalConfig.headers.hasOwnProperty('Authorization')
                             && _retry_count < 4)) return [3 /*break*/, 15];
                         _retry_count++;
-                        _e.label = 9;
+                        _a.label = 9;
                     case 9:
-                        _e.trys.push([9, 14, , 15]);
+                        _a.trys.push([9, 14, , 15]);
                         tokenString = void 0;
-                        permissions = void 0;
                         if (!this.isCustomerToken) return [3 /*break*/, 11];
                         return [4 /*yield*/, this.refreshTokenCustomer()];
                     case 10:
-                        (_c = _e.sent(), tokenString = _c.accessToken, permissions = _c.permissions);
+                        tokenString = _a.sent();
                         return [3 /*break*/, 13];
                     case 11: return [4 /*yield*/, this.refreshTokenTenant()];
                     case 12:
-                        (_d = _e.sent(), tokenString = _d.accessToken, permissions = _d.permissions);
-                        _e.label = 13;
+                        tokenString = _a.sent();
+                        _a.label = 13;
                     case 13:
                         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 14:
-                        _error_2 = _e.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/customer-sdk-node",
-  "version": "1.39.1-beta.1",
+  "version": "1.39.1-beta.2",
   "description": "OpenAPI client for @emilgroup/customer-sdk-node",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [