Merge pull request #96 from getamis/qubic-version

Add customHeaders for x-qubic-client-version
getamis · May 2, 2024 · 3d8888c · 3d8888c
2 parents cc34714 + 856dd9b
commit 3d8888c
Show file tree

Hide file tree

Showing 6 changed files with 32 additions and 13 deletions.
diff --git a/examples/example-pure-js/src/index.ts b/examples/example-pure-js/src/index.ts
@@ -78,6 +78,9 @@ async function main() {
         provider: wcProvider as any,
       },
     },
+    customHeaders: {
+      'x-qubic-client-version': '0.0.0-alpha.0',
+    },
   };
 
   const qubicConnect = new QubicConnect(SDK_CONFIG);

diff --git a/packages/core/src/QubicConnect.ts b/packages/core/src/QubicConnect.ts
@@ -105,6 +105,7 @@ export class QubicConnect {
       disableOpenExternalBrowserWhenLineIab = false,
       trackGaSettings = [],
       autoLoginInWalletIabType = 'enable',
+      customHeaders = {},
     } = config;
     if (!apiKey) {
       throw Error('new QubicConnect should have key');
@@ -127,6 +128,7 @@ export class QubicConnect {
       disableOpenExternalBrowserWhenLineIab,
       trackGaSettings,
       autoLoginInWalletIabType,
+      customHeaders,
     };
 
     QubicConnect.checkProviderOptions(config?.providerOptions);
@@ -135,6 +137,7 @@ export class QubicConnect {
       apiKey,
       apiSecret,
       apiUrl,
+      customHeaders,
     });
 
     this.requestGraphql = createRequestGraphql({
@@ -148,6 +151,7 @@ export class QubicConnect {
       apiKey,
       apiSecret,
       apiUrl: marketApiUrl,
+      customHeaders,
       onUnauthenticated: () => this.handleLogout(null),
     });
 

diff --git a/packages/core/src/types/QubicConnectConfig.ts b/packages/core/src/types/QubicConnectConfig.ts
@@ -20,6 +20,8 @@ export interface QubicConnectConfig {
   // # fast login
   // authRedirectUrl where have different type of wallet
   authRedirectUrl?: string;
+
+  customHeaders?: Record<string, string>;
 }
 
 export interface InternalQubicConnectConfig extends Omit<Required<QubicConnectConfig>, 'providerOptions'> {

diff --git a/packages/core/src/utils/graphql.ts b/packages/core/src/utils/graphql.ts
@@ -63,18 +63,16 @@ function parseGraphqlErrors(errorResponse: string): Array<{
   }
 }
 
+type CreateRequestGraphqlProps = {
+  apiKey: string;
+  apiSecret: string;
+  apiUrl: string;
+  customHeaders?: Record<string, string>;
+  onUnauthenticated: () => void;
+};
+
 export const createRequestGraphql =
-  ({
-    apiKey,
-    apiSecret,
-    apiUrl,
-    onUnauthenticated,
-  }: {
-    apiKey: string;
-    apiSecret: string;
-    apiUrl: string;
-    onUnauthenticated: () => void;
-  }): SdkRequestGraphql =>
+  ({ apiKey, apiSecret, apiUrl, customHeaders, onUnauthenticated }: CreateRequestGraphqlProps): SdkRequestGraphql =>
   ({ query, variables, path = '' }) => {
     // currently, we have 3 graphql endpoints:
     // origin api url has public and acc
@@ -102,6 +100,7 @@ export const createRequestGraphql =
       apiSecret,
       body,
       accessToken: getAccessToken(),
+      customHeaders,
     });
 
     return new Promise((resolve, reject) => {

diff --git a/packages/core/src/utils/sdkFetch.ts b/packages/core/src/utils/sdkFetch.ts
@@ -32,8 +32,15 @@ export interface SdkFetch {
   (path: string, init: RequestInit): Promise<Response>;
 }
 
+type CreateFetchProps = {
+  apiKey: string;
+  apiSecret: string;
+  apiUrl: string;
+  customHeaders?: Record<string, string>;
+};
+
 export const createFetch =
-  ({ apiKey, apiSecret, apiUrl }: { apiKey: string; apiSecret: string; apiUrl: string }): SdkFetch =>
+  ({ apiKey, apiSecret, apiUrl, customHeaders }: CreateFetchProps): SdkFetch =>
   async (path, init) => {
     const serviceUri = `${apiUrl}/${path}`;
 
@@ -44,15 +51,16 @@ export const createFetch =
       apiKey,
       apiSecret,
       accessToken: getAccessToken(),
+      customHeaders,
     });
 
     const { headers: initHeaders, ...restInit } = init;
 
     const response = await crossFetch(serviceUri, {
       headers: {
         'Content-Type': 'application/x-www-form-urlencoded',
-        ...serviceHeaders,
         ...initHeaders,
+        ...serviceHeaders,
       },
       credentials: 'include',
       ...restInit,

diff --git a/packages/core/src/utils/serviceHeaderBuilder.ts b/packages/core/src/utils/serviceHeaderBuilder.ts
@@ -8,6 +8,7 @@ type BuilderInput = {
   apiSecret: string;
   body?: BodyInit | null;
   accessToken?: string | null;
+  customHeaders?: Record<string, string>;
 };
 
 const serviceHeaderBuilder = ({
@@ -17,6 +18,7 @@ const serviceHeaderBuilder = ({
   apiKey,
   body = '',
   accessToken,
+  customHeaders = {},
 }: BuilderInput): HeadersInit => {
   if (!apiKey || !apiSecret) {
     return {};
@@ -38,6 +40,7 @@ const serviceHeaderBuilder = ({
       'Access-Control-Allow-Credentials': 'true',
       Authorization: `Bearer ${accessToken}`,
     }),
+    ...customHeaders,
   };
 };