thirdweb 5.57.0 → 5.57.1

package/src/client/client.test.ts

@@ -14,7 +14,6 @@ describe("client", () => {
     expect(client.secretKey).toBe("bar");
   });
   it("should ignore clientId if secretKey is provided", () => {
-    // @ts-expect-error - testing invalid input
     const client = createThirdwebClient({ clientId: "foo", secretKey: "bar" });
     expect(client.clientId).toBe(computeClientIdFromSecretKey("bar"));
     expect(client.secretKey).toBe("bar");
@@ -22,7 +21,23 @@ describe("client", () => {
   it("should throw an error if neither clientId nor secretKey is provided", () => {
     // @ts-expect-error - testing invalid input
     expect(() => createThirdwebClient({})).toThrowError(
-      "clientId or secretKey must be provided",
+      /clientId or secretKey must be provided/,
     );
   });
+
+  describe("jwt", () => {
+    it("should accept a jwt being passed", () => {
+      const client = createThirdwebClient({
+        clientId: "foo",
+        secretKey: "bar.baz.qux",
+      });
+      expect(client.clientId).toBe("foo");
+      expect(client.secretKey).toBe("bar.baz.qux");
+    });
+    it("should throw if clientId is missing with JWT input", () => {
+      expect(() =>
+        createThirdwebClient({ secretKey: "bar.baz.qux" }),
+      ).toThrowError(/clientId must be provided when using a JWT secretKey/);
+    });
+  });
 });

package/src/client/client.ts

@@ -1,4 +1,5 @@
 import { computeClientIdFromSecretKey } from "../utils/client-id.js";
+import { isJWT } from "../utils/jwt/is-jwt.js";
 import type { Prettify } from "../utils/type-utils.js";
 
 type FetchConfig = {
@@ -54,10 +55,10 @@ export type CreateThirdwebClientOptions = Prettify<
   (
     | {
         clientId: string;
-        secretKey?: never;
+        secretKey?: string;
       }
     | {
-        clientId?: never;
+        clientId?: string;
         secretKey: string;
       }
   ) &
@@ -102,23 +103,28 @@ export function createThirdwebClient(
   options: CreateThirdwebClientOptions,
 ): ThirdwebClient {
   const { clientId, secretKey, ...rest } = options;
-  // if secretKey is provided, compute the clientId from it (and ignore any clientId passed in)
+
+  let realClientId: string | undefined = clientId;
+
   if (secretKey) {
-    return {
-      ...rest,
-      clientId: computeClientIdFromSecretKey(secretKey),
-      secretKey,
-    } as const;
+    if (isJWT(secretKey)) {
+      // when passing a JWT as secret key we HAVE to also have a clientId
+      if (!clientId) {
+        throw new Error("clientId must be provided when using a JWT secretKey");
+      }
+    } else {
+      realClientId = computeClientIdFromSecretKey(secretKey);
+    }
   }
-  // otherwise if clientId is provided, use it
-  if (clientId) {
-    return {
-      ...rest,
-      clientId: options.clientId,
-      secretKey: undefined,
-    } as const;
+
+  // only path we get here is if we have no secretKey and no clientId
+  if (!realClientId) {
+    throw new Error("clientId or secretKey must be provided");
   }
 
-  // otherwise throw an error
-  throw new Error("clientId or secretKey must be provided");
+  return {
+    ...rest,
+    clientId: realClientId,
+    secretKey,
+  } as const;
 }

package/src/extensions/erc1155/drops/write/updateMetadata.test.ts

@@ -41,7 +41,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC1155", () => {
       contract,
       targetTokenId: 1n,
       newMetadata: { name: "token 1 - updated" },
-      client,
     });
     await sendAndConfirmTransaction({ transaction: updateTx, account });
 

package/src/extensions/erc1155/drops/write/updateMetadata.ts

@@ -1,19 +1,16 @@
+import type { BaseTransactionOptions } from "../../../../transaction/types.js";
+import type { NFT, NFTInput } from "../../../../utils/nft/parseNft.js";
 import * as BaseURICount from "../../../erc721/__generated__/IBatchMintMetadata/read/getBaseURICount.js";
 import * as BatchAtIndex from "../../__generated__/BatchMintMetadata/read/getBatchIdAtIndex.js";
 import * as BatchBaseURI from "../../__generated__/DropERC1155/write/updateBatchBaseURI.js";
 import * as GetNFT from "../../read/getNFT.js";
 
-import type { ThirdwebClient } from "../../../../client/client.js";
-import type { BaseTransactionOptions } from "../../../../transaction/types.js";
-import type { NFT, NFTInput } from "../../../../utils/nft/parseNft.js";
-
 /**
  * @extension ERC1155
  */
 export type UpdateMetadataParams = {
   targetTokenId: bigint;
   newMetadata: NFTInput;
-  client: ThirdwebClient;
 };
 
 /**
@@ -22,7 +19,7 @@ export type UpdateMetadataParams = {
 export async function getUpdateMetadataParams(
   options: BaseTransactionOptions<UpdateMetadataParams>,
 ): Promise<BatchBaseURI.UpdateBatchBaseURIParams> {
-  const { contract, targetTokenId, newMetadata, client } = options;
+  const { contract, targetTokenId, newMetadata } = options;
   const batchCount = await BaseURICount.getBaseURICount(options);
   if (batchCount === 0n) {
     throw new Error(
@@ -75,7 +72,7 @@ export async function getUpdateMetadataParams(
   const { uploadOrExtractURIs } = await import("../../../../utils/ipfs.js");
   const batchOfUris = await uploadOrExtractURIs(
     newMetadatas,
-    client,
+    contract.client,
     Number(startTokenId),
   );
 

package/src/extensions/erc721/drops/write/updateMetadata.test.ts

@@ -42,7 +42,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
       contract,
       targetTokenId: 1n,
       newMetadata: { name: "token 1 - updated" },
-      client,
     });
     await sendAndConfirmTransaction({ transaction: updateTx, account });
 
@@ -74,7 +73,6 @@ describe.runIf(process.env.TW_SECRET_KEY)("updateMetadata ERC721", () => {
       contract,
       targetTokenId: 0n,
       newMetadata: { name: "token 1 - updated" },
-      client,
     });
     await expect(
       sendAndConfirmTransaction({ transaction: updateTx, account }),

package/src/extensions/erc721/drops/write/updateMetadata.ts

@@ -1,4 +1,3 @@
-import type { ThirdwebClient } from "../../../../client/client.js";
 import type { BaseTransactionOptions } from "../../../../transaction/types.js";
 import type { NFT, NFTInput } from "../../../../utils/nft/parseNft.js";
 import * as BatchBaseURI from "../../__generated__/DropERC721/write/updateBatchBaseURI.js";
@@ -12,7 +11,6 @@ import * as GetNFT from "../../read/getNFT.js";
 export type UpdateMetadataParams = {
   targetTokenId: bigint;
   newMetadata: NFTInput;
-  client: ThirdwebClient;
 };
 
 /**
@@ -21,7 +19,7 @@ export type UpdateMetadataParams = {
 export async function getUpdateMetadataParams(
   options: BaseTransactionOptions<UpdateMetadataParams>,
 ): Promise<BatchBaseURI.UpdateBatchBaseURIParams> {
-  const { contract, targetTokenId, newMetadata, client } = options;
+  const { contract, targetTokenId, newMetadata } = options;
   const batchCount = await BaseURICount.getBaseURICount(options);
   if (batchCount === 0n) {
     throw new Error(
@@ -76,7 +74,7 @@ export async function getUpdateMetadataParams(
   const { uploadOrExtractURIs } = await import("../../../../utils/ipfs.js");
   const batchOfUris = await uploadOrExtractURIs(
     newMetadatas,
-    client,
+    contract.client,
     Number(startTokenId),
   );