chore(passport): revert multichain changes (#2789)

Author: nattb8

packages/auth/src/Auth.test.ts

@@ -137,7 +137,7 @@ describe('Auth', () => {
     });
   });
 
-  describe('mapOidcUserToDomainModel', () => {
+  describe('username extraction', () => {
     it('extracts username from id token when present', () => {
       const mockOidcUser = {
         id_token: 'token',
@@ -158,88 +158,6 @@ describe('Auth', () => {
       expect(result.profile.username).toEqual('username123');
     });
 
-    it('extracts zkEvm chain data from passport metadata', () => {
-      const mockOidcUser = {
-        id_token: 'token',
-        access_token: 'access',
-        refresh_token: 'refresh',
-        expired: false,
-        profile: { sub: 'user-123', email: 'test@example.com', nickname: 'tester' },
-      };
-
-      (decodeJwtPayload as jest.Mock).mockReturnValue({
-        passport: {
-          zkevm_eth_address: '0xzkevmaddress',
-          zkevm_user_admin_address: '0xzkevmadmin',
-        },
-      });
-
-      const result = (Auth as any).mapOidcUserToDomainModel(mockOidcUser);
-
-      expect(result.zkEvm).toEqual({
-        ethAddress: '0xzkevmaddress',
-        userAdminAddress: '0xzkevmadmin',
-      });
-    });
-
-    it('extracts arbitrum_one chain data from nested passport metadata', () => {
-      const mockOidcUser = {
-        id_token: 'token',
-        access_token: 'access',
-        refresh_token: 'refresh',
-        expired: false,
-        profile: { sub: 'user-123', email: 'test@example.com', nickname: 'tester' },
-      };
-
-      (decodeJwtPayload as jest.Mock).mockReturnValue({
-        passport: {
-          arbitrum_one: {
-            eth_address: '0xarbaddress',
-            user_admin_address: '0xarbadmin',
-          },
-        },
-      });
-
-      const result = (Auth as any).mapOidcUserToDomainModel(mockOidcUser);
-
-      expect(result.arbitrum_one).toEqual({
-        ethAddress: '0xarbaddress',
-        userAdminAddress: '0xarbadmin',
-      });
-    });
-
-    it('extracts both zkEvm and arbitrum_one 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' },
-      };
-
-      (decodeJwtPayload as jest.Mock).mockReturnValue({
-        passport: {
-          zkevm_eth_address: '0xzkevmaddress',
-          zkevm_user_admin_address: '0xzkevmadmin',
-          arbitrum_one: {
-            eth_address: '0xarbaddress',
-            user_admin_address: '0xarbadmin',
-          },
-        },
-      });
-
-      const result = (Auth as any).mapOidcUserToDomainModel(mockOidcUser);
-
-      expect(result.zkEvm).toEqual({
-        ethAddress: '0xzkevmaddress',
-        userAdminAddress: '0xzkevmadmin',
-      });
-      expect(result.arbitrum_one).toEqual({
-        ethAddress: '0xarbaddress',
-        userAdminAddress: '0xarbadmin',
-      });
-    });
-
     it('maps username when creating OIDC user from device tokens', () => {
       const tokenResponse = {
         id_token: 'token',

packages/auth/src/Auth.ts

@@ -29,7 +29,6 @@ import {
   PassportMetadata,
   IdTokenPayload,
   isUserZkEvm,
-  EvmChain,
   ChainAddress,
 } from './types';
 import EmbeddedLoginPrompt from './login/embeddedLoginPrompt';
@@ -570,19 +569,9 @@ export class Auth {
         username,
       },
     };
-
     if (passport?.zkevm_eth_address && passport?.zkevm_user_admin_address) {
       user.zkEvm = toChainAddress(passport.zkevm_eth_address, passport.zkevm_user_admin_address);
     }
-
-    const chains = Object.values(EvmChain).filter((chain) => chain !== EvmChain.ZKEVM);
-    for (const chain of chains) {
-      const chainMetadata = passport?.[chain as Exclude<EvmChain, EvmChain.ZKEVM>];
-      if (chainMetadata?.eth_address && chainMetadata?.user_admin_address) {
-        user[chain] = toChainAddress(chainMetadata.eth_address, chainMetadata.user_admin_address);
-      }
-    }
-
     return user;
   };
 

packages/auth/src/index.ts

@@ -17,20 +17,13 @@ export type {
   AuthModuleConfiguration,
   PopupOverlayOptions,
   PassportMetadata,
-  PassportChainMetadata,
-  ChainAddress,
-  ZkEvmInfo,
   IdTokenPayload,
   PKCEData,
   AuthEventMap,
   UserRemovedReason,
 } from './types';
 export {
-  isUserZkEvm,
-  RollupType,
-  EvmChain,
-  MarketingConsentStatus,
-  AuthEvents,
+  isUserZkEvm, RollupType, MarketingConsentStatus, AuthEvents,
 } from './types';
 
 // Export TypedEventEmitter

packages/auth/src/types.ts

@@ -16,15 +16,6 @@ export enum RollupType {
   ZKEVM = 'zkEvm',
 }
 
-/**
- * Supported EVM chains for user registration
- * Matches EvmChain from @imtbl/wallet but defined here to avoid circular dependency
- */
-export enum EvmChain {
-  ZKEVM = 'zkevm',
-  ARBITRUM_ONE = 'arbitrum_one',
-}
-
 export type ChainAddress = {
   ethAddress: `0x${string}`;
   userAdminAddress: `0x${string}`;
@@ -39,24 +30,12 @@ export type User = {
   profile: UserProfile;
   expired?: boolean;
   [RollupType.ZKEVM]?: ChainAddress;
-} & {
-  [K in Exclude<EvmChain, EvmChain.ZKEVM>]?: ChainAddress;
 };
 
-export type PassportChainMetadata = {
-  eth_address: string;
-  user_admin_address: string;
-};
-
-/**
- * Passport metadata
- * - zkEVM: flat fields (zkevm_eth_address, zkevm_user_admin_address)
- * - Other chains: nested objects (arbitrum_one: { eth_address, user_admin_address })
- */
 export type PassportMetadata = {
   zkevm_eth_address?: string;
   zkevm_user_admin_address?: string;
-} & Partial<Record<Exclude<EvmChain, EvmChain.ZKEVM>, PassportChainMetadata>>;
+};
 
 export interface OidcConfiguration {
   clientId: string;