@shopify/hydrogen 2024.7.6 → 2024.7.8

package/dist/development/index.cjs

@@ -511,7 +511,7 @@ var errorOnce = (string) => {
 };
 
 // src/version.ts
-var LIB_VERSION = "2024.7.6";
+var LIB_VERSION = "2024.7.8";
 
 // src/utils/graphql.ts
 function minifyQuery(string) {
@@ -2337,7 +2337,7 @@ function redirect(path, options = {}) {
 async function refreshToken({
   session,
   customerAccountId,
-  customerAccountUrl,
+  customerAccountTokenExchangeUrl,
   httpsOrigin,
   debugInfo,
   exchangeForStorefrontCustomerAccessToken
@@ -2360,7 +2360,7 @@ async function refreshToken({
     Origin: httpsOrigin
   };
   const startTime = (/* @__PURE__ */ new Date()).getTime();
-  const url = `${customerAccountUrl}/auth/oauth/token`;
+  const url = customerAccountTokenExchangeUrl;
   const response = await fetch(url, {
     method: "POST",
     headers,
@@ -2390,7 +2390,7 @@ async function refreshToken({
   const accessToken = await exchangeAccessToken(
     access_token,
     customerAccountId,
-    customerAccountUrl,
+    customerAccountTokenExchangeUrl,
     httpsOrigin,
     debugInfo
   );
@@ -2412,7 +2412,7 @@ async function checkExpires({
   expiresAt,
   session,
   customerAccountId,
-  customerAccountUrl,
+  customerAccountTokenExchangeUrl,
   httpsOrigin,
   debugInfo,
   exchangeForStorefrontCustomerAccessToken
@@ -2423,7 +2423,7 @@ async function checkExpires({
         locks.refresh = refreshToken({
           session,
           customerAccountId,
-          customerAccountUrl,
+          customerAccountTokenExchangeUrl,
           httpsOrigin,
           debugInfo,
           exchangeForStorefrontCustomerAccessToken
@@ -2474,7 +2474,7 @@ function generateState() {
   const randomString = Math.random().toString(36).substring(2);
   return timestamp + randomString;
 }
-async function exchangeAccessToken(authAccessToken, customerAccountId, customerAccountUrl, httpsOrigin, debugInfo) {
+async function exchangeAccessToken(authAccessToken, customerAccountId, customerAccountTokenExchangeUrl, httpsOrigin, debugInfo) {
   const clientId = customerAccountId;
   if (!authAccessToken)
     throw new BadRequest(
@@ -2497,7 +2497,7 @@ async function exchangeAccessToken(authAccessToken, customerAccountId, customerA
     Origin: httpsOrigin
   };
   const startTime = (/* @__PURE__ */ new Date()).getTime();
-  const url = `${customerAccountUrl}/auth/oauth/token`;
+  const url = customerAccountTokenExchangeUrl;
   const response = await fetch(url, {
     method: "POST",
     headers,
@@ -2547,6 +2547,30 @@ function toHexString(byteArray) {
   }).join("");
 }
 
+// src/customer/customer-account-helper.ts
+function createCustomerAccountHelper(customerApiVersion, deprecatedCustomerAccountUrl, shopId) {
+  const customerAccountUrl = shopId ? `https://shopify.com/${shopId}` : deprecatedCustomerAccountUrl;
+  const customerAccountAuthUrl = shopId ? `https://shopify.com/authentication/${shopId}` : `${deprecatedCustomerAccountUrl}/auth`;
+  return function getCustomerAccountUrl(urlType) {
+    switch (urlType) {
+      case "CA_BASE_URL" /* CA_BASE_URL */:
+        return customerAccountUrl;
+      case "CA_BASE_AUTH_URL" /* CA_BASE_AUTH_URL */:
+        return customerAccountAuthUrl;
+      case "GRAPHQL" /* GRAPHQL */:
+        return `${customerAccountUrl}/account/customer/api/${customerApiVersion}/graphql`;
+      case "AUTH" /* AUTH */:
+        return `${customerAccountAuthUrl}/oauth/authorize`;
+      case "LOGIN_SCOPE" /* LOGIN_SCOPE */:
+        return shopId ? "openid email customer-account-api:full" : "openid email https://api.customers.com/auth/customer.graphql";
+      case "TOKEN_EXCHANGE" /* TOKEN_EXCHANGE */:
+        return `${customerAccountAuthUrl}/oauth/token`;
+      case "LOGOUT" /* LOGOUT */:
+        return `${customerAccountAuthUrl}/logout`;
+    }
+  };
+}
+
 // src/customer/customer.ts
 var DEFAULT_LOGIN_URL = "/account/login";
 var DEFAULT_AUTH_URL = "/account/authorize";
@@ -2560,7 +2584,8 @@ function defaultAuthStatusHandler(request) {
 function createCustomerAccountClient({
   session,
   customerAccountId,
-  customerAccountUrl,
+  customerAccountUrl: deprecatedCustomerAccountUrl,
+  shopId,
   customerApiVersion = DEFAULT_CUSTOMER_API_VERSION,
   request,
   waitUntil,
@@ -2584,6 +2609,11 @@ function createCustomerAccountClient({
       "[h2:error:createCustomerAccountClient] The request object does not contain a URL."
     );
   }
+  if (!!deprecatedCustomerAccountUrl && !shopId) {
+    warnOnce(
+      "[h2:warn:createCustomerAccountClient] The `customerAccountUrl` option is deprecated and will be removed in a future version. Please remove `customerAccountUrl` and supply a `shopId: env.SHOP_ID` option instead.\n\nIf using `createHydrogenContext`, ensure there is a SHOP_ID defined in your local .env file."
+    );
+  }
   const authStatusHandler = customAuthStatusHandler ? customAuthStatusHandler : () => defaultAuthStatusHandler(request);
   const requestUrl = new URL(request.url);
   const httpsOrigin = requestUrl.protocol === "http:" ? requestUrl.origin.replace("http", "https") : requestUrl.origin;
@@ -2592,7 +2622,16 @@ function createCustomerAccountClient({
     defaultUrl: DEFAULT_AUTH_URL,
     redirectUrl: authUrl
   });
-  const customerAccountApiUrl = `${customerAccountUrl}/account/customer/api/${customerApiVersion}/graphql`;
+  const getCustomerAccountUrl = createCustomerAccountHelper(
+    customerApiVersion,
+    deprecatedCustomerAccountUrl,
+    shopId
+  );
+  const ifInvalidCredentialThrowError = createIfInvalidCredentialThrowError(
+    getCustomerAccountUrl,
+    customerAccountId
+  );
+  const customerAccountApiUrl = getCustomerAccountUrl("GRAPHQL" /* GRAPHQL */);
   const locks = {};
   async function fetchCustomerAPI({
     query: query2,
@@ -2667,7 +2706,8 @@ function createCustomerAccountClient({
     }
   }
   async function isLoggedIn() {
-    if (!customerAccountUrl || !customerAccountId) return false;
+    if (!shopId && (!deprecatedCustomerAccountUrl || !customerAccountId))
+      return false;
     const customerAccount = session.get(CUSTOMER_ACCOUNT_SESSION_KEY);
     const accessToken = customerAccount?.accessToken;
     const expiresAt = customerAccount?.expiresAt;
@@ -2679,7 +2719,9 @@ function createCustomerAccountClient({
         expiresAt,
         session,
         customerAccountId,
-        customerAccountUrl,
+        customerAccountTokenExchangeUrl: getCustomerAccountUrl(
+          "TOKEN_EXCHANGE" /* TOKEN_EXCHANGE */
+        ),
         httpsOrigin,
         debugInfo: {
           waitUntil,
@@ -2704,7 +2746,7 @@ function createCustomerAccountClient({
       return session.get(CUSTOMER_ACCOUNT_SESSION_KEY)?.accessToken;
   }
   async function mutate(mutation, options) {
-    ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId);
+    ifInvalidCredentialThrowError();
     mutation = minifyQuery(mutation);
     assertMutation(mutation, "customer.mutate");
     return withSyncStack(
@@ -2713,7 +2755,7 @@ function createCustomerAccountClient({
     );
   }
   async function query(query2, options) {
-    ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId);
+    ifInvalidCredentialThrowError();
     query2 = minifyQuery(query2);
     assertQuery(query2, "customer.query");
     return withSyncStack(fetchCustomerAPI({ query: query2, type: "query", ...options }), {
@@ -2754,8 +2796,8 @@ function createCustomerAccountClient({
   }
   return {
     login: async (options) => {
-      ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId);
-      const loginUrl = new URL(`${customerAccountUrl}/auth/oauth/authorize`);
+      ifInvalidCredentialThrowError();
+      const loginUrl = new URL(getCustomerAccountUrl("AUTH" /* AUTH */));
       const state = generateState();
       const nonce = generateNonce();
       loginUrl.searchParams.set("client_id", customerAccountId);
@@ -2764,7 +2806,7 @@ function createCustomerAccountClient({
       loginUrl.searchParams.append("redirect_uri", redirectUri);
       loginUrl.searchParams.set(
         "scope",
-        "openid email https://api.customers.com/auth/customer.graphql"
+        getCustomerAccountUrl("LOGIN_SCOPE" /* LOGIN_SCOPE */)
       );
       loginUrl.searchParams.append("state", state);
       loginUrl.searchParams.append("nonce", nonce);
@@ -2790,7 +2832,7 @@ function createCustomerAccountClient({
       return redirect(loginUrl.toString());
     },
     logout: async (options) => {
-      ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId);
+      ifInvalidCredentialThrowError();
       const idToken = session.get(CUSTOMER_ACCOUNT_SESSION_KEY)?.idToken;
       const postLogoutRedirectUri = ensureLocalRedirectUrl({
         requestUrl: httpsOrigin,
@@ -2798,7 +2840,7 @@ function createCustomerAccountClient({
         redirectUrl: options?.postLogoutRedirectUri
       });
       const logoutUrl = idToken ? new URL(
-        `${customerAccountUrl}/auth/logout?${new URLSearchParams([
+        `${getCustomerAccountUrl("LOGOUT" /* LOGOUT */)}?${new URLSearchParams([
           ["id_token_hint", idToken],
           ["post_logout_redirect_uri", postLogoutRedirectUri]
         ]).toString()}`
@@ -2813,7 +2855,7 @@ function createCustomerAccountClient({
     mutate,
     query,
     authorize: async () => {
-      ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId);
+      ifInvalidCredentialThrowError();
       const code = requestUrl.searchParams.get("code");
       const state = requestUrl.searchParams.get("state");
       if (!code || !state) {
@@ -2852,7 +2894,7 @@ function createCustomerAccountClient({
       };
       const stackInfo = getCallerStackLine?.();
       const startTime = (/* @__PURE__ */ new Date()).getTime();
-      const url = `${customerAccountUrl}/auth/oauth/token`;
+      const url = getCustomerAccountUrl("TOKEN_EXCHANGE" /* TOKEN_EXCHANGE */);
       const response = await fetch(url, {
         method: "POST",
         headers,
@@ -2889,17 +2931,20 @@ function createCustomerAccountClient({
           `Returned nonce does not match: ${sessionNonce} !== ${responseNonce}`
         );
       }
-      const customerAccessToken = await exchangeAccessToken(
-        access_token,
-        customerAccountId,
-        customerAccountUrl,
-        httpsOrigin,
-        {
-          waitUntil,
-          stackInfo,
-          ...getDebugHeaders(request)
-        }
-      );
+      let customerAccessToken = access_token;
+      if (!shopId) {
+        customerAccessToken = await exchangeAccessToken(
+          access_token,
+          customerAccountId,
+          getCustomerAccountUrl("TOKEN_EXCHANGE" /* TOKEN_EXCHANGE */),
+          httpsOrigin,
+          {
+            waitUntil,
+            stackInfo,
+            ...getDebugHeaders(request)
+          }
+        );
+      }
       const redirectPath = session.get(
         CUSTOMER_ACCOUNT_SESSION_KEY
       )?.redirectPath;
@@ -2916,19 +2961,22 @@ function createCustomerAccountClient({
     UNSTABLE_getBuyer: getBuyer
   };
 }
-function ifInvalidCredentialThrowError(customerAccountUrl, customerAccountId) {
-  try {
-    if (!customerAccountUrl || !customerAccountId) throw Error();
-    new URL(customerAccountUrl);
-  } catch {
-    console.error(
-      new Error(
-        "[h2:error:customerAccount] You do not have the valid credential to use Customer Account API.\nRun `h2 env pull` to link your store credentials."
-      )
-    );
-    const publicMessage = "You do not have the valid credential to use Customer Account API (/account).";
-    throw new Response(publicMessage, { status: 500 });
-  }
+function createIfInvalidCredentialThrowError(getCustomerAccountUrl, customerAccountId) {
+  return function ifInvalidCredentialThrowError() {
+    try {
+      if (!customerAccountId) throw Error();
+      new URL(getCustomerAccountUrl("CA_BASE_URL" /* CA_BASE_URL */));
+      new URL(getCustomerAccountUrl("CA_BASE_AUTH_URL" /* CA_BASE_AUTH_URL */));
+    } catch {
+      console.error(
+        new Error(
+          "[h2:error:customerAccount] You do not have the valid credential to use Customer Account API.\nRun `h2 env pull` to link your store credentials."
+        )
+      );
+      const publicMessage = "You do not have the valid credential to use Customer Account API (/account).";
+      throw new Response(publicMessage, { status: 500 });
+    }
+  };
 }
 
 // src/changelogHandler.ts
@@ -4369,12 +4417,13 @@ function overrideCustomerPrivacySetTrackingConsent({
   config
 }) {
   const original = customerPrivacy.setTrackingConsent;
+  const { locale, country, ...rest } = config;
   function updatedSetTrackingConsent(consent, callback) {
     original(
       {
-        ...consent,
+        ...rest,
         headlessStorefront: true,
-        ...config
+        ...consent
       },
       callback
     );
@@ -4419,7 +4468,7 @@ function getPrivacyBanner() {
 }
 
 // package.json
-var version = "2024.7.6";
+var version = "2024.7.8";
 
 // src/analytics-manager/ShopifyAnalytics.tsx
 function getCustomerPrivacyRequired() {
@@ -5142,6 +5191,8 @@ function createHydrogenContext(options) {
     unstableB2b: customerAccountOptions?.unstableB2b,
     // defaults
     customerAccountId: env.PUBLIC_CUSTOMER_ACCOUNT_API_CLIENT_ID,
+    shopId: env.SHOP_ID,
+    // deprecated - keep until next major release
     customerAccountUrl: env.PUBLIC_CUSTOMER_ACCOUNT_API_URL
   });
   const cart = createCartHandler({