@or-sdk/auth 0.27.1 → 0.28.0-beta.2379.0

package/src/Auth.ts

@@ -1,11 +1,10 @@
 import axios from 'axios';
-import { Settings } from '@or-sdk/settings';
 import { SdkApi } from '@or-sdk/sdk-api';
+import { Token } from '@or-sdk/base';
 import {
   AuthConfig,
   AuthResponse,
   Domain,
-  HeadersObj,
   MultiUserLoginUserArgs,
   MultiUserResponse,
   MultiUserUpdateTwoFactorArgs,
@@ -14,6 +13,7 @@ import {
   SaveUserArgs,
   SignInArgs,
   User,
+  MultiUser,
 } from './types';
 import { generateFingerPrint, NoRightsError } from './utils';
 import { isNode } from 'browser-or-node';
@@ -41,7 +41,10 @@ export class Auth {
   private readonly cookiePollingInterval: number;
   public readonly expireInShort: number;
   public readonly expireInLong: number;
-  private readonly _token?: string;
+  private _multiUser?: MultiUser;
+  private isRefreshingMultiUser = false;
+  private isRefreshingUser = false;
+  private readonly _multiUserToken?: Token;
   private loggedIn = false;
   private monitorCookieTimeout?: ReturnType<typeof setTimeout>;
 
@@ -60,7 +63,7 @@ export class Auth {
       expireInLong,
       allowIframe,
       authUiUrl,
-      token,
+      multiUserToken,
     } = params;
 
     this.discoveryUrl = discoveryUrl;
@@ -86,7 +89,7 @@ export class Auth {
     this.expireInShort = expireInShort ? +expireInShort : defaultExpireInShort;
     this.expireInLong = expireInLong ? +expireInLong : defaultExpireInLong;
 
-    this._token = token;
+    this._multiUserToken = multiUserToken;
   }
 
   public get domain(): Domain {
@@ -166,17 +169,6 @@ export class Auth {
       sameSite: this.allowIframe ? 'none' : 'lax',
       ...this.domain,
     });
-    // Should be deleted after migration
-    this.cookie.set(this.deprecatedCookieName, user, {
-      path: '/',
-      expires: nextExpiration,
-      ...this.domain,
-    });
-    this.cookie.set(this.deprecatedUserExpireCookieName, expireIn, {
-      path: '/',
-      expires: nextExpiration,
-      ...this.domain,
-    });
   }
 
   /**
@@ -185,15 +177,24 @@ export class Auth {
    * instance.saveMultiUser(user, expiration);
    * ```
    */
-  public saveMultiUser(user: User, expiration: number): void {
-    this.cookie.set(this.multiUserCookieName!, user, {
-      path: '/',
-      expires: this._getNextExpiration(expiration),
-      secure: true,
-      ...this.domain,
+  public async saveMultiUser(user?: User, expireLong?: boolean) {
+    const sdkApi = new SdkApi({
+      token: user?.token || '',
+      discoveryUrl: this.discoveryUrl,
+      sdkUrl: this.sdkUrl,
     });
-  }
 
+    const data = await sdkApi.makeRequest<MultiUser>({
+      method: 'get',
+      withCredentials: true,
+      params: {
+        expireLong,
+      },
+      route: '/multi-user/token',
+    });
+    this._multiUser = data;
+    return data;
+  }
   /**
    * Update cookie expiration
    * ```typescript
@@ -201,15 +202,21 @@ export class Auth {
    * ```
    */
   public updateCookieExpiration(): void {
-    const user = this._getUser;
-    const expire = this.getUserExpire();
-    if (user) {
+    const user = this._getUser as any;
+    if (this._multiUser)
+      if (user?.expire < Date.now() + 1000 * 60)
+        this.refreshUserToken()
+          .catch(() => {
+            this.removeCookies();
+            this._multiUser = undefined;
+          });
+    if ((this._multiUser as any)?.expire < Date.now() + 1000 * 60) this.refreshMultiUserToken();
+
+    // user without mult
+    if (user && !user.multiUserId) {
+      const expire = this.getUserExpire();
       this._saveCookies(user, expire);
     }
-    const multiUser = this.cookie.get(this.multiUserCookieName!);
-    if (multiUser) {
-      this.saveMultiUser(multiUser, expire);
-    }
   }
 
   private _validateGuest(role: string, allowGuestLoginOverride = false): void {
@@ -228,26 +235,7 @@ export class Auth {
    * ```
    */
   public async saveUser({ long, user }: SaveUserArgs): Promise<void> {
-    const key = long ? 'cookieExpirationLong' : 'cookieExpirationShort';
-    const settingsApi = new Settings({
-      token: user.token!,
-      discoveryUrl: this.discoveryUrl,
-      sdkUrl: this.sdkUrl,
-    });
-
-    let cookieExpirationDuration;
-    try {
-      cookieExpirationDuration = await settingsApi.getMergedSettings({ key });
-    } catch (error) {
-      // eslint-disable-next-line no-console
-      console.log('Unable to fetch settingCookiesExpire from user Settings: ', error);
-    }
-
-    if (!cookieExpirationDuration) {
-      cookieExpirationDuration = long ? this.expireInLong : this.expireInShort;
-    }
-
-    this._saveCookies(user, cookieExpirationDuration);
+    this._saveCookies(user, long ? this.expireInLong : this.expireInShort);
   }
 
   /**
@@ -282,6 +270,7 @@ export class Auth {
       verificationCode,
       fingerPrint,
       rememberTwoFactor,
+      expireLong: long,
       ... userToken ? { userToken } : {},
     };
 
@@ -295,13 +284,14 @@ export class Auth {
       method: 'POST',
       route: '/auth/token',
       data: options,
+      withCredentials: true,
     });
 
     this._validateGuest(user.role!, allowGuestLogin);
 
     if (!user.twoFactorCheck && !user.captchaCheck) {
       if (user.tokenType === 'multi-user') {
-        this.saveMultiUser(user, long ? this.expireInLong : this.expireInShort);
+        this._multiUser = user;
       } else {
         await this.saveUser({
           long,
@@ -396,17 +386,6 @@ export class Auth {
     return user;
   }
 
-  public get multiUserHeaders(): HeadersObj {
-    const { token = '' } = this.cookie.get(this.multiUserCookieName!) || {};
-    return { headers: { Authorization: token } };
-  }
-
-  private get token(): string {
-    return this._token
-      ? this._token
-      : this.multiUserHeaders.headers.Authorization;
-  }
-
   /**
    * Remove cookies
    * ```typescript
@@ -467,18 +446,18 @@ export class Auth {
           route: '/auth/fingerprint-token',
         }));
       }
-      if (this.token) {
-        const sdkApi = new SdkApi({
-          token: this.token,
-          discoveryUrl: this.discoveryUrl,
-          sdkUrl: this.sdkUrl,
-        });
 
-        promises.push(sdkApi.makeRequest<void>({
-          method: 'DELETE',
-          route: '/multi-user/fingerprint-token',
-        }));
-      }
+      const sdkApi = new SdkApi({
+        token: '',
+        discoveryUrl: this.discoveryUrl,
+        sdkUrl: this.sdkUrl,
+      });
+
+      promises.push(sdkApi.makeRequest<void>({
+        method: 'DELETE',
+        route: '/multi-user/fingerprint-token',
+        withCredentials: true,
+      }));
       await Promise.all(promises);
     } catch (error) {
       // eslint-disable-next-line no-console
@@ -494,14 +473,16 @@ export class Auth {
    * ```
    */
   public async validateUser(allowGuestLogin = false, shouldNotSaveCookies = false,): Promise<User> {
-    this._checkDeprecatedCookies();
     const userParams = this._getUser;
 
     if (!userParams) {
       return Promise.reject(new Error('No cached user params are available'));
     }
+    let user: any;
 
-    const user = await this._validateToken(userParams.token!, allowGuestLogin);
+    if (userParams.expire < Date.now())
+      user = await this.refreshUserToken();
+    else user = await this._validateToken(userParams.token!, allowGuestLogin);
 
     if (!user.identityProvider && userParams.identityProvider) {
       user.identityProvider = userParams.identityProvider;
@@ -542,15 +523,15 @@ export class Auth {
    * ```
    */
   public async multiUserGetUsersList(): Promise<any> {
-    if (!this.token) return false;
 
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
     return sdkApi.makeRequest<any>({
+      withCredentials: true,
       method: 'GET',
       route: '/multi-user/list-users',
     });
@@ -568,12 +549,13 @@ export class Auth {
    */
   public async multiUserLoginUser({ accountId, id, long }: MultiUserLoginUserArgs): Promise<User> {
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
     const user = await sdkApi.makeRequest<User>({
+      withCredentials: true,
       method: 'POST',
       route: '/multi-user/user-token',
       data: {
@@ -627,12 +609,13 @@ export class Auth {
    */
   public async multiUserGetProfile(): Promise<any> {
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
     return sdkApi.makeRequest<any>({
+      withCredentials: true,
       method: 'GET',
       route: '/multi-user/profile',
     });
@@ -646,12 +629,13 @@ export class Auth {
    */
   public async multiUserSetProfile(profile: unknown): Promise<any> {
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
     return sdkApi.makeRequest<any>({
+      withCredentials: true,
       method: 'POST',
       route: '/multi-user/profile',
       data: profile,
@@ -666,17 +650,19 @@ export class Auth {
    * @param token - Optional token to validate. If not provided, the method will use the token from the multiUserHeaders.
    */
   public async validateMultiUserToken(token?: string): Promise<any> {
-    token = token || this.token;
     const sdkApi = new SdkApi({
-      token: token,
+      token: token || this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
-    return sdkApi.makeRequest<any>({
+    const data = await sdkApi.makeRequest<any>({
+      withCredentials: true,
       method: 'GET',
       route: '/multi-user/token',
     });
+    this._multiUser = data;
+    return data;
   }
 
   /**
@@ -691,12 +677,13 @@ export class Auth {
    */
   public async multiUserUploadIcon({ name, contentType, cacheControl = 'no-cache', file }: MultiUserUploadIconArgs): Promise<string> {
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
 
     const data = await sdkApi.makeRequest<MultiUserUploadIconResponse>({
+      withCredentials: true,
       method: 'POST',
       route: '/multi-user/sign-upload-url',
       data: {
@@ -739,7 +726,7 @@ export class Auth {
    */
   public async confirmEmailChange({ token }: { token: string; }): Promise<any> {
     const sdkApi = new SdkApi({
-      token: '',
+      token,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
@@ -766,7 +753,7 @@ export class Auth {
    */
   public async multiUserUpdateTwoFactor({ secret, enabled, codes, verificationCode }: MultiUserUpdateTwoFactorArgs): Promise<any> {
     const sdkApi = new SdkApi({
-      token: this.token,
+      token: this.multiUserToken as string,
       discoveryUrl: this.discoveryUrl,
       sdkUrl: this.sdkUrl,
     });
@@ -774,6 +761,7 @@ export class Auth {
     return sdkApi.makeRequest<any>({
       method: 'PUT',
       route: '/multi-user/twofactor',
+      withCredentials: true,
       data: {
         secret,
         enabled,
@@ -783,4 +771,52 @@ export class Auth {
     });
   }
 
+  /**
+   * Regenerate user token to update expiration
+   * ```typescript
+   * const result = await instance.refreshUserToken();
+   * ```
+   */
+  async refreshUserToken(): Promise<User | undefined> {
+    this.isRefreshingUser = true;
+    try {
+      const user = this._getUser;
+      if (user)
+        return await this.multiUserLoginUser({
+          accountId: user.accountId,
+          id: user.userId,
+          long: this.getUserExpire() === this.expireInLong,
+        });
+    } catch (e: any) {
+      if (/No user token given/.test(e))
+        this.removeCookies();
+    }
+    finally {
+      this.isRefreshingUser = false;
+    }
+  }
+
+  /**
+   * Regenerate profile token to update expiration
+   * ```typescript
+   * const result = await instance.refreshMultiUserToken();
+   * ```
+   */
+  async refreshMultiUserToken(): Promise<MultiUser> {
+    this.isRefreshingMultiUser = true;
+    try {
+      return await this.saveMultiUser();
+    } finally {
+      this.isRefreshingMultiUser = false;
+    }
+  }
+
+  private get multiUserToken(): string | undefined {
+    if (typeof this._multiUserToken === 'string') {
+      return this._multiUserToken as string;
+    }
+    if (typeof this._multiUserToken === 'function') {
+      return (this._multiUserToken as Function)() as string;
+    }
+  }
 }

package/src/types.ts

@@ -1,3 +1,5 @@
+import { Token } from '@or-sdk/base';
+
 export type AuthConfig = {
   /**
    * Url of OneReach service discovery api
@@ -23,7 +25,8 @@ export type AuthConfig = {
   expireInLong?: number;
   allowIframe?: boolean;
 
-  token?: string;
+  token?: Token;
+  multiUserToken?: Token;
 };
 
 export type Domain = {
@@ -41,6 +44,7 @@ export type User = {
   multiUserId?: string;
   identityProvider?: any;
   token?: string;
+  expire: number;
   twoFactorCheck?: boolean;
 };
 
@@ -106,3 +110,14 @@ export type MultiUserUpdateTwoFactorArgs = {
   codes?: any;
   verificationCode?: string;
 };
+
+export type MultiUser = {
+  allow: boolean;
+  tokenType: string;
+  username: string;
+  userId: string;
+  role: string;
+  twoFactorEnabled: string;
+  identityProvider?: any;
+  expire: number;
+};