@emilgroup/payment-sdk-node 1.21.1-beta.124 → 1.21.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-node@1.21.1-beta.124 --save
+npm install @emilgroup/payment-sdk-node@1.21.1-beta.126 --save
 ```
 or 
 ```
-yarn add @emilgroup/payment-sdk-node@1.21.1-beta.124
+yarn add @emilgroup/payment-sdk-node@1.21.1-beta.126
 ```
 
 And then you can import `PaymentsApi`.

package/base.ts

@@ -41,23 +41,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',
 }
@@ -104,13 +93,13 @@ export class BaseAPI {
         this.attachInterceptor(axios);
     }
 
-    async initialize(env: Environment = Environment.Production, targetWorkspace?: string) {
+    async initialize(env: Environment = Environment.Production) {
         this.configuration.basePath = env;
 
         await this.loadCredentials();
 
         if (this.username) {
-            await this.authorize(this.username, this.password, targetWorkspace);
+            await this.authorize(this.username, this.password);
             this.password = null; // to avoid keeping password loaded in memory.
         }
     }
@@ -160,7 +149,7 @@ export class BaseAPI {
         this.configuration.basePath = env;
     }
 
-    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`,
@@ -180,38 +169,6 @@ export class BaseAPI {
 
         const refreshToken = this.extractRefreshToken(response)
         this.configuration.refreshToken = refreshToken;
-
-        // Switch workspace if provided
-        if (targetWorkspace) {
-            await this.switchWorkspace(targetWorkspace);
-        }
-    }
-
-    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}`,
-                'Cookie': this.configuration.refreshToken,
-            },
-            data: {
-                username: this.configuration.username,
-                targetWorkspace,
-            } as SwitchWorkspaceRequest,
-            withCredentials: true,
-        };
-
-        const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
-
-        const { data: { accessToken } } = response;
-        this.configuration.accessToken = `Bearer ${accessToken}`;
-
-        const refreshToken = this.extractRefreshToken(response);
-        if (refreshToken) {
-            this.configuration.refreshToken = refreshToken;
-        }
     }
 
     async refreshTokenInternal(): Promise<string> {
@@ -267,7 +224,7 @@ export class BaseAPI {
                             const tokenString = await this.refreshTokenInternal();
                             const accessToken = `Bearer ${tokenString}`;
 
-                            originalConfig.headers['Authorization'] = accessToken;
+                            originalConfig.headers['Authorization'] = `Bearer ${accessToken}`
 
                             this.configuration.accessToken = accessToken;
 
@@ -320,7 +277,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

@@ -66,7 +66,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;
     }
 }
 
@@ -79,7 +79,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

@@ -106,13 +106,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"
 }
@@ -63,13 +54,12 @@ export declare class BaseAPI {
     private username?;
     private password?;
     constructor(configuration?: Configuration, basePath?: string, axios?: AxiosInstance);
-    initialize(env?: Environment, targetWorkspace?: string): Promise<void>;
+    initialize(env?: Environment): Promise<void>;
     private loadCredentials;
     private readConfigFile;
     private readEnvVariables;
     selectEnvironment(env: Environment): void;
-    authorize(username: string, password: string, targetWorkspace?: string): Promise<void>;
-    switchWorkspace(targetWorkspace: string): Promise<void>;
+    authorize(username: string, password: string): Promise<void>;
     refreshTokenInternal(): Promise<string>;
     private extractRefreshToken;
     getConfiguration(): Configuration;

package/dist/base.js

@@ -129,7 +129,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 = {}));
@@ -162,7 +161,7 @@ var BaseAPI = /** @class */ (function () {
         }
         this.attachInterceptor(axios);
     }
-    BaseAPI.prototype.initialize = function (env, targetWorkspace) {
+    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) {
@@ -173,7 +172,7 @@ var BaseAPI = /** @class */ (function () {
                     case 1:
                         _a.sent();
                         if (!this.username) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.authorize(this.username, this.password, targetWorkspace)];
+                        return [4 /*yield*/, this.authorize(this.username, this.password)];
                     case 2:
                         _a.sent();
                         this.password = null; // to avoid keeping password loaded in memory.
@@ -243,7 +242,7 @@ var BaseAPI = /** @class */ (function () {
     BaseAPI.prototype.selectEnvironment = function (env) {
         this.configuration.basePath = env;
     };
-    BaseAPI.prototype.authorize = function (username, password, targetWorkspace) {
+    BaseAPI.prototype.authorize = function (username, password) {
         return __awaiter(this, void 0, void 0, function () {
             var options, response, accessToken, refreshToken;
             return __generator(this, function (_a) {
@@ -267,45 +266,6 @@ var BaseAPI = /** @class */ (function () {
                         this.configuration.accessToken = "Bearer ".concat(accessToken);
                         refreshToken = this.extractRefreshToken(response);
                         this.configuration.refreshToken = refreshToken;
-                        if (!targetWorkspace) return [3 /*break*/, 3];
-                        return [4 /*yield*/, this.switchWorkspace(targetWorkspace)];
-                    case 2:
-                        _a.sent();
-                        _a.label = 3;
-                    case 3: return [2 /*return*/];
-                }
-            });
-        });
-    };
-    BaseAPI.prototype.switchWorkspace = function (targetWorkspace) {
-        return __awaiter(this, void 0, void 0, function () {
-            var options, response, accessToken, refreshToken;
-            return __generator(this, function (_a) {
-                switch (_a.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),
-                                'Cookie': this.configuration.refreshToken,
-                            },
-                            data: {
-                                username: this.configuration.username,
-                                targetWorkspace: targetWorkspace,
-                            },
-                            withCredentials: true,
-                        };
-                        return [4 /*yield*/, axios_1.default.request(options)];
-                    case 1:
-                        response = _a.sent();
-                        accessToken = response.data.accessToken;
-                        this.configuration.accessToken = "Bearer ".concat(accessToken);
-                        refreshToken = this.extractRefreshToken(response);
-                        if (refreshToken) {
-                            this.configuration.refreshToken = refreshToken;
-                        }
                         return [2 /*return*/];
                 }
             });
@@ -369,7 +329,7 @@ var BaseAPI = /** @class */ (function () {
                     case 2:
                         tokenString = _a.sent();
                         accessToken = "Bearer ".concat(tokenString);
-                        originalConfig.headers['Authorization'] = accessToken;
+                        originalConfig.headers['Authorization'] = "Bearer ".concat(accessToken);
                         this.configuration.accessToken = accessToken;
                         return [2 /*return*/, axios.request(originalConfig)];
                     case 3:

package/dist/common.js

@@ -141,7 +141,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*/];
             }
@@ -171,7 +171,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

@@ -87,10 +87,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-node",
-  "version": "1.21.1-beta.124",
+  "version": "1.21.1-beta.126",
   "description": "OpenAPI client for @emilgroup/payment-sdk-node",
   "author": "OpenAPI-Generator Contributors",
   "keywords": [

package/tsconfig.json

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