@emilgroup/accounting-sdk 1.34.1-beta.75 → 1.34.1-beta.76

package/base.ts

@@ -32,20 +32,9 @@ export const COLLECTION_FORMATS = {
     pipes: "|",
 };
 
-export interface SessionClass {
-    sub: string;
-    username?: string;
-    email?: string;
-    tenantSlug?: string;
-    permissions?: string;
-    expiresAt?: number;
-}
-
 export interface LoginClass {
     accessToken: string;
     permissions: string;
-    authMode?: string;
-    session?: SessionClass;
 }
 
 export interface SwitchWorkspaceRequest {
@@ -56,8 +45,6 @@ export interface SwitchWorkspaceRequest {
 export interface SwitchWorkspaceResponseClass {
     accessToken: string;
     permissions: string;
-    authMode?: string;
-    session?: SessionClass;
 }
 
 export enum Environment {
@@ -90,19 +77,10 @@ interface TokenData {
     accessToken?: string;
     username?: string;
     permissions?: string;
-    // 'both' or 'session' when authservice keeps the tokens in a server session.
-    authMode?: string;
-    sub?: string;
 }
 
 const NETWORK_ERROR_MESSAGE = "Network Error";
 const TOKEN_DATA = 'APP_TOKEN';
-// Sent only to authservice, to ask for a server session.
-const AUTH_MODE_HEADER = 'X-Emil-Auth-Mode';
-// Names the account on every call; one browser session can hold several.
-const ACCOUNT_HEADER = 'X-Emil-Account';
-const SESSION_MODES = ['both', 'session'];
-const RESEND_SAFE_METHODS = ['get', 'head', 'options'];
 
 /**
  *
@@ -124,18 +102,10 @@ export class BaseAPI {
             this.configuration = configuration;
             this.basePath = configuration.basePath || this.basePath;
 
-            if (configuration.cookieAuth) {
-                this.configuration.username = this.configuration.username || this.tokenData.username;
-            }
-
-            if (this.usesSession()) {
-                this.useSessionAuth();
-            } 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;
 
@@ -149,107 +119,6 @@ export class BaseAPI {
         this.attachInterceptor(axios);
     }
 
-    // The app's own account wins over APP_TOKEN, which holds whichever tab wrote last.
-    private sessionAccount(): string | undefined {
-        return this.configuration.account || this.tokenData.sub;
-    }
-
-    // Apps may pass the address as the second argument only; authservice is on the same host.
-    private authBasePath(): string {
-        return this.configuration.basePath || this.basePath;
-    }
-
-    private usesSession(): boolean {
-        return !!this.configuration.cookieAuth && SESSION_MODES.indexOf(this.tokenData.authMode) !== -1 && !!this.sessionAccount();
-    }
-
-    private useSessionAuth() {
-        const { headers, ...baseOptions } = this.configuration.baseOptions || {};
-        this.configuration.accessToken = '';
-        this.configuration.baseOptions = {
-            ...baseOptions,
-            withCredentials: true,
-            headers: { ...headers, [ACCOUNT_HEADER]: this.sessionAccount() },
-        };
-    }
-
-    private useHeaderAuth(accessToken: string) {
-        this.configuration.accessToken = accessToken ? `Bearer ${accessToken}` : '';
-        this.tokenData.accessToken = accessToken;
-        delete this.tokenData.authMode;
-        delete this.tokenData.sub;
-        if (this.configuration.cookieAuth) {
-            const { withCredentials, headers, ...baseOptions } = this.configuration.baseOptions || {};
-            const { [ACCOUNT_HEADER]: account, ...otherHeaders } = headers || {};
-            this.configuration.baseOptions = { ...baseOptions, headers: otherHeaders };
-        }
-    }
-
-    private applyTokenReply({ accessToken, authMode, session }: LoginClass) {
-        if (this.configuration.cookieAuth && SESSION_MODES.indexOf(authMode) !== -1 && session?.sub) {
-            this.tokenData.authMode = authMode;
-            this.tokenData.sub = session.sub;
-            if (this.configuration.account) {
-                // A workspace switch moves the app to another account.
-                this.configuration.account = session.sub;
-            }
-            // Both keeps the token for apps not moved yet; session mode keeps no token at all.
-            if (authMode === 'both' && accessToken) {
-                this.tokenData.accessToken = accessToken;
-            } else {
-                delete this.tokenData.accessToken;
-            }
-            this.useSessionAuth();
-        } else {
-            this.useHeaderAuth(accessToken);
-        }
-    }
-
-    private sessionHeaders(): Record<string, string> {
-        if (!this.configuration.cookieAuth) {
-            return {};
-        }
-        return {
-            [AUTH_MODE_HEADER]: 'session',
-            ...(this.usesSession() && { [ACCOUNT_HEADER]: this.sessionAccount() }),
-        };
-    }
-
-    private withCurrentAuth(config: AxiosRequestConfig): AxiosRequestConfig {
-        delete config.headers['Authorization'];
-        delete config.headers[ACCOUNT_HEADER];
-        if (this.usesSession()) {
-            config.headers[ACCOUNT_HEADER] = this.sessionAccount();
-            config.withCredentials = true;
-        } else if (this.configuration.accessToken) {
-            config.headers['Authorization'] = this.configuration.accessToken;
-        }
-        return config;
-    }
-
-    // Both keeps the token, so a session call the browser could not complete can be sent again with it.
-    private canRetryWithToken(config: AxiosRequestConfig): boolean {
-        return !!config.withCredentials && !!config.headers?.[ACCOUNT_HEADER]
-            && !!this.tokenData.accessToken && this.tokenData.authMode !== 'session';
-    }
-
-    // A network error can come after the server ran the call, so only a call that is safe to repeat is sent again.
-    private canResend(config: AxiosRequestConfig): boolean {
-        return RESEND_SAFE_METHODS.indexOf((config.method || 'get').toLowerCase()) !== -1
-            || Object.keys(config.headers || {}).some((name) => name.toLowerCase() === 'idempotency-key');
-    }
-
-    private switchToToken() {
-        this.useHeaderAuth(this.tokenData.accessToken);
-        this.storeTokenData(this.tokenData);
-    }
-
-    private retryWithToken(axios: AxiosInstance, config: AxiosRequestConfig) {
-        this.switchToToken();
-        config.withCredentials = false;
-        return axios(this.withCurrentAuth(config));
-    }
-
     selectEnvironment(env: Environment) {
         this.selectBasePath(env);
     }
@@ -269,8 +138,8 @@ export class BaseAPI {
     async authorize(username: string, password: string, targetWorkspace?: string): Promise<void> {
         const options: AxiosRequestConfig = {
             method: 'POST',
-            url: `${this.authBasePath()}/authservice/v1/login`,
-            headers: { 'Content-Type': 'application/json', ...(this.configuration.cookieAuth && { [AUTH_MODE_HEADER]: 'session' }) },
+            url: `${this.configuration.basePath}/authservice/v1/login`,
+            headers: { 'Content-Type': 'application/json' },
             data: {
                 username,
                 password,
@@ -280,10 +149,13 @@ export class BaseAPI {
 
         const response = await globalAxios.request<LoginClass>(options);
 
+        const { data: { accessToken, permissions } } = response;
+
         this.configuration.username = username;
+        this.configuration.accessToken = `Bearer ${accessToken}`;
         this.tokenData.username = username;
-        this.tokenData.permissions = response.data.permissions;
-        this.applyTokenReply(response.data);
+        this.tokenData.accessToken = accessToken;
+        this.tokenData.permissions = permissions;
 
         // Switch workspace if provided
         if (targetWorkspace) {
@@ -303,11 +175,10 @@ export class BaseAPI {
     async switchWorkspace(targetWorkspace: string): Promise<void> {
         const options: AxiosRequestConfig = {
             method: 'POST',
-            url: `${this.authBasePath()}/authservice/v1/workspaces/switch`,
+            url: `${this.configuration.basePath}/authservice/v1/workspaces/switch`,
             headers: {
                 'Content-Type': 'application/json',
-                ...this.sessionHeaders(),
-                ...(!this.usesSession() && !!this.configuration.accessToken && { 'Authorization': this.configuration.accessToken as string }),
+                'Authorization': `Bearer ${this.configuration.accessToken}`,
             },
             data: {
                 username: this.configuration.username,
@@ -318,8 +189,11 @@ export class BaseAPI {
 
         const response = await globalAxios.request<SwitchWorkspaceResponseClass>(options);
 
-        this.tokenData.permissions = response.data.permissions;
-        this.applyTokenReply(response.data);
+        const { data: { accessToken, permissions } } = response;
+        
+        this.configuration.accessToken = `Bearer ${accessToken}`;
+        this.tokenData.accessToken = accessToken;
+        this.tokenData.permissions = permissions;
 
         this.storeTokenData({
             ...this.tokenData
@@ -345,10 +219,9 @@ export class BaseAPI {
 
         const options: AxiosRequestConfig = {
             method: 'POST',
-            url: `${this.authBasePath()}/authservice/v1/refresh-token`,
+            url: `${this.configuration.basePath}/authservice/v1/refresh-token`,
             headers: {
                 'Content-Type': 'application/json',
-                ...this.sessionHeaders(),
             },
             data: { username: username },
             withCredentials: true,
@@ -389,22 +262,20 @@ export class BaseAPI {
                         && !originalConfig._retry) {
                         originalConfig._retry = true;
                         try {
-                            const reply = await this.refreshTokenInternal();
-                            this.tokenData.permissions = reply.permissions;
-                            this.applyTokenReply(reply);
-                            this.storeTokenData(this.tokenData);
+                            const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                            const accessToken = `Bearer ${tokenString}`;
+                            this.tokenData.permissions = permissions;
 
-                            if (!this.usesSession()) {
-                                return axios(this.withCurrentAuth(originalConfig));
-                            }
+                            delete originalConfig.headers['Authorization']
+
+                            originalConfig.headers['Authorization'] = accessToken;
 
-                            // Both mode: if the browser does not send the session cookie (another site), use the token.
-                            return axios(this.withCurrentAuth(originalConfig)).catch((retryError) => {
-                                if (retryError?.response?.status !== 401 || !this.tokenData.accessToken) {
-                                    return Promise.reject(retryError);
-                                }
-                                return this.retryWithToken(axios, originalConfig);
-                            });
+                            this.configuration.accessToken = accessToken;
+                            this.tokenData.accessToken = tokenString;
+
+                            this.storeTokenData(this.tokenData);
+
+                            return axios(originalConfig);
                         } catch (_error) {
                             if (_error.response && _error.response.data) {
                                 return Promise.reject(_error.response.data);
@@ -412,30 +283,26 @@ export class BaseAPI {
                             return Promise.reject(_error);
                         }
                     }
-                } else if (err.message === NETWORK_ERROR_MESSAGE && this.canRetryWithToken(originalConfig)) {
-                    // Both mode: the browser blocked the session call or hid its reply; later calls use the token.
-                    if (!this.canResend(originalConfig)) {
-                        this.switchToToken();
-                        return Promise.reject(err);
-                    }
-                    return this.retryWithToken(axios, originalConfig);
                 } else if (err.message === NETWORK_ERROR_MESSAGE
-                    && (originalConfig.headers.hasOwnProperty('Authorization')
-                        || (this.configuration.cookieAuth && originalConfig.withCredentials && this.canResend(originalConfig)))
+                    && originalConfig.headers.hasOwnProperty('Authorization')
                     && _retry_count < 4
                 ) {
                     _retry_count++;
                     try {
-                        // In session mode an unreadable 401 (no CORS headers on the error reply) also lands here.
-                        const reply = await this.refreshTokenInternal();
-                        this.tokenData.permissions = reply.permissions;
+                        const { accessToken: tokenString, permissions } = await this.refreshTokenInternal();
+                        const accessToken = `Bearer ${tokenString}`;
+                        this.tokenData.permissions = permissions;
 
                         _retry = true;
-                        this.applyTokenReply(reply);
+                        originalConfig.headers['Authorization'] = accessToken;
+
+                        this.configuration.accessToken = accessToken;
+                        this.tokenData.accessToken = tokenString;
+
                         this.storeTokenData(this.tokenData);
 
                         return axios.request({
-                            ...this.withCurrentAuth(originalConfig),
+                            ...originalConfig,
                         });
                     } catch (_error) {
                         if (_error.response && _error.response.data) {

package/common.ts

@@ -130,10 +130,9 @@ export const toPathString = function (url: URL) {
  * @export
  */
 export const createRequestFunction = function (axiosArgs: RequestArgs, globalAxios: AxiosInstance, BASE_PATH: string, configuration?: Configuration) {
-    // Typed by hand: since axios 1.20, request() returns an internal axios type that SDK declarations cannot name.
-    return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH): Promise<R> => {
+    return <T = unknown, R = AxiosResponse<T>>(axios: AxiosInstance = globalAxios, basePath: string = BASE_PATH) => {
         const axiosRequestArgs = {...axiosArgs.options, url: (configuration?.basePath || basePath) + axiosArgs.url};
-        return axios.request<T, R>(axiosRequestArgs) as Promise<R>;
+        return axios.request<T, R>(axiosRequestArgs);
     };
 }
 

package/configuration.ts

@@ -21,8 +21,6 @@ export interface ConfigurationParameters {
     basePath?: string;
     baseOptions?: any;
     formDataCtor?: new () => any;
-    cookieAuth?: boolean;
-    account?: string;
 }
 
 export class Configuration {
@@ -76,22 +74,6 @@ export class Configuration {
      */
     formDataCtor?: new () => any;
 
-    /**
-     * Use a server session when authservice makes one; otherwise the token, as without this option.
-     * Set `account` too, so each SDK object keeps its own account.
-     *
-     * @type {boolean}
-     * @memberof Configuration
-     */
-    cookieAuth?: boolean;
-    /**
-     * The session account (Cognito sub) this app shows, so the SDK never takes another tab's account.
-     *
-     * @type {string}
-     * @memberof Configuration
-     */
-    account?: string;
-
     constructor(param: ConfigurationParameters = {}) {
         this.apiKey = param.apiKey;
         this.username = param.username;
@@ -100,8 +82,6 @@ export class Configuration {
         this.basePath = param.basePath;
         this.baseOptions = param.baseOptions;
         this.formDataCtor = param.formDataCtor;
-        this.cookieAuth = param.cookieAuth;
-        this.account = param.account;
     }
 
     /**

package/dist/api/accounting-configs-api.d.ts

@@ -384,7 +384,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    createAndEnableSubledger(requestParameters: AccountingConfigsApiCreateAndEnableSubledgerRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateAndEnableSubledgerResponseClass, any, {}, any>>;
+    createAndEnableSubledger(requestParameters: AccountingConfigsApiCreateAndEnableSubledgerRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateAndEnableSubledgerResponseClass, any, {}>>;
     /**
      * This will create and enable the subledger, using an accounting config from a file.  **Required Permissions**  \"accounting-management.financial-accounts.create\"
      * @summary Create the create and enable subledger from file
@@ -393,7 +393,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    createAndEnableSubledgerFromFile(requestParameters: AccountingConfigsApiCreateAndEnableSubledgerFromFileRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateAndEnableSubledgerResponseClass, any, {}, any>>;
+    createAndEnableSubledgerFromFile(requestParameters: AccountingConfigsApiCreateAndEnableSubledgerFromFileRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<CreateAndEnableSubledgerResponseClass, any, {}>>;
     /**
      * This will export the accounting config.  **Required Permissions**  \"accounting-management.financial-accounts.view\"
      * @summary Retrieve the export accounting config
@@ -402,7 +402,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    exportAccountingConfig(requestParameters?: AccountingConfigsApiExportAccountingConfigRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ExportAccountingConfigResponseClass, any, {}, any>>;
+    exportAccountingConfig(requestParameters?: AccountingConfigsApiExportAccountingConfigRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ExportAccountingConfigResponseClass, any, {}>>;
     /**
      * This will get the accounting categories.  **Required Permissions**  \"accounting-management.financial-accounts.view\"
      * @summary Retrieve the accounting categories
@@ -411,7 +411,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    getAccountingCategories(requestParameters?: AccountingConfigsApiGetAccountingCategoriesRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetAccountingCategoriesResponseClass, any, {}, any>>;
+    getAccountingCategories(requestParameters?: AccountingConfigsApiGetAccountingCategoriesRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetAccountingCategoriesResponseClass, any, {}>>;
     /**
      * Returns the subledger configuration as it was when the subledger was enabled, along with who created it, when, and its enablement status.  **Required Permissions**  \"accounting-management.financial-accounts.view\"
      * @summary Retrieve the get activation snapshot
@@ -420,7 +420,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    getActivationSnapshot(requestParameters?: AccountingConfigsApiGetActivationSnapshotRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetActivationSnapshotResponseClass, any, {}, any>>;
+    getActivationSnapshot(requestParameters?: AccountingConfigsApiGetActivationSnapshotRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<GetActivationSnapshotResponseClass, any, {}>>;
     /**
      * This will reset the subledger, and remove all config and accounts.  **Required Permissions**  \"accounting-management.financial-accounts.delete\"
      * @summary Delete the reset subledger
@@ -429,7 +429,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    resetSubledger(requestParameters?: AccountingConfigsApiResetSubledgerRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<void, any, {}, any>>;
+    resetSubledger(requestParameters?: AccountingConfigsApiResetSubledgerRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<void, any, {}>>;
     /**
      * This will validate accounting config.  **Required Permissions**  \"accounting-management.financial-accounts.create\"
      * @summary Create the validate accounting config
@@ -438,7 +438,7 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    validateAccountingConfig(requestParameters: AccountingConfigsApiValidateAccountingConfigRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ValidateAccountingConfigResponseClass, any, {}, any>>;
+    validateAccountingConfig(requestParameters: AccountingConfigsApiValidateAccountingConfigRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ValidateAccountingConfigResponseClass, any, {}>>;
     /**
      * This will validate accounting config from a file.  **Required Permissions**  \"accounting-management.financial-accounts.create\"
      * @summary Create the validate accounting config from file
@@ -447,5 +447,5 @@ export declare class AccountingConfigsApi extends BaseAPI {
      * @throws {RequiredError}
      * @memberof AccountingConfigsApi
      */
-    validateAccountingConfigFromFile(requestParameters: AccountingConfigsApiValidateAccountingConfigFromFileRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ValidateAccountingConfigResponseClass, any, {}, any>>;
+    validateAccountingConfigFromFile(requestParameters: AccountingConfigsApiValidateAccountingConfigFromFileRequest, options?: AxiosRequestConfig): Promise<import("axios").AxiosResponse<ValidateAccountingConfigResponseClass, any, {}>>;
 }