conflicts

Author: shineli1984

packages/auth/src/Auth.test.ts

@@ -1,6 +1,7 @@
 import { Auth } from './Auth';
 import { AuthEvents, User } from './types';
 import { withMetricsAsync } from './utils/metrics';
+import jwt_decode from 'jwt-decode';
 
 const trackFlowMock = jest.fn();
 const trackErrorMock = jest.fn();
@@ -17,12 +18,15 @@ jest.mock('@imtbl/metrics', () => ({
   getDetail: (...args: any[]) => getDetailMock(...args),
 }));
 
+jest.mock('jwt-decode', () => jest.fn());
+
 beforeEach(() => {
   trackFlowMock.mockReset();
   trackErrorMock.mockReset();
   identifyMock.mockReset();
   trackMock.mockReset();
   getDetailMock.mockReset();
+  (jwt_decode as jest.Mock).mockReset();
 });
 
 describe('withMetricsAsync', () => {
@@ -130,4 +134,53 @@ describe('Auth', () => {
       expect(params.rid).toEqual('runtime-id-value');
     });
   });
+
+  describe('username extraction', () => {
+    it('extracts username from id token when present', () => {
+      const mockOidcUser = {
+        id_token: 'token',
+        access_token: 'access',
+        refresh_token: 'refresh',
+        expired: false,
+        profile: { sub: 'user-123', email: 'test@example.com', nickname: 'tester' },
+      };
+
+      (jwt_decode as jest.Mock).mockReturnValue({
+        username: 'username123',
+        passport: undefined,
+      });
+
+      const result = (Auth as any).mapOidcUserToDomainModel(mockOidcUser);
+
+      expect(jwt_decode).toHaveBeenCalledWith('token');
+      expect(result.profile.username).toEqual('username123');
+    });
+
+    it('maps username when creating OIDC user from device tokens', () => {
+      const tokenResponse = {
+        id_token: 'token',
+        access_token: 'access',
+        refresh_token: 'refresh',
+        token_type: 'Bearer',
+        expires_in: 3600,
+      };
+
+      (jwt_decode as jest.Mock).mockReturnValue({
+        sub: 'user-123',
+        iss: 'issuer',
+        aud: 'audience',
+        exp: 1,
+        iat: 0,
+        email: 'test@example.com',
+        nickname: 'tester',
+        username: 'username123',
+        passport: undefined,
+      });
+
+      const oidcUser = (Auth as any).mapDeviceTokenResponseToOidcUser(tokenResponse);
+
+      expect(jwt_decode).toHaveBeenCalledWith('token');
+      expect(oidcUser.profile.username).toEqual('username123');
+    });
+  });
 });

packages/auth/src/Auth.ts

@@ -252,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();
   }
 
   /**
@@ -521,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 = {
@@ -534,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) {
@@ -561,6 +567,7 @@ export class Auth {
         email: idTokenPayload.email,
         nickname: idTokenPayload.nickname,
         passport: idTokenPayload.passport,
+        ...(idTokenPayload.username ? { username: idTokenPayload.username } : {}),
       },
     });
   };

packages/auth/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;

packages/passport/sdk/src/Passport.ts

@@ -326,8 +326,10 @@ export class Passport {
    * @returns {Promise<UserProfile | undefined>} A promise that resolves to the user profile if logged in, undefined otherwise
    */
   public async getUserInfo(): Promise<UserProfile | undefined> {
-    const user = await this.auth.getUser();
-    return user?.profile;
+    return withMetricsAsync(async () => {
+      const user = await this.auth.getUser();
+      return user?.profile;
+    }, 'getUserInfo', false);
   }
 
   /**