Expose getAuthToken from inApp and ecosystem wallets

Author: joaquim-verges

.changeset/brown-ends-strive.md

@@ -0,0 +1,5 @@
+---
+"thirdweb": patch
+---
+
+Expose getAuthToken from inapp and ecosystem wallets

packages/thirdweb/src/wallets/in-app/core/wallet/types.ts

@@ -16,6 +16,15 @@ import type {
   SingleStepAuthArgsType,
 } from "../authentication/types.js";
 import type { UserStatus } from "./enclave-wallet.js";
+import type { Wallet } from "../../../interfaces/wallet.js";
+
+export type InAppWallet = Wallet<"inApp"> & {
+  getAuthToken: () => string | null;
+};
+
+export type EcosystemWallet = Wallet<EcosystemWalletId> & {
+  getAuthToken: () => string | null;
+};
 
 export type Ecosystem = {
   id: EcosystemWalletId;

packages/thirdweb/src/wallets/in-app/native/ecosystem.ts

@@ -1,10 +1,10 @@
 import type { ThirdwebClient } from "../../../client/client.js";
-import type { Wallet } from "../../interfaces/wallet.js";
 import type {
   CreateWalletArgs,
   EcosystemWalletId,
 } from "../../wallet-types.js";
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
+import type { EcosystemWallet } from "../core/wallet/types.js";
 
 /**
  * Creates an [Ecosystem Wallet](https://portal.thirdweb.com/connect/ecosystems/overview) based on various authentication methods.
@@ -63,7 +63,7 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  */
 export function ecosystemWallet(
   ...args: CreateWalletArgs<EcosystemWalletId>
-): Wallet<EcosystemWalletId> {
+): EcosystemWallet {
   const [ecosystemId, createOptions] = args;
   const ecosystem = {
     id: ecosystemId,
@@ -87,5 +87,5 @@ export function ecosystemWallet(
       partnerId: createOptions?.partnerId,
     },
     ecosystem,
-  }) as Wallet<EcosystemWalletId>;
+  }) as EcosystemWallet;
 }

packages/thirdweb/src/wallets/in-app/native/in-app.ts

@@ -1,7 +1,9 @@
 import type { ThirdwebClient } from "../../../client/client.js";
-import type { Wallet } from "../../interfaces/wallet.js";
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
-import type { InAppWalletCreationOptions } from "../core/wallet/types.js";
+import type {
+  InAppWallet,
+  InAppWalletCreationOptions,
+} from "../core/wallet/types.js";
 
 /**
  * Creates an in-app wallet.
@@ -57,7 +59,7 @@ import type { InAppWalletCreationOptions } from "../core/wallet/types.js";
  */
 export function inAppWallet(
   createOptions?: InAppWalletCreationOptions,
-): Wallet<"inApp"> {
+): InAppWallet {
   return createInAppWallet({
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppNativeConnector } = await import("./native-connector.js");
@@ -68,5 +70,5 @@ export function inAppWallet(
       });
     },
     createOptions,
-  }) as Wallet<"inApp">;
+  }) as InAppWallet;
 }

packages/thirdweb/src/wallets/in-app/web/ecosystem.ts

@@ -5,6 +5,7 @@ import type {
   EcosystemWalletId,
 } from "../../wallet-types.js";
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
+import type { EcosystemWallet } from "../core/wallet/types.js";
 
 /**
  * Creates an [Ecosystem Wallet](https://portal.thirdweb.com/connect/wallet/overview) based on various authentication methods. Full list of available authentication methods [here](/connect/wallet/sign-in-methods/configure).
@@ -53,7 +54,7 @@ import { createInAppWallet } from "../core/wallet/in-app-core.js";
  */
 export function ecosystemWallet(
   ...args: CreateWalletArgs<EcosystemWalletId>
-): Wallet<EcosystemWalletId> {
+): EcosystemWallet {
   const [ecosystemId, createOptions] = args;
   const ecosystem = {
     id: ecosystemId,
@@ -76,5 +77,5 @@ export function ecosystemWallet(
       partnerId: ecosystem.partnerId,
     },
     ecosystem,
-  }) as Wallet<EcosystemWalletId>;
+  }) as EcosystemWallet;
 }

packages/thirdweb/src/wallets/in-app/web/in-app.ts

@@ -1,7 +1,6 @@
 import type { ThirdwebClient } from "../../../client/client.js";
-import type { Wallet } from "../../interfaces/wallet.js";
 import { createInAppWallet } from "../core/wallet/in-app-core.js";
-import type { InAppWalletCreationOptions } from "../core/wallet/types.js";
+import type { InAppWallet, InAppWalletCreationOptions } from "../core/wallet/types.js";
 
 /**
  * Creates an app scoped wallet for users based on various authentication methods. Full list of available authentication methods [here](https://portal.thirdweb.com/connect/wallet/sign-in-methods/configure).
@@ -302,7 +301,7 @@ import type { InAppWalletCreationOptions } from "../core/wallet/types.js";
  */
 export function inAppWallet(
   createOptions?: InAppWalletCreationOptions,
-): Wallet<"inApp"> {
+): InAppWallet {
   return createInAppWallet({
     connectorFactory: async (client: ThirdwebClient) => {
       const { InAppWebConnector } = await import("./lib/web-connector.js");
@@ -313,5 +312,5 @@ export function inAppWallet(
       });
     },
     createOptions,
-  }) as Wallet<"inApp">;
+  }) as InAppWallet;
 }

packages/thirdweb/src/wallets/in-app/web/lib/in-app-gateway.test.ts

@@ -22,7 +22,7 @@ describe
     const clientIdFetch = getClientFetch(
       createThirdwebClient({
         clientId: TEST_CLIENT.clientId,
-      }),
+      })
     );
 
     beforeAll(async () => {
@@ -38,7 +38,7 @@ describe
         strategy: "backend",
         walletSecret: "test-secret",
       });
-      authToken = wallet.getAuthToken?.();
+      authToken = wallet.getAuthToken();
       expect(authToken).toBeDefined();
     });
 
@@ -59,7 +59,7 @@ describe
           ],
           signingOptions: {
             from: account.address,
-            type: "eoa",
+            type: "EOA",
           },
         },
         bodySerializer: stringify,
@@ -69,17 +69,17 @@ describe
         },
       });
 
-      const signatureResult = signResult.data?.result?.results[0];
+      const signatureResult = signResult.data?.result[0];
       if (signatureResult && "result" in signatureResult) {
         expect(signatureResult.result.signature).toEqual(rawSignature);
       } else {
         throw new Error(
-          `Failed to sign message: ${stringify(signatureResult?.error) || "Unknown error"}`,
+          `Failed to sign message: ${stringify(signatureResult?.error) || "Unknown error"}`
         );
       }
     });
 
-    it("should queue a 4337 transaction", async () => {
+    it("should queue a 7702 transaction", async () => {
       const body = {
         executionOptions: {
           chainId: sepolia.id,
@@ -105,7 +105,7 @@ describe
       });
       if (result.error) {
         throw new Error(
-          `Error sending transaction: ${stringify(result.error)}`,
+          `Error sending transaction: ${stringify(result.error)}`
         );
       }
 
@@ -120,7 +120,7 @@ describe
         transactionId: txId,
       });
 
-      console.log(tx);
+      console.log(tx.transactionHash);
       expect(tx.transactionHash).toBeDefined();
     });
   });