@emilgroup/payment-sdk 1.6.1-beta.1 → 1.6.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/payment-sdk@1.6.1-beta.1 --save
+npm install @emilgroup/payment-sdk@1.6.1-beta.2 --save
 ```
 or 
 ```
-yarn add @emilgroup/payment-sdk@1.6.1-beta.1
+yarn add @emilgroup/payment-sdk@1.6.1-beta.2
 ```
 
 And then you can import `PaymentsApi`.

package/base.ts

@@ -64,6 +64,7 @@ export interface RequestArgs {
 interface TokenData {
     accessToken?: string;
     username?: string;
+    permissions?: string;
 }
 
 const NETWORK_ERROR_MESSAGE = "Network Error";
@@ -77,7 +78,6 @@ const TOKEN_DATA = 'APP_TOKEN';
 export class BaseAPI {
     protected configuration: Configuration | undefined;
     private tokenData?: TokenData;
-    private permissions?: string;
 
     constructor(configuration?: Configuration,
         protected basePath: string = BASE_PATH, 
@@ -111,7 +111,11 @@ export class BaseAPI {
     }
 
     getPermissions(): Array<string> {
-        return this.permissions.split(',');
+        if (!this.tokenData?.permissions) {
+            return [];
+        }
+
+        return this.tokenData.permissions.split(',');
     }
 
     async authorize(username: string, password: string): Promise<void> {
@@ -134,7 +138,7 @@ export class BaseAPI {
         this.configuration.accessToken = `Bearer ${accessToken}`;
         this.tokenData.username = username;
         this.tokenData.accessToken = accessToken;
-        this.permissions = permissions;
+        this.tokenData.permissions = permissions;
 
         this.storeTokenData({
             ...this.tokenData
@@ -148,6 +152,16 @@ export class BaseAPI {
             throw new Error('Failed to refresh token.');
         }
 
+        const refreshTokenAxios = globalAxios.create()
+        refreshTokenAxios.interceptors.response.use(response => {
+          const { permissions } = response.data;
+
+          this.tokenData.permissions = permissions;
+          this.storeTokenData(this.tokenData);
+
+          return response;
+        })
+
         const options: AxiosRequestConfig = {
             method: 'POST',
             url: `${this.configuration.basePath}/authservice/v1/refresh-token`,
@@ -158,8 +172,7 @@ export class BaseAPI {
             withCredentials: true,
         };
 
-        const response = await globalAxios.request<LoginClass>(options);
-
+        const response = await refreshTokenAxios.request<LoginClass>(options);
         return response.data;
     }
 
@@ -196,7 +209,7 @@ export class BaseAPI {
                         try {
                             const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
                             const accessToken = `Bearer ${tokenString}`;
-                            this.permissions = permissions;
+                            this.tokenData.permissions = permissions;
 
                             delete originalConfig.headers['Authorization']
 
@@ -223,7 +236,7 @@ export class BaseAPI {
                     try {
                         const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
                         const accessToken = `Bearer ${tokenString}`;
-                        this.permissions = permissions;
+                        this.tokenData.permissions = permissions;
 
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;

package/dist/base.d.ts

@@ -52,7 +52,6 @@ export declare class BaseAPI {
     protected axios: AxiosInstance;
     protected configuration: Configuration | undefined;
     private tokenData?;
-    private permissions?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
     selectEnvironment(env: Environment): void;
     selectBasePath(path: string): void;

package/dist/base.js

@@ -144,7 +144,11 @@ var BaseAPI = /** @class */ (function () {
         this.configuration.basePath = path;
     };
     BaseAPI.prototype.getPermissions = function () {
-        return this.permissions.split(',');
+        var _a;
+        if (!((_a = this.tokenData) === null || _a === void 0 ? void 0 : _a.permissions)) {
+            return [];
+        }
+        return this.tokenData.permissions.split(',');
     };
     BaseAPI.prototype.authorize = function (username, password) {
         return __awaiter(this, void 0, void 0, function () {
@@ -170,7 +174,7 @@ var BaseAPI = /** @class */ (function () {
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
                         this.tokenData.username = username;
                         this.tokenData.accessToken = accessToken;
-                        this.permissions = permissions;
+                        this.tokenData.permissions = permissions;
                         this.storeTokenData(__assign({}, this.tokenData));
                         return [2 /*return*/];
                 }
@@ -179,7 +183,8 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.refreshTokenInternal = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var username, options, response;
+            var username, refreshTokenAxios, options, response;
+            var _this = this;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
@@ -187,6 +192,13 @@ var BaseAPI = /** @class */ (function () {
                         if (!username) {
                             throw new Error('Failed to refresh token.');
                         }
+                        refreshTokenAxios = axios_1.default.create();
+                        refreshTokenAxios.interceptors.response.use(function (response) {
+                            var permissions = response.data.permissions;
+                            _this.tokenData.permissions = permissions;
+                            _this.storeTokenData(_this.tokenData);
+                            return response;
+                        });
                         options = {
                             method: 'POST',
                             url: "".concat(this.configuration.basePath, "/authservice/v1/refresh-token"),
@@ -196,7 +208,7 @@ var BaseAPI = /** @class */ (function () {
                             data: { username: username },
                             withCredentials: true,
                         };
-                        return [4 /*yield*/, axios_1.default.request(options)];
+                        return [4 /*yield*/, refreshTokenAxios.request(options)];
                     case 1:
                         response = _a.sent();
                         return [2 /*return*/, response.data];
@@ -241,7 +253,7 @@ var BaseAPI = /** @class */ (function () {
                     case 2:
                         _a = _c.sent(), tokenString = _a.accessToken, permissions = _a.permissions;
                         accessToken = "Bearer ".concat(tokenString);
-                        this.permissions = permissions;
+                        this.tokenData.permissions = permissions;
                         delete originalConfig.headers['Authorization'];
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
@@ -267,7 +279,7 @@ var BaseAPI = /** @class */ (function () {
                     case 7:
                         _b = _c.sent(), tokenString = _b.accessToken, permissions = _b.permissions;
                         accessToken = "Bearer ".concat(tokenString);
-                        this.permissions = permissions;
+                        this.tokenData.permissions = permissions;
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;

package/package.json

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