Merge branch 'main' into dependabot/npm_and_yarn/supertest-and-types/supertest-6.3.4

Author: lizkenyon

.changeset/curly-boxes-switch.md

@@ -0,0 +1,5 @@
+---
+"@shopify/graphql-client": patch
+---
+
+Fix GraphQL client validations for store hosts starting with http

.changeset/silly-spiders-repair.md

@@ -0,0 +1,5 @@
+---
+"@shopify/shopify-api": patch
+---
+
+Fix linked reference for session in token exchange docs

dev.yml

@@ -0,0 +1,16 @@
+name: shopify-api-js
+
+type: node
+
+up:
+  - node:
+      version: v18.19.0
+      yarn: 1.22.21
+      packages:
+        - .
+env:
+  NODE_ENV: "development"
+
+commands:
+  server:
+    run: yarn dev

packages/graphql-client/src/api-client-utilities/tests/validation.test.ts

@@ -73,6 +73,26 @@ describe("validateDomainAndGetStoreUrl())", () => {
     });
     expect(domain).toEqual(`https://${domainOnly}`);
   });
+
+  it("returns a store url when a protocol-less store domain starting with http is provided", () => {
+    const domainOnly = "http-test-store.myshopify.io";
+
+    const domain = validateDomainAndGetStoreUrl({
+      client,
+      storeDomain: domainOnly,
+    });
+    expect(domain).toEqual(`https://${domainOnly}`);
+  });
+
+  it("returns a store url when a protocol-less store domain starting with https is provided", () => {
+    const domainOnly = "https-test-store.myshopify.io";
+
+    const domain = validateDomainAndGetStoreUrl({
+      client,
+      storeDomain: domainOnly,
+    });
+    expect(domain).toEqual(`https://${domainOnly}`);
+  });
 });
 
 describe("validateRequiredApiVersion()", () => {

packages/graphql-client/src/api-client-utilities/validations.ts

@@ -14,9 +14,10 @@ export function validateDomainAndGetStoreUrl({
 
     const trimmedDomain = storeDomain.trim();
 
-    const protocolUrl = trimmedDomain.startsWith("http")
-      ? trimmedDomain
-      : `https://${trimmedDomain}`;
+    const protocolUrl =
+      trimmedDomain.startsWith("http:") || trimmedDomain.startsWith("https:")
+        ? trimmedDomain
+        : `https://${trimmedDomain}`;
 
     const url = new URL(protocolUrl);
     url.protocol = "https";

packages/shopify-api/docs/reference/auth/tokenExchange.md

@@ -71,7 +71,6 @@ A Shopify domain name in the form `{exampleshop}.myshopify.com`.
 
 `Promise<Session>`
 
-See [Session](../session/README.md) reference.
-
-
+The new Shopify [Session object](../../../lib/session/session.ts), containing the API access token.
 
+[Back to shopify.auth](./README.md)

packages/shopify-api/package.json

@@ -84,7 +84,7 @@
     "@cloudflare/workers-types": "^4.20240129.0",
     "@swc/core": "^1.3.107",
     "@types/express": "^4.17.13",
-    "@types/node": "^20.11.6",
+    "@types/node": "^20.11.17",
     "@types/node-fetch": "^2.6.11",
     "@types/supertest": "^6.0.2",
     "@types/uuid": "^9.0.0",

yarn.lock

@@ -3174,10 +3174,10 @@
   dependencies:
     "@types/node" "*"
 
-"@types/node@*", "@types/node@^20.11.6":
-  version "20.11.6"
-  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.6.tgz#6adf4241460e28be53836529c033a41985f85b6e"
-  integrity sha512-+EOokTnksGVgip2PbYbr3xnR7kZigh4LbybAfBAw5BpnQ+FqBYUsvCEjYd70IXKlbohQ64mzEYmMtlWUY8q//Q==
+"@types/node@*", "@types/node@^20.11.17":
+  version "20.11.17"
+  resolved "https://registry.yarnpkg.com/@types/node/-/node-20.11.17.tgz#cdd642d0e62ef3a861f88ddbc2b61e32578a9292"
+  integrity sha512-QmgQZGWu1Yw9TDyAP9ZzpFJKynYNeOvwMJmaxABfieQoVoiVOS6MN1WSpqpRcbeA5+RW82kraAVxCCJg+780Qw==
   dependencies:
     undici-types "~5.26.4"