@imtbl/sdk 0.15.1-alpha → 0.16.0

package/dist/passport.js

@@ -1457,7 +1457,7 @@ class MultiRollupApiClients {
 }
 
 // eslint-disable-next-line @typescript-eslint/naming-convention
-const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.15.1-alpha' };
+const defaultHeaders = { 'x-sdk-version': 'ts-immutable-sdk-0.0.0' };
 const createConfig = ({ basePath, headers, }) => {
     if (!basePath.trim()) {
         throw Error('basePath can not be empty');
@@ -1513,7 +1513,7 @@ const createImmutableXConfiguration = ({ basePath, chainID, coreContractAddress,
     chainID,
     coreContractAddress,
     registrationContractAddress,
-    sdkVersion: 'ts-immutable-sdk-0.15.1-alpha',
+    sdkVersion: 'ts-immutable-sdk-0.0.0',
 });
 /**
  * Sets `sdkVersion` at the time of build
@@ -5948,6 +5948,12 @@ class AuthManager {
                 userAdminAddress: idTokenPayload?.passport?.imx_user_admin_address,
             };
         }
+        if (idTokenPayload?.passport?.zkevm_eth_address) {
+            user.zkEvm = {
+                ethAddress: idTokenPayload?.passport?.zkevm_eth_address,
+                userAdminAddress: idTokenPayload?.passport?.zkevm_user_admin_address,
+            };
+        }
         return user;
     };
     async login() {
@@ -6091,8 +6097,8 @@ class AuthManager {
             const refreshToken = tokenResponse?.refresh_token ?? null;
             if (refreshToken) {
                 // Token is no longer valid, but refresh token can be used to a new one
-                const newTokenResponse = await this.refreshToken(refreshToken);
-                return AuthManager.mapDeviceTokenResponseToDomainUserModel(newTokenResponse);
+                const user = await this.refreshToken(refreshToken);
+                return user;
             }
             return null;
         }, PassportErrorType.AUTHENTICATION_ERROR);
@@ -6103,7 +6109,8 @@ class AuthManager {
             grant_type: 'refresh_token',
             refresh_token: refreshToken,
         }, formUrlEncodedHeader);
-        return response.data;
+        const newTokenResponse = response.data;
+        return AuthManager.mapDeviceTokenResponseToDomainUserModel(newTokenResponse);
     }
     async logout() {
         return withPassportError(async () => {
@@ -7262,7 +7269,7 @@ class RelayerClient {
 }
 
 const MESSAGE_TO_SIGN = 'Only sign this message from Immutable Passport';
-async function registerZkEvmUser({ authManager, magicProvider, multiRollupApiClients, accessToken, }) {
+async function registerZkEvmUser({ authManager, config, magicProvider, multiRollupApiClients, accessToken, }) {
     const web3Provider = new Web3Provider(magicProvider);
     const ethSigner = web3Provider.getSigner();
     const ethereumAddress = await ethSigner.getAddress();
@@ -7279,7 +7286,17 @@ async function registerZkEvmUser({ authManager, magicProvider, multiRollupApiCli
     catch (error) {
         throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, `Failed to create counterfactual address: ${error}`);
     }
-    const user = await authManager.loginSilent();
+    let user;
+    if (config.crossSdkBridgeEnabled) {
+        const credentials = authManager.checkStoredDeviceFlowCredentials();
+        if (!credentials || !credentials.refresh_token) {
+            throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, 'Cross SDK bridge: Failed to refresh user details');
+        }
+        user = await authManager.refreshToken(credentials.refresh_token);
+    }
+    else {
+        user = await authManager.loginSilent();
+    }
     if (!user?.zkEvm) {
         throw new JsonRpcError(RpcErrorCode.INTERNAL_ERROR, 'Failed to refresh user details');
     }
@@ -7287,7 +7304,7 @@ async function registerZkEvmUser({ authManager, magicProvider, multiRollupApiCli
 }
 
 const loginZkEvmUser = async ({ authManager, config, magicAdapter, multiRollupApiClients, }) => {
-    const user = await authManager.getUser() || await authManager.login();
+    const user = await authManager.getUser() || await authManager.getUserDeviceFlow() || await authManager.login();
     if (!user.idToken) {
         throw new Error('User is missing idToken');
     }
@@ -7296,6 +7313,7 @@ const loginZkEvmUser = async ({ authManager, config, magicAdapter, multiRollupAp
         // Generate counterfactual address and retrieve updated Auth0 user
         const userZkevm = await registerZkEvmUser({
             authManager,
+            config,
             magicProvider,
             multiRollupApiClients,
             accessToken: user.accessToken,

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@imtbl/sdk",
   "description": "Immutable Unified SDK",
-  "version": "0.15.1-alpha",
+  "version": "0.16.0",
   "author": "Immutable",
   "browser": "./dist/index.browser.js",
   "bugs": "https://github.com/immutable/ts-immutable-sdk/issues",