@emilgroup/payment-sdk 1.13.1-beta.125 → 1.13.1-beta.126

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.13.1-beta.125 --save
+npm install @emilgroup/payment-sdk@1.13.1-beta.126 --save
 ```
 or 
 ```
-yarn add @emilgroup/payment-sdk@1.13.1-beta.125
+yarn add @emilgroup/payment-sdk@1.13.1-beta.126
 ```
 
 And then you can import `PaymentsApi`.

package/base.ts

@@ -34,23 +34,12 @@ export const COLLECTION_FORMATS = {
 
 export interface LoginClass {
     accessToken: string;
-    permissions: string;
-}
-
-export interface SwitchWorkspaceRequest {
-    username: string;
-    targetWorkspace: string;
-}
-
-export interface SwitchWorkspaceResponseClass {
-    accessToken: string;
-    permissions: string;
+    permissions: Array<string>;
 }
 
 export enum Environment {
     Production = 'https://apiv2.emil.de',
     Test = 'https://apiv2-test.emil.de',
-    Staging = 'https://apiv2-staging.emil.de',
     Development = 'https://apiv2-dev.emil.de',
     ProductionZurich = 'https://eu-central-2.apiv2.emil.de',
 }
@@ -75,7 +64,6 @@ export interface RequestArgs {
 interface TokenData {
     accessToken?: string;
     username?: string;
-    permissions?: string;
 }
 
 const NETWORK_ERROR_MESSAGE = "Network Error";
@@ -97,14 +85,9 @@ export class BaseAPI {
         this.loadTokenData();
 
         if (configuration) {
-            const { accessToken } = this.tokenData;
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
-
-            // Use config token if provided, otherwise use tokenData token
-            const configToken = this.configuration.accessToken;
-            const storedToken = accessToken ? `Bearer ${accessToken}` : '';
-            this.configuration.accessToken = configToken || storedToken;
+            this.configuration.accessToken = this.tokenData.accessToken ? `Bearer ${this.tokenData.accessToken}` : '';
         } else {
             const { accessToken, username } = this.tokenData;
 
@@ -126,15 +109,7 @@ export class BaseAPI {
         this.configuration.basePath = path;
     }
 
-    getPermissions(): Array<string> {
-        if (!this.tokenData?.permissions) {
-            return [];
-        }
-
-        return this.tokenData.permissions.split(',');
-    }
-
-    async authorize(username: string, password: string, targetWorkspace?: string): Promise<void> {
+    async authorize(username: string, password: string): Promise<void> {
         const options: AxiosRequestConfig = {
             method: 'POST',
             url: `${this.configuration.basePath}/authservice/v1/login`,
@@ -148,70 +123,25 @@ 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.tokenData.username = username;
         this.tokenData.accessToken = accessToken;
-        this.tokenData.permissions = permissions;
-
-        // Switch workspace if provided
-        if (targetWorkspace) {
-            await this.switchWorkspace(targetWorkspace);
-        } else {
-            // Only store if no workspace switch (since switchWorkspace will store after switching)
-            this.storeTokenData({
-                ...this.tokenData
-            });
-        }
-    }
-
-    async switchWorkspace(targetWorkspace: string): Promise<void> {
-        const options: AxiosRequestConfig = {
-            method: 'POST',
-            url: `${this.configuration.basePath}/authservice/v1/workspaces/switch`,
-            headers: {
-                'Content-Type': 'application/json',
-                'Authorization': `Bearer ${this.configuration.accessToken}`,
-            },
-            data: {
-                username: this.configuration.username,
-                targetWorkspace,
-            } as SwitchWorkspaceRequest,
-            withCredentials: true,
-        };
-
-        const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
-
-        const { data: { accessToken, permissions } } = response;
-        
-        this.configuration.accessToken = `Bearer ${accessToken}`;
-        this.tokenData.accessToken = accessToken;
-        this.tokenData.permissions = permissions;
 
         this.storeTokenData({
             ...this.tokenData
         });
     }
 
-    async refreshTokenInternal(): Promise<LoginClass> {
+    async refreshTokenInternal(): Promise<string> {
         const { username } = this.configuration;
 
         if (!username) {
-            throw new Error('Failed to refresh token.');
+            return '';
         }
 
-        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`,
@@ -222,8 +152,9 @@ export class BaseAPI {
             withCredentials: true,
         };
 
-        const response = await refreshTokenAxios.request<LoginClass>(options);
-        return response.data;
+        const { data: { accessToken } } = await globalAxios.request<LoginClass>(options);
+
+        return accessToken;
     }
 
     private storeTokenData(tokenData?: TokenData) {
@@ -257,9 +188,8 @@ export class BaseAPI {
                         && !originalConfig._retry) {
                         originalConfig._retry = true;
                         try {
-                            const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                            let tokenString = await this.refreshTokenInternal();
                             const accessToken = `Bearer ${tokenString}`;
-                            this.tokenData.permissions = permissions;
 
                             delete originalConfig.headers['Authorization']
 
@@ -284,9 +214,8 @@ export class BaseAPI {
                 ) {
                     _retry_count++;
                     try {
-                        const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                        let tokenString = await this.refreshTokenInternal();
                         const accessToken = `Bearer ${tokenString}`;
-                        this.tokenData.permissions = permissions;
 
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;
@@ -319,7 +248,7 @@ export class BaseAPI {
  * @extends {Error}
  */
 export class RequiredError extends Error {
-    override name: "RequiredError" = "RequiredError";
+    name: "RequiredError" = "RequiredError";
     constructor(public field: string, msg?: string) {
         super(msg);
     }

package/common.ts

@@ -65,7 +65,7 @@ export const setBearerAuthToObject = async function (object: any, configuration?
         const accessToken = typeof configuration.accessToken === 'function'
             ? await configuration.accessToken()
             : await configuration.accessToken;
-        object["Authorization"] = configuration.getBearerToken(accessToken);
+        object["Authorization"] = "Bearer " + accessToken;
     }
 }
 
@@ -78,7 +78,7 @@ export const setOAuthToObject = async function (object: any, name: string, scope
         const localVarAccessTokenValue = typeof configuration.accessToken === 'function'
             ? await configuration.accessToken(name, scopes)
             : await configuration.accessToken;
-        object["Authorization"] = configuration.getBearerToken(localVarAccessTokenValue);
+        object["Authorization"] = "Bearer " + localVarAccessTokenValue;
     }
 }
 

package/configuration.ts

@@ -98,13 +98,4 @@ export class Configuration {
         const jsonMime: RegExp = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     }
-
-    /**
-     * Returns "Bearer" token.
-     * @param token - access token.
-     * @return Bearer token.
-     */
-    public getBearerToken(token?: string): string {
-        return ('' + token).startsWith("Bearer") ? token : "Bearer " + token;
-    }
 }

package/dist/base.d.ts

@@ -24,20 +24,11 @@ export declare const COLLECTION_FORMATS: {
 };
 export interface LoginClass {
     accessToken: string;
-    permissions: string;
-}
-export interface SwitchWorkspaceRequest {
-    username: string;
-    targetWorkspace: string;
-}
-export interface SwitchWorkspaceResponseClass {
-    accessToken: string;
-    permissions: string;
+    permissions: Array<string>;
 }
 export declare enum Environment {
     Production = "https://apiv2.emil.de",
     Test = "https://apiv2-test.emil.de",
-    Staging = "https://apiv2-staging.emil.de",
     Development = "https://apiv2-dev.emil.de",
     ProductionZurich = "https://eu-central-2.apiv2.emil.de"
 }
@@ -64,10 +55,8 @@ export declare class BaseAPI {
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
     selectEnvironment(env: Environment): void;
     selectBasePath(path: string): void;
-    getPermissions(): Array<string>;
-    authorize(username: string, password: string, targetWorkspace?: string): Promise<void>;
-    switchWorkspace(targetWorkspace: string): Promise<void>;
-    refreshTokenInternal(): Promise<LoginClass>;
+    authorize(username: string, password: string): Promise<void>;
+    refreshTokenInternal(): Promise<string>;
     private storeTokenData;
     loadTokenData(): void;
     cleanTokenData(): void;

package/dist/base.js

@@ -99,7 +99,6 @@ var Environment;
 (function (Environment) {
     Environment["Production"] = "https://apiv2.emil.de";
     Environment["Test"] = "https://apiv2-test.emil.de";
-    Environment["Staging"] = "https://apiv2-staging.emil.de";
     Environment["Development"] = "https://apiv2-dev.emil.de";
     Environment["ProductionZurich"] = "https://eu-central-2.apiv2.emil.de";
 })(Environment = exports.Environment || (exports.Environment = {}));
@@ -124,13 +123,9 @@ var BaseAPI = /** @class */ (function () {
         this.axios = axios;
         this.loadTokenData();
         if (configuration) {
-            var accessToken = this.tokenData.accessToken;
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
-            // Use config token if provided, otherwise use tokenData token
-            var configToken = this.configuration.accessToken;
-            var storedToken = accessToken ? "Bearer ".concat(accessToken) : '';
-            this.configuration.accessToken = configToken || storedToken;
+            this.configuration.accessToken = this.tokenData.accessToken ? "Bearer ".concat(this.tokenData.accessToken) : '';
         }
         else {
             var _a = this.tokenData, accessToken = _a.accessToken, username = _a.username;
@@ -148,18 +143,11 @@ var BaseAPI = /** @class */ (function () {
     BaseAPI.prototype.selectBasePath = function (path) {
         this.configuration.basePath = path;
     };
-    BaseAPI.prototype.getPermissions = function () {
-        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, targetWorkspace) {
+    BaseAPI.prototype.authorize = function (username, password) {
         return __awaiter(this, void 0, void 0, function () {
-            var options, response, _a, accessToken, permissions;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
+            var options, response, accessToken;
+            return __generator(this, function (_a) {
+                switch (_a.label) {
                     case 0:
                         options = {
                             method: 'POST',
@@ -173,53 +161,12 @@ 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.tokenData.username = username;
                         this.tokenData.accessToken = accessToken;
-                        this.tokenData.permissions = permissions;
-                        if (!targetWorkspace) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.switchWorkspace(targetWorkspace)];
-                    case 2:
-                        _b.sent();
-                        return [3 /*break*/, 4];
-                    case 3:
-                        // Only store if no workspace switch (since switchWorkspace will store after switching)
-                        this.storeTokenData(__assign({}, this.tokenData));
-                        _b.label = 4;
-                    case 4: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BaseAPI.prototype.switchWorkspace = function (targetWorkspace) {
-        return __awaiter(this, void 0, void 0, function () {
-            var options, response, _a, accessToken, permissions;
-            return __generator(this, function (_b) {
-                switch (_b.label) {
-                    case 0:
-                        options = {
-                            method: 'POST',
-                            url: "".concat(this.configuration.basePath, "/authservice/v1/workspaces/switch"),
-                            headers: {
-                                'Content-Type': 'application/json',
-                                'Authorization': "Bearer ".concat(this.configuration.accessToken),
-                            },
-                            data: {
-                                username: this.configuration.username,
-                                targetWorkspace: targetWorkspace,
-                            },
-                            withCredentials: true,
-                        };
-                        return [4 /*yield*/, axios_1.default.request(options)];
-                    case 1:
-                        response = _b.sent();
-                        _a = response.data, accessToken = _a.accessToken, permissions = _a.permissions;
-                        this.configuration.accessToken = "Bearer ".concat(accessToken);
-                        this.tokenData.accessToken = accessToken;
-                        this.tokenData.permissions = permissions;
                         this.storeTokenData(__assign({}, this.tokenData));
                         return [2 /*return*/];
                 }
@@ -228,22 +175,14 @@ var BaseAPI = /** @class */ (function () {
     };
     BaseAPI.prototype.refreshTokenInternal = function () {
         return __awaiter(this, void 0, void 0, function () {
-            var username, refreshTokenAxios, options, response;
-            var _this = this;
+            var username, options, accessToken;
             return __generator(this, function (_a) {
                 switch (_a.label) {
                     case 0:
                         username = this.configuration.username;
                         if (!username) {
-                            throw new Error('Failed to refresh token.');
+                            return [2 /*return*/, ''];
                         }
-                        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"),
@@ -253,10 +192,10 @@ var BaseAPI = /** @class */ (function () {
                             data: { username: username },
                             withCredentials: true,
                         };
-                        return [4 /*yield*/, refreshTokenAxios.request(options)];
+                        return [4 /*yield*/, axios_1.default.request(options)];
                     case 1:
-                        response = _a.sent();
-                        return [2 /*return*/, response.data];
+                        accessToken = (_a.sent()).data.accessToken;
+                        return [2 /*return*/, accessToken];
                 }
             });
         });
@@ -282,23 +221,22 @@ 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 && !(err.response instanceof XMLHttpRequest))) return [3 /*break*/, 5];
                         if (!((err.response.status === 401 || err.response.status === 403)
                             && !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.tokenData.permissions = permissions;
                         delete originalConfig.headers['Authorization'];
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
@@ -306,7 +244,7 @@ var BaseAPI = /** @class */ (function () {
                         this.storeTokenData(this.tokenData);
                         return [2 /*return*/, axios(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)];
                         }
@@ -317,14 +255,13 @@ 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.tokenData.permissions = permissions;
                         _retry = true;
                         originalConfig.headers['Authorization'] = accessToken;
                         this.configuration.accessToken = accessToken;
@@ -332,7 +269,7 @@ var BaseAPI = /** @class */ (function () {
                         this.storeTokenData(this.tokenData);
                         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/dist/common.js

@@ -140,7 +140,7 @@ var setBearerAuthToObject = function (object, configuration) {
                     _b.label = 4;
                 case 4:
                     accessToken = _a;
-                    object["Authorization"] = configuration.getBearerToken(accessToken);
+                    object["Authorization"] = "Bearer " + accessToken;
                     _b.label = 5;
                 case 5: return [2 /*return*/];
             }
@@ -170,7 +170,7 @@ var setOAuthToObject = function (object, name, scopes, configuration) {
                     _b.label = 4;
                 case 4:
                     localVarAccessTokenValue = _a;
-                    object["Authorization"] = configuration.getBearerToken(localVarAccessTokenValue);
+                    object["Authorization"] = "Bearer " + localVarAccessTokenValue;
                     _b.label = 5;
                 case 5: return [2 /*return*/];
             }

package/dist/configuration.d.ts

@@ -80,10 +80,4 @@ export declare class Configuration {
      * @return True if the given MIME is JSON, false otherwise.
      */
     isJsonMime(mime: string): boolean;
-    /**
-     * Returns "Bearer" token.
-     * @param token - access token.
-     * @return Bearer token.
-     */
-    getBearerToken(token?: string): string;
 }

package/dist/configuration.js

@@ -39,14 +39,6 @@ var Configuration = /** @class */ (function () {
         var jsonMime = new RegExp('^(application\/json|[^;/ \t]+\/[^;/ \t]+[+]json)[ \t]*(;.*)?$', 'i');
         return mime !== null && (jsonMime.test(mime) || mime.toLowerCase() === 'application/json-patch+json');
     };
-    /**
-     * Returns "Bearer" token.
-     * @param token - access token.
-     * @return Bearer token.
-     */
-    Configuration.prototype.getBearerToken = function (token) {
-        return ('' + token).startsWith("Bearer") ? token : "Bearer " + token;
-    };
     return Configuration;
 }());
 exports.Configuration = Configuration;

package/package.json

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

package/tsconfig.json

@@ -5,7 +5,6 @@
     "module": "CommonJS",
     "noImplicitAny": true,
     "esModuleInterop": true,
-    "noImplicitOverride": true,
     "outDir": "dist",
     "rootDir": ".",
     "lib": [