BE-6600 Return LINKING_BLOCKED_BY_CROSS_REGION login result when API response is REGION_REDIRECT in account switch flow (#87)

* Return LINKING_BLOCKED_BY_CROSS_REGION login result when API response is REGION_REDIRECT in account switch flow

* v16.0.86

* renamed the loginV3's param fromSessionToken to primaryAccountSessionTokenForLinking for clarity

Author: hleekeeper

keeperapi/package-lock.json

@@ -1,7 +1,7 @@
 {
   "name": "@keeper-security/keeperapi",
   "description": "Keeper API Javascript SDK",
-  "version": "16.0.85",
+  "version": "16.0.86",
   "browser": "dist/index.es.js",
   "main": "dist/index.cjs.js",
   "types": "dist/node/index.d.ts",

keeperapi/package.json

@@ -80,7 +80,7 @@ export type LoginPayload = {
     resumeSessionOnly?: boolean
     givenSessionToken?: string
     ecOnly?: boolean
-    fromSessionToken?: Uint8Array | null
+    primaryAccountSessionTokenForLinking?: Uint8Array | null
 }
 
 export enum UserType {
@@ -113,6 +113,11 @@ export type EncryptionKeys = {
     eccPrivateKey: Uint8Array;
 }
 
+export const enum LoginV3ResultEnum {
+    NOT_LOGGED_IN = 'notLoggedin',
+    LINKING_BLOCKED_BY_CROSS_REGION = 'linkingBlockedByCrossRegion',
+}
+
 export class Auth {
     ssoLogoutUrl: string = ''
     userType: UserType = UserType.normal
@@ -277,9 +282,9 @@ export class Auth {
             resumeSessionOnly = false,
             givenSessionToken = undefined,
             ecOnly = false,
-            fromSessionToken = undefined
+            primaryAccountSessionTokenForLinking = undefined
         }: Partial<LoginPayload>
-    ) {
+    ): Promise<{result: LoginV3ResultEnum} | undefined> {
         this._username = username || this.options.sessionStorage?.lastUsername || ''
 
         let wrappedPassword: KeyWrapper | undefined;
@@ -324,7 +329,7 @@ export class Auth {
                 loginMethod: loginMethod,
                 cloneCode: await this.options.sessionStorage?.getCloneCode(this.options.host as KeeperEnvironment, this._username),
                 v2TwoFactorToken: v2TwoFactorToken,
-                fromSessionToken,
+                fromSessionToken: primaryAccountSessionTokenForLinking,
             })
             if (loginType !== LoginType.NORMAL && !!loginType) {
                 startLoginRequest.loginType = loginType
@@ -357,7 +362,7 @@ export class Auth {
             }
             if (resumeSessionOnly && loginResponse && (loginResponse.loginState != Authentication.LoginState.LOGGED_IN)) {
                 return {
-                    result: 'notLoggedin'
+                    result: LoginV3ResultEnum.NOT_LOGGED_IN,
                 }
             }
             console.log(loginResponse)
@@ -395,7 +400,7 @@ export class Auth {
                     break;
                 case Authentication.LoginState.DEVICE_APPROVAL_REQUIRED:
                 case Authentication.LoginState.REQUIRES_DEVICE_ENCRYPTED_DATA_KEY:
-                    if (givenSessionToken) return { result: 'notLoggedin' }
+                    if (givenSessionToken) return { result: LoginV3ResultEnum.NOT_LOGGED_IN }
                     try {
                         loginToken = await this.verifyDevice(username, loginResponse.encryptedLoginToken, loginResponse.loginState == Authentication.LoginState.REQUIRES_DEVICE_ENCRYPTED_DATA_KEY)
                     } catch (e: any) {
@@ -407,6 +412,12 @@ export class Auth {
                     handleError('license_expired', loginResponse, new Error(loginResponse.message))
                     return;
                 case Authentication.LoginState.REGION_REDIRECT:
+                    if (!!primaryAccountSessionTokenForLinking) {
+                        return {
+                            result: LoginV3ResultEnum.LINKING_BLOCKED_BY_CROSS_REGION,
+                        }
+                    }
+
                     // TODO: put region_redirect in its own loop since
                     // its unique to the other states.
                     this.options.host = loginResponse.stateSpecificValue