@emilgroup/migration-sdk 0.10.1-beta.13 → 0.10.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/migration-sdk@0.10.1-beta.13 --save
+npm install @emilgroup/migration-sdk@0.10.1-beta.2 --save
 ```
 or 
 ```
-yarn add @emilgroup/migration-sdk@0.10.1-beta.13
+yarn add @emilgroup/migration-sdk@0.10.1-beta.2
 ```
 
 And then you can import ``.

package/base.ts

@@ -93,14 +93,10 @@ export class BaseAPI {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
 
-            if (configuration.cookieAuth) {
-                this.useCookieAuth();
-            } else {
-                // Use config token if provided, otherwise use tokenData token
-                const configToken = this.configuration.accessToken;
-                const storedToken = accessToken ? `Bearer ${accessToken}` : '';
-                this.configuration.accessToken = configToken || storedToken;
-            }
+            // Use config token if provided, otherwise use tokenData token
+            const configToken = this.configuration.accessToken;
+            const storedToken = accessToken ? `Bearer ${accessToken}` : '';
+            this.configuration.accessToken = configToken || storedToken;
         } else {
             const { accessToken, username } = this.tokenData;
 
@@ -114,12 +110,6 @@ export class BaseAPI {
         this.attachInterceptor(axios);
     }
 
-    // Cookie mode: the browser sends the HttpOnly access cookie, so no token is read from storage.
-    private useCookieAuth() {
-        this.configuration.username = this.configuration.username || this.tokenData.username;
-        this.configuration.baseOptions = { ...this.configuration.baseOptions, withCredentials: true };
-    }
-
     selectEnvironment(env: Environment) {
         this.selectBasePath(env);
     }
@@ -153,12 +143,10 @@ export class BaseAPI {
         const { data: { accessToken, permissions } } = response;
 
         this.configuration.username = username;
+        this.configuration.accessToken = `Bearer ${accessToken}`;
         this.tokenData.username = username;
+        this.tokenData.accessToken = accessToken;
         this.tokenData.permissions = permissions;
-        if (!this.configuration.cookieAuth) {
-            this.configuration.accessToken = `Bearer ${accessToken}`;
-            this.tokenData.accessToken = accessToken;
-        }
 
     }
 
@@ -196,11 +184,6 @@ export class BaseAPI {
 
     private storeTokenData(tokenData?: TokenData) {
         if (typeof window !== 'undefined') {
-            if (tokenData && this.configuration?.cookieAuth) {
-                // Cookie mode saves who is logged in, never the token; a token saved by apps not yet migrated stays.
-                const { username, permissions } = tokenData;
-                tokenData = { ...(defaultStorage().get<TokenData>(TOKEN_DATA) || {}), username, permissions };
-            }
             defaultStorage().set<TokenData>(TOKEN_DATA, tokenData);
         }
     }
@@ -231,17 +214,15 @@ export class BaseAPI {
                         originalConfig._retry = true;
                         try {
                             const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                            const accessToken = `Bearer ${tokenString}`;
                             this.tokenData.permissions = permissions;
 
                             delete originalConfig.headers['Authorization']
 
-                            // In cookie mode the refresh reply renewed the access cookie, so retry without a header.
-                            if (!this.configuration.cookieAuth) {
-                                const accessToken = `Bearer ${tokenString}`;
-                                originalConfig.headers['Authorization'] = accessToken;
-                                this.configuration.accessToken = accessToken;
-                                this.tokenData.accessToken = tokenString;
-                            }
+                            originalConfig.headers['Authorization'] = accessToken;
+
+                            this.configuration.accessToken = accessToken;
+                            this.tokenData.accessToken = tokenString;
 
                             this.storeTokenData(this.tokenData);
 

package/configuration.ts

@@ -21,7 +21,6 @@ export interface ConfigurationParameters {
     basePath?: string;
     baseOptions?: any;
     formDataCtor?: new () => any;
-    cookieAuth?: boolean;
 }
 
 export class Configuration {
@@ -75,15 +74,6 @@ export class Configuration {
      */
     formDataCtor?: new () => any;
 
-    /**
-     * Authenticate with the HttpOnly access cookie instead of a stored token: every call sends credentials.
-     * The browser holds one cookie, so use it with one logged-in account; log out through the auth service.
-     *
-     * @type {boolean}
-     * @memberof Configuration
-     */
-    cookieAuth?: boolean;
-
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
         this.username = param.username;
@@ -92,7 +82,6 @@ export class Configuration {
         this.basePath = param.basePath;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
-        this.cookieAuth = param.cookieAuth;
     }
 
     /**

package/dist/base.d.ts

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

package/dist/base.js

@@ -128,15 +128,10 @@ var BaseAPI = /** @class */ (function () {
             var accessToken = this.tokenData.accessToken;
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
-            if (configuration.cookieAuth) {
-                this.useCookieAuth();
-            }
-            else {
-                // 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;
-            }
+            // 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;
         }
         else {
             var _a = this.tokenData, accessToken = _a.accessToken, username = _a.username;
@@ -148,11 +143,6 @@ var BaseAPI = /** @class */ (function () {
         }
         this.attachInterceptor(axios);
     }
-    // Cookie mode: the browser sends the HttpOnly access cookie, so no token is read from storage.
-    BaseAPI.prototype.useCookieAuth = function () {
-        this.configuration.username = this.configuration.username || this.tokenData.username;
-        this.configuration.baseOptions = __assign(__assign({}, this.configuration.baseOptions), { withCredentials: true });
-    };
     BaseAPI.prototype.selectEnvironment = function (env) {
         this.selectBasePath(env);
     };
@@ -187,12 +177,10 @@ var BaseAPI = /** @class */ (function () {
                         response = _b.sent();
                         _a = response.data, accessToken = _a.accessToken, permissions = _a.permissions;
                         this.configuration.username = username;
+                        this.configuration.accessToken = "Bearer ".concat(accessToken);
                         this.tokenData.username = username;
+                        this.tokenData.accessToken = accessToken;
                         this.tokenData.permissions = permissions;
-                        if (!this.configuration.cookieAuth) {
-                            this.configuration.accessToken = "Bearer ".concat(accessToken);
-                            this.tokenData.accessToken = accessToken;
-                        }
                         return [2 /*return*/];
                 }
             });
@@ -234,13 +222,7 @@ var BaseAPI = /** @class */ (function () {
         });
     };
     BaseAPI.prototype.storeTokenData = function (tokenData) {
-        var _a;
         if (typeof window !== 'undefined') {
-            if (tokenData && ((_a = this.configuration) === null || _a === void 0 ? void 0 : _a.cookieAuth)) {
-                // Cookie mode saves who is logged in, never the token; a token saved by apps not yet migrated stays.
-                var username = tokenData.username, permissions = tokenData.permissions;
-                tokenData = __assign(__assign({}, ((0, common_1.defaultStorage)().get(TOKEN_DATA) || {})), { username: username, permissions: permissions });
-            }
             (0, common_1.defaultStorage)().set(TOKEN_DATA, tokenData);
         }
     };
@@ -275,15 +257,12 @@ var BaseAPI = /** @class */ (function () {
                         return [4 /*yield*/, this.refreshTokenInternal()];
                     case 2:
                         _a = _c.sent(), tokenString = _a.accessToken, permissions = _a.permissions;
+                        accessToken = "Bearer ".concat(tokenString);
                         this.tokenData.permissions = permissions;
                         delete originalConfig.headers['Authorization'];
-                        // In cookie mode the refresh reply renewed the access cookie, so retry without a header.
-                        if (!this.configuration.cookieAuth) {
-                            accessToken = "Bearer ".concat(tokenString);
-                            originalConfig.headers['Authorization'] = accessToken;
-                            this.configuration.accessToken = accessToken;
-                            this.tokenData.accessToken = tokenString;
-                        }
+                        originalConfig.headers['Authorization'] = accessToken;
+                        this.configuration.accessToken = accessToken;
+                        this.tokenData.accessToken = tokenString;
                         this.storeTokenData(this.tokenData);
                         return [2 /*return*/, axios(originalConfig)];
                     case 3:

package/dist/configuration.d.ts

@@ -17,7 +17,6 @@ export interface ConfigurationParameters {
     basePath?: string;
     baseOptions?: any;
     formDataCtor?: new () => any;
-    cookieAuth?: boolean;
 }
 export declare class Configuration {
     /**
@@ -69,14 +68,6 @@ export declare class Configuration {
      * @type {new () => FormData}
      */
     formDataCtor?: new () => any;
-    /**
-     * Authenticate with the HttpOnly access cookie instead of a stored token: every call sends credentials.
-     * The browser holds one cookie, so use it with one logged-in account; log out through the auth service.
-     *
-     * @type {boolean}
-     * @memberof Configuration
-     */
-    cookieAuth?: boolean;
     constructor(param?: ConfigurationParameters);
     /**
      * Check if the given MIME is a JSON MIME.

package/dist/configuration.js

@@ -24,7 +24,6 @@ var Configuration = /** @class */ (function () {
         this.basePath = param.basePath;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
-        this.cookieAuth = param.cookieAuth;
     }
     /**
      * Check if the given MIME is a JSON MIME.

package/package.json

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