account: pass projectAccessKey and jwtAuth for relayer instantiation (#…

…629)
0xsequence · Dec 14, 2024 · 578f330 · 578f330
1 parent cfbad19
commit 578f330
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/packages/account/src/account.ts b/packages/account/src/account.ts
@@ -215,9 +215,9 @@ export class Account {
     if (isRelayer(found.relayer)) return found.relayer
     return new RpcRelayer({
       ...found.relayer,
-      // If there's an access key, we don't pass the JWT, because browser-side usage of this code mandates an access key
-      // and passing a JWT causes a CORS error.
-      ...(this.projectAccessKey ? { projectAccessKey: this.projectAccessKey } : { jwtAuth: this.jwt })
+      // we pass both projectAccessKey and jwtAuth because the projectAccessKey is
+      // used either for unauthenticated access, or gas sponsorship even if the jwtAuth is provided,
+      ...({ projectAccessKey: this.projectAccessKey, jwtAuth: this.jwt })
     })
   }
 

diff --git a/packages/auth/src/session.ts b/packages/auth/src/session.ts
@@ -321,8 +321,9 @@ export class Session {
     dump: SessionDumpV1 | SessionDumpV2
     editConfigOnMigration: (config: commons.config.Config) => commons.config.Config
     onMigration?: (account: Account) => Promise<boolean>
+    projectAccessKey?: string
   }): Promise<Session> {
-    const { dump, settings, editConfigOnMigration, onMigration, orchestrator } = args
+    const { dump, settings, editConfigOnMigration, onMigration, orchestrator, projectAccessKey } = args
     const { contexts, networks, tracker, services } = { ...SessionSettingsDefault, ...settings }
 
     let account: Account
@@ -343,7 +344,8 @@ export class Session {
         networks,
         contexts,
         orchestrator,
-        jwt: jwtExpired ? undefined : dump.jwt?.token
+        jwt: jwtExpired ? undefined : dump.jwt?.token,
+        projectAccessKey
       })
 
       // TODO: This property may not hold if the user adds a new network
@@ -370,7 +372,8 @@ export class Session {
         networks,
         contexts,
         orchestrator,
-        jwt: jwtExpired ? undefined : dump.jwt?.token
+        jwt: jwtExpired ? undefined : dump.jwt?.token,
+        projectAccessKey
       })
     } else {
       throw Error('Invalid dump format')