@imtbl/auth 2.10.7-alpha.6 → 2.11.1-alpha.0

package/src/Auth.ts

@@ -42,8 +42,6 @@ import { isAccessTokenExpiredOrExpiring } from './utils/token';
 import LoginPopupOverlay from './overlay/loginPopupOverlay';
 import { LocalForageAsyncStorage } from './storage/LocalForageAsyncStorage';
 
-const LOGIN_POPUP_CLOSED_POLLING_DURATION = 500;
-
 const formUrlEncodedHeader = {
   headers: {
     'Content-Type': 'application/x-www-form-urlencoded',
@@ -206,8 +204,7 @@ export class Auth {
 
       // Emit LOGGED_IN event and identify user if logged in
       if (user) {
-        this.eventEmitter.emit(AuthEvents.LOGGED_IN, user);
-        identify({ passportId: user.profile.sub });
+        this.handleSuccessfulLogin(user);
       }
 
       return user;
@@ -233,8 +230,7 @@ export class Auth {
     return withMetricsAsync(async () => {
       const user = await this.loginCallbackInternal();
       if (user) {
-        this.eventEmitter.emit(AuthEvents.LOGGED_IN, user);
-        identify({ passportId: user.profile.sub });
+        this.handleSuccessfulLogin(user);
       }
       return user;
     }, 'loginCallback');
@@ -256,7 +252,7 @@ export class Auth {
    * @returns Promise that resolves with the user or null if not authenticated
    */
   async getUser(): Promise<User | null> {
-    return withMetricsAsync(async () => this.getUserInternal(), 'getUserInfo', false);
+    return this.getUserInternal();
   }
 
   /**
@@ -275,7 +271,9 @@ export class Auth {
       return user;
     }
 
-    return this.loginWithPopup();
+    const loggedInUser = await this.loginWithPopup();
+    this.handleSuccessfulLogin(loggedInUser);
+    return loggedInUser;
   }
 
   /**
@@ -354,8 +352,7 @@ export class Auth {
   async loginWithPKCEFlowCallback(authorizationCode: string, state: string): Promise<User> {
     return withMetricsAsync(async () => {
       const user = await this.loginWithPKCEFlowCallbackInternal(authorizationCode, state);
-      this.eventEmitter.emit(AuthEvents.LOGGED_IN, user);
-      identify({ passportId: user.profile.sub });
+      this.handleSuccessfulLogin(user);
       return user;
     }, 'loginWithPKCEFlowCallback');
   }
@@ -368,8 +365,7 @@ export class Auth {
   async storeTokens(tokenResponse: DeviceTokenResponse): Promise<User> {
     return withMetricsAsync(async () => {
       const user = await this.storeTokensInternal(tokenResponse);
-      this.eventEmitter.emit(AuthEvents.LOGGED_IN, user);
-      identify({ passportId: user.profile.sub });
+      this.handleSuccessfulLogin(user);
       return user;
     }, 'storeTokens');
   }
@@ -413,6 +409,11 @@ export class Auth {
     return this.config.oidcConfiguration.clientId;
   }
 
+  private handleSuccessfulLogin(user: User): void {
+    this.eventEmitter.emit(AuthEvents.LOGGED_IN, user);
+    identify({ passportId: user.profile.sub });
+  }
+
   private buildExtraQueryParams(
     directLoginOptions?: DirectLoginOptions,
     imPassportTraceId?: string,
@@ -420,7 +421,6 @@ export class Auth {
     const params: Record<string, string> = {
       ...(this.userManager.settings?.extraQueryParams ?? {}),
       rid: getDetail(Detail.RUNTIME_ID) || '',
-      third_party_a_id: '',
     };
 
     if (directLoginOptions) {
@@ -472,7 +472,7 @@ export class Auth {
       const signinPopup = async () => {
         const extraQueryParams = this.buildExtraQueryParams(directLoginOptionsToUse, imPassportTraceId);
 
-        const userPromise = this.userManager.signinPopup({
+        return this.userManager.signinPopup({
           extraQueryParams,
           popupWindowFeatures: {
             width: 410,
@@ -480,27 +480,6 @@ export class Auth {
           },
           popupWindowTarget,
         });
-
-        const popupRef = window.open('', popupWindowTarget);
-        if (popupRef) {
-          const popupClosedPromise = new Promise<never>((_, reject) => {
-            const timer = setInterval(() => {
-              if (popupRef.closed) {
-                clearInterval(timer);
-                reject(new Error('Popup closed by user'));
-              }
-            }, LOGIN_POPUP_CLOSED_POLLING_DURATION);
-
-            userPromise.finally(() => {
-              clearInterval(timer);
-              popupRef.close();
-            });
-          });
-
-          return Promise.race([userPromise, popupClosedPromise]);
-        }
-
-        return userPromise;
       };
 
       return new Promise((resolve, reject) => {
@@ -542,8 +521,13 @@ export class Auth {
 
   private static mapOidcUserToDomainModel = (oidcUser: OidcUser): User => {
     let passport: PassportMetadata | undefined;
+    let username: string | undefined;
     if (oidcUser.id_token) {
-      passport = jwt_decode<IdTokenPayload>(oidcUser.id_token)?.passport;
+      const idTokenPayload = jwt_decode<IdTokenPayload>(oidcUser.id_token);
+      passport = idTokenPayload?.passport;
+      if (idTokenPayload?.username) {
+        username = idTokenPayload?.username;
+      }
     }
 
     const user: User = {
@@ -555,6 +539,7 @@ export class Auth {
         sub: oidcUser.profile.sub,
         email: oidcUser.profile.email,
         nickname: oidcUser.profile.nickname,
+        username,
       },
     };
     if (passport?.zkevm_eth_address && passport?.zkevm_user_admin_address) {
@@ -582,29 +567,13 @@ export class Auth {
         email: idTokenPayload.email,
         nickname: idTokenPayload.nickname,
         passport: idTokenPayload.passport,
+        ...(idTokenPayload.username ? { username: idTokenPayload.username } : {}),
       },
     });
   };
 
-  private static shouldUseSigninPopupCallback(): boolean {
-    try {
-      const urlParams = new URLSearchParams(window.location.search);
-      const stateParam = urlParams.get('state');
-      const localStorageKey = `oidc.${stateParam}`;
-      const localStorageValue = localStorage.getItem(localStorageKey);
-      const loginState = JSON.parse(localStorageValue || '{}');
-      return loginState?.request_type === 'si:p';
-    } catch (err) {
-      return false;
-    }
-  }
-
   private async loginCallbackInternal(): Promise<User | undefined> {
     return withPassportError(async () => {
-      if (Auth.shouldUseSigninPopupCallback()) {
-        await this.userManager.signinPopupCallback(undefined, true);
-        return undefined;
-      }
       const oidcUser = await this.userManager.signinCallback();
       if (!oidcUser) {
         return undefined;

package/src/errors.test.ts

@@ -0,0 +1,21 @@
+import { isAPIError } from './errors';
+
+describe('isAPIError', () => {
+  it('returns true when code and message fields exist', () => {
+    expect(isAPIError({ code: 'BAD_REQUEST', message: 'Invalid' })).toBe(true);
+  });
+
+  it.each([
+    'Not found',
+    404,
+    null,
+    undefined,
+  ])('returns false for non-object value: %p', (value) => {
+    expect(isAPIError(value)).toBe(false);
+  });
+
+  it('returns false when required fields are missing', () => {
+    expect(isAPIError({ code: 'BAD_REQUEST' })).toBe(false);
+    expect(isAPIError({ message: 'Invalid' })).toBe(false);
+  });
+});

package/src/errors.ts

@@ -23,10 +23,16 @@ export enum PassportErrorType {
   LINK_WALLET_DUPLICATE_NONCE_ERROR = 'LINK_WALLET_DUPLICATE_NONCE_ERROR',
   LINK_WALLET_GENERIC_ERROR = 'LINK_WALLET_GENERIC_ERROR',
   SERVICE_UNAVAILABLE_ERROR = 'SERVICE_UNAVAILABLE_ERROR',
+  TRANSACTION_REJECTED = 'TRANSACTION_REJECTED',
 }
 
 export function isAPIError(error: any): error is imx.APIError {
-  return 'code' in error && 'message' in error;
+  return (
+    typeof error === 'object'
+    && error !== null
+    && 'code' in error
+    && 'message' in error
+  );
 }
 
 export class PassportError extends Error {

package/src/index.ts

@@ -29,4 +29,6 @@ export {
 export { default as TypedEventEmitter } from './utils/typedEventEmitter';
 
 // Export errors
-export { PassportError, PassportErrorType, withPassportError } from './errors';
+export {
+  PassportError, PassportErrorType, withPassportError, isAPIError,
+} from './errors';

package/src/types.ts

@@ -9,6 +9,7 @@ export type UserProfile = {
   email?: string;
   nickname?: string;
   sub: string;
+  username?: string;
 };
 
 export enum RollupType {
@@ -91,6 +92,7 @@ export type TokenPayload = {
 
 export type IdTokenPayload = {
   passport?: PassportMetadata;
+  username?: string;
   email: string;
   nickname: string;
   aud: string;

package/tsconfig.eslint.json

@@ -0,0 +1,6 @@
+{
+  "extends": "./tsconfig.json",
+  "exclude": [],
+  "include": ["src"]
+}
+

package/tsconfig.json

@@ -10,6 +10,10 @@
   "exclude": [
     "node_modules",
     "dist",
+    "src/**/*.test.ts",
+    "src/**/*.test.tsx",
+    "src/**/*.spec.ts",
+    "src/**/*.spec.tsx"
   ]
 }