use shouldUpdateSessionKey in login flow

Author: joaquim-verges

apps/login/src/components/login-form.tsx

@@ -6,15 +6,17 @@ import { toast } from "sonner";
 import { getContract, sendAndConfirmTransaction } from "thirdweb";
 import type { Chain, ThirdwebClient } from "thirdweb";
 import { defineChain } from "thirdweb/chains";
-import { addSessionKey, isActiveSigner } from "thirdweb/extensions/erc4337";
+import {
+  addSessionKey,
+  shouldUpdateSessionKey,
+} from "thirdweb/extensions/erc4337";
 import {
   ConnectButton,
   ConnectEmbed,
   useActiveAccount,
   useActiveWallet,
   useSiweAuth,
 } from "thirdweb/react";
-import { isContractDeployed } from "thirdweb/utils";
 import { type Account, inAppWallet } from "thirdweb/wallets";
 import { createCode } from "../actions/create-code";
 import {
@@ -163,39 +165,37 @@ async function ensureSessionKey(options: {
     client: options.client,
   });
 
+  const newPermissions = {
+    approvedTargets:
+      typeof options.permissions["contracts:write"] === "boolean"
+        ? ("*" as const)
+        : options.permissions["contracts:write"],
+    permissionEndTimestamp: options.permissions.expiration,
+    nativeTokenLimitPerTransaction: options.permissions["native:spend"],
+  };
+
+  const needsUpdate = await shouldUpdateSessionKey({
+    accountContract,
+    sessionKeyAddress: options.sessionKeySignerAddress,
+    newPermissions,
+  });
+
   // check if already added
-  const accountDeployed = await isContractDeployed(accountContract);
-  if (accountDeployed) {
-    if (
-      await isActiveSigner({
-        contract: accountContract,
-        signer: options.sessionKeySignerAddress,
-      })
-    ) {
-      return {
-        success: true,
-        message: "Session key already added",
-        transaction: null,
-      };
-    }
+  if (!needsUpdate) {
+    return {
+      success: true,
+      message: "Session key already added",
+      transaction: null,
+    };
   }
-  // if not added, send tx to add the session key
-
+  // if not added or needs to be updated, send tx to add the session key
   const tx = await sendAndConfirmTransaction({
     account: options.account,
     transaction: addSessionKey({
       account: options.account,
       contract: accountContract,
       sessionKeyAddress: options.sessionKeySignerAddress,
-      // hard coded for now
-      permissions: {
-        approvedTargets:
-          typeof options.permissions["contracts:write"] === "boolean"
-            ? "*"
-            : options.permissions["contracts:write"],
-        permissionEndTimestamp: options.permissions.expiration,
-        nativeTokenLimitPerTransaction: options.permissions["native:spend"],
-      },
+      permissions: newPermissions,
     }),
   });
 

packages/thirdweb/test/globalSetup.ts

@@ -131,3 +131,8 @@ export default async function globalSetup() {
     // await shutdownOdyssey();
   };
 }
+
+process.on("unhandledRejection", (reason) => {
+  console.error(`Vitest unhandledRejection: ${reason}`);
+  throw reason;
+});

packages/thirdweb/test/reactSetup.ts

@@ -5,3 +5,8 @@ import { afterEach } from "vitest";
 afterEach(() => {
   cleanup();
 });
+
+process.on("unhandledRejection", (reason) => {
+  console.error(`Vitest unhandledRejection: ${reason}`);
+  throw reason;
+});