add headers

thirdweb-dev · Jan 29, 2024 · 360d032 · 360d032
1 parent 6896428
commit 360d032
Show file tree

Hide file tree

Showing 8 changed files with 59 additions and 22 deletions.
diff --git a/packages/react-native/src/evm/constants/headers.ts b/packages/react-native/src/evm/constants/headers.ts
@@ -1 +1,6 @@
 export const BUNDLE_ID_HEADER = "x-bundle-id";
+
+export const X_SDK_VERSION_HEADER = "x-sdk-version";
+export const X_SDK_NAME_HEADER = "x-sdk-name";
+export const X_SDK_PLATFORM_HEADER = "x-sdk-platform";
+export const X_SDK_OS_HEADER = "x-sdk-os";
diff --git a/packages/react-native/src/evm/wallets/connectors/embedded-wallet/embedded/auth.ts b/packages/react-native/src/evm/wallets/connectors/embedded-wallet/embedded/auth.ts
@@ -44,9 +44,25 @@ import {
   appBundleId,
   reactNativePackageVersion,
 } from "../../../../utils/version";
-import { BUNDLE_ID_HEADER } from "../../../../constants/headers";
+import {
+  BUNDLE_ID_HEADER,
+  X_SDK_NAME_HEADER,
+  X_SDK_OS_HEADER,
+  X_SDK_PLATFORM_HEADER,
+  X_SDK_VERSION_HEADER,
+} from "../../../../constants/headers";
 import { ANALYTICS } from "./helpers/analytics";
 
+const HEADERS = {
+  [EWS_VERSION_HEADER]: (globalThis as any).X_SDK_VERSION,
+  [BUNDLE_ID_HEADER]: (globalThis as any).APP_BUNDLE_ID,
+  [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+  [X_SDK_NAME_HEADER]: (globalThis as any).X_SDK_NAME,
+  [X_SDK_OS_HEADER]: (globalThis as any).X_SDK_OS,
+  [X_SDK_PLATFORM_HEADER]: (globalThis as any).X_SDK_PLATFORM,
+  [X_SDK_VERSION_HEADER]: (globalThis as any).X_SDK_VERSION,
+};
+
 export async function sendVerificationEmail(options: {
   email: string;
   clientId: string;
@@ -195,9 +211,7 @@ export async function socialLogin(oauthOptions: OauthOption, clientId: string) {
 
   const resp = await fetch(headlessLoginLinkWithParams, {
     headers: {
-      [EWS_VERSION_HEADER]: reactNativePackageVersion,
-      [BUNDLE_ID_HEADER]: appBundleId,
-      [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+      ...HEADERS,
     },
   });
 
@@ -278,9 +292,7 @@ export async function customJwt(authOptions: AuthOptions, clientId: string) {
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      [EWS_VERSION_HEADER]: reactNativePackageVersion,
-      [BUNDLE_ID_HEADER]: appBundleId,
-      [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+      ...HEADERS,
     },
     body: JSON.stringify({
       jwt: jwt,
@@ -328,9 +340,7 @@ export async function authEndpoint(
     method: "POST",
     headers: {
       "Content-Type": "application/json",
-      [EWS_VERSION_HEADER]: reactNativePackageVersion,
-      [BUNDLE_ID_HEADER]: appBundleId,
-      [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+      ...HEADERS,
     },
     body: JSON.stringify({
       payload: payload,

diff --git a/.../react-native/src/evm/wallets/connectors/embedded-wallet/embedded/helpers/api/fetchers.ts b/.../react-native/src/evm/wallets/connectors/embedded-wallet/embedded/helpers/api/fetchers.ts
@@ -24,16 +24,27 @@ import {
   appBundleId,
   reactNativePackageVersion,
 } from "../../../../../../utils/version";
-import { BUNDLE_ID_HEADER } from "../../../../../../constants/headers";
+import {
+  BUNDLE_ID_HEADER,
+  X_SDK_NAME_HEADER,
+  X_SDK_OS_HEADER,
+  X_SDK_PLATFORM_HEADER,
+  X_SDK_VERSION_HEADER,
+} from "../../../../../../constants/headers";
 import { ANALYTICS } from "../analytics";
 
 const EMBEDDED_WALLET_TOKEN_HEADER = "embedded-wallet-token";
 const PAPER_CLIENT_ID_HEADER = "x-thirdweb-client-id";
+
 const HEADERS = {
   "Content-Type": "application/json",
-  [BUNDLE_ID_HEADER]: appBundleId,
-  [EWS_VERSION_HEADER]: reactNativePackageVersion,
+  [EWS_VERSION_HEADER]: (globalThis as any).X_SDK_VERSION,
+  [BUNDLE_ID_HEADER]: (globalThis as any).APP_BUNDLE_ID,
   [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+  [X_SDK_NAME_HEADER]: (globalThis as any).X_SDK_NAME,
+  [X_SDK_OS_HEADER]: (globalThis as any).X_SDK_OS,
+  [X_SDK_PLATFORM_HEADER]: (globalThis as any).X_SDK_PLATFORM,
+  [X_SDK_VERSION_HEADER]: (globalThis as any).X_SDK_VERSION,
 };
 
 export const verifyClientId = async (clientId: string) => {
@@ -68,19 +79,15 @@ export const authFetchEmbeddedWalletUser = async (
         Authorization: `Bearer ${EMBEDDED_WALLET_TOKEN_HEADER}:${
           authTokenClient || ""
         }`,
-        [BUNDLE_ID_HEADER]: appBundleId,
         [PAPER_CLIENT_ID_HEADER]: clientId,
-        [EWS_VERSION_HEADER]: reactNativePackageVersion,
-        [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+        ...HEADERS,
       }
     : {
         Authorization: `Bearer ${EMBEDDED_WALLET_TOKEN_HEADER}:${
           authTokenClient || ""
         }`,
-        [BUNDLE_ID_HEADER]: appBundleId,
         [PAPER_CLIENT_ID_HEADER]: clientId,
-        [EWS_VERSION_HEADER]: reactNativePackageVersion,
-        [THIRDWEB_SESSION_NONCE_HEADER]: ANALYTICS.nonce,
+        ...HEADERS,
       };
   return fetch(url, params);
 };

diff --git a/packages/sdk/src/evm/common/verification.ts b/packages/sdk/src/evm/common/verification.ts
@@ -215,6 +215,7 @@ export async function verify(
     };
 
     const parameters = new URLSearchParams({ ...requestBody });
+    // do we need to pass headers here?
     const result = await fetch(explorerAPIUrl, {
       method: "POST",
       headers: { "Content-Type": "application/x-www-form-urlencoded" },
@@ -474,9 +475,8 @@ async function fetchDeployBytecodeFromPublishedContractMetadata(
       getChainProvider("polygon", {}),
     ) as ContractPublisher;
 
-    const publishedMetadataUri = await contract.getPublishedUriFromCompilerUri(
-      compilerMetaUri,
-    );
+    const publishedMetadataUri =
+      await contract.getPublishedUriFromCompilerUri(compilerMetaUri);
     if (publishedMetadataUri.length === 0) {
       throw Error(
         `Could not resolve published metadata URI from ${compilerMetaUri}`,

diff --git a/packages/sdk/src/evm/core/classes/internal/contract-wrapper.ts b/packages/sdk/src/evm/core/classes/internal/contract-wrapper.ts
@@ -654,6 +654,7 @@ export class ContractWrapper<
 
     const request = await this.enginePrepareRequest(transaction);
 
+    // should we pass headers here?
     const res = await fetch(this.options.gasless.engine.relayerUrl, {
       ...request,
       headers: {

diff --git a/packages/storage/src/core/uploaders/ipfs-uploader.ts b/packages/storage/src/core/uploaders/ipfs-uploader.ts
@@ -364,6 +364,11 @@ export class IpfsUploader implements IStorageUploader<IpfsUploadBatchOptions> {
       headers["x-authorize-wallet"] = "true";
     }
 
+    headers["x-sdk-version"] = (globalThis as any).X_SDK_VERSION;
+    headers["x-sdk-name"] = (globalThis as any).X_SDK_NAME;
+    headers["x-sdk-platform"] = (globalThis as any).X_SDK_PLATFORM;
+    headers["x-sdk-os"] = (globalThis as any).X_SDK_OS;
+
     const res = await fetch(`${this.uploadServerUrl}/ipfs/upload`, {
       method: "POST",
       headers: {

diff --git a/packages/wallets/src/evm/connectors/smart-wallet/lib/paymaster.ts b/packages/wallets/src/evm/connectors/smart-wallet/lib/paymaster.ts
@@ -75,6 +75,11 @@ class VerifyingPaymasterAPI extends PaymasterAPI {
         }`;
         headers["x-authorize-wallet"] = "true";
       }
+
+      headers["x-sdk-version"] = (globalThis as any).X_SDK_VERSION;
+      headers["x-sdk-name"] = (globalThis as any).X_SDK_NAME;
+      headers["x-sdk-platform"] = (globalThis as any).X_SDK_PLATFORM;
+      headers["x-sdk-os"] = (globalThis as any).X_SDK_OS;
     }
 
     // Ask the paymaster to sign the transaction and return a valid paymasterAndData value.

diff --git a/packages/wallets/src/evm/utils/analytics.ts b/packages/wallets/src/evm/utils/analytics.ts
@@ -25,6 +25,10 @@ export function track(args: {
     headers: {
       "Content-Type": "application/json",
       "x-client-id": clientId,
+      "x-sdk-version": (globalThis as any).X_SDK_VERSION,
+      "x-sdk-name": (globalThis as any).X_SDK_NAME,
+      "x-sdk-platform": (globalThis as any).X_SDK_PLATFORM,
+      "x-sdk-os": (globalThis as any).X_SDK_OS,
     },
     body: JSON.stringify(body),
   });