Revert "Revert "Add storefront missing headers""

Shopify · Aug 9, 2023 · c296253 · c296253
1 parent 948720f
commit c296253
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 9 deletions.
diff --git a/.changeset/beige-kids-build.md b/.changeset/beige-kids-build.md
@@ -0,0 +1,5 @@
+---
+'@shopify/shopify-api': patch
+---
+
+Fix storefront header incorrectly setting private token as access token
diff --git a/.changeset/tough-schools-know.md b/.changeset/tough-schools-know.md
diff --git a/lib/clients/graphql/__tests__/storefront_client.test.ts b/lib/clients/graphql/__tests__/storefront_client.test.ts
@@ -96,7 +96,7 @@ describe('Storefront GraphQL client', () => {
       path: `/api/${shopify.config.apiVersion}/graphql.json`,
       data: QUERY,
       headers: {
-        [ShopifyHeader.StorefrontAccessToken]: 'private_token',
+        [ShopifyHeader.StorefrontPrivateToken]: 'private_token',
       },
     }).toMatchMadeHttpRequest();
   });

diff --git a/lib/clients/graphql/storefront_client.ts b/lib/clients/graphql/storefront_client.ts
@@ -41,13 +41,16 @@ export class StorefrontClient extends GraphqlClient {
 
   protected getApiHeaders(): HeaderParams {
     const sdkVariant = LIBRARY_NAME.toLowerCase().split(' ').join('-');
-
+    const privateToken =
+      this.storefrontClass().config.privateAppStorefrontAccessToken;
+    const tokenHeaderParam =
+      privateToken === undefined
+        ? {[ShopifyHeader.StorefrontAccessToken]: this.storefrontAccessToken}
+        : ({
+            [ShopifyHeader.StorefrontPrivateToken]: privateToken,
+          } as HeaderParams);
     return {
-      [ShopifyHeader.StorefrontAccessToken]: this.storefrontClass().config
-        .isCustomStoreApp
-        ? this.storefrontClass().config.privateAppStorefrontAccessToken ||
-          this.storefrontAccessToken
-        : this.storefrontAccessToken,
+      ...tokenHeaderParam,
       [ShopifyHeader.StorefrontSDKVariant]: sdkVariant,
       [ShopifyHeader.StorefrontSDKVersion]: SHOPIFY_API_LIBRARY_VERSION,
     };

diff --git a/lib/types.ts b/lib/types.ts
@@ -27,6 +27,7 @@ export enum ShopifyHeader {
   Topic = 'X-Shopify-Topic',
   WebhookId = 'X-Shopify-Webhook-Id',
   StorefrontAccessToken = 'X-Shopify-Storefront-Access-Token',
+  StorefrontPrivateToken = 'Shopify-Storefront-Private-Token',
   StorefrontSDKVariant = 'X-SDK-Variant',
   StorefrontSDKVersion = 'X-SDK-Version',
 }