Merge pull request #6220 from Shopify/decrease-normalizestorefqdn-calls

Remove redundant calls to normalizeStoreFqdn

Author: EvilGenius13

.changeset/flat-schools-dance.md

@@ -0,0 +1,5 @@
+---
+'@shopify/cli-kit': patch
+---
+
+Remove redundant calls to normalizeStoreFqdn in requests

packages/cli-kit/src/public/node/api/admin.test.ts

@@ -28,7 +28,7 @@ const mockedResult = {
 }
 
 const token = 'token'
-const Session: AdminSession = {token, storeFqdn: 'store'}
+const Session: AdminSession = {token, storeFqdn: 'store.myshopify.com'}
 
 describe('admin-graphql-api', () => {
   test('calls the graphql client twice: get api version and then execute the request', async () => {
@@ -83,7 +83,7 @@ describe('admin-graphql-api', () => {
       api: 'Admin',
       addedHeaders: {
         'X-Shopify-Access-Token': 'shptka_token',
-        'X-Shopify-Shop': 'store',
+        'X-Shopify-Shop': 'store.myshopify.com',
       },
       url: `https://${defaultThemeKitAccessDomain}/cli/admin/api/2022-01/graphql.json`,
       token: themeAccessToken,
@@ -131,7 +131,7 @@ describe('admin-rest-api', () => {
     await admin.restRequest('GET', '/themes', Session)
 
     // Then
-    expect(spyFetch).toHaveBeenLastCalledWith('https://store/admin/api/unstable/themes.json', {
+    expect(spyFetch).toHaveBeenLastCalledWith('https://store.myshopify.com/admin/api/unstable/themes.json', {
       headers,
       method: 'GET',
     })
@@ -164,7 +164,7 @@ describe('admin-rest-api', () => {
         headers: {
           'Content-Type': 'application/json',
           'X-Shopify-Access-Token': 'shptka_token',
-          'X-Shopify-Shop': 'store',
+          'X-Shopify-Shop': 'store.myshopify.com',
         },
         method: 'GET',
       },

packages/cli-kit/src/public/node/api/admin.ts

@@ -16,7 +16,7 @@ import {
 } from '../../../private/node/api/rest.js'
 import {RequestModeInput, shopifyFetch} from '../http.js'
 import {PublicApiVersions} from '../../../cli/api/graphql/admin/generated/public_api_versions.js'
-import {normalizeStoreFqdn} from '../context/fqdn.js'
+
 import {themeKitAccessDomain} from '../../../private/node/constants.js'
 import {serviceEnvironment} from '../../../private/node/context/service.js'
 import {DevServerCore} from '../vendor/dev_server/index.js'
@@ -36,7 +36,7 @@ const LatestApiVersionByFQDN = new Map<string, string>()
 export async function adminRequest<T>(query: string, session: AdminSession, variables?: GraphQLVariables): Promise<T> {
   const api = 'Admin'
   const version = await fetchLatestSupportedApiVersion(session)
-  let storeDomain = await normalizeStoreFqdn(session.storeFqdn)
+  let storeDomain = session.storeFqdn
   const addedHeaders = themeAccessHeaders(session)
 
   if (serviceEnvironment() === 'local') {
@@ -78,7 +78,7 @@ export async function adminRequestDoc<TResult, TVariables extends Variables>(
   if (!apiVersion) {
     apiVersion = await fetchLatestSupportedApiVersion(session, preferredBehaviour)
   }
-  let storeDomain = await normalizeStoreFqdn(session.storeFqdn)
+  let storeDomain = session.storeFqdn
   const addedHeaders = themeAccessHeaders(session)
 
   if (serviceEnvironment() === 'local') {

packages/cli-kit/src/public/node/session.test.ts

@@ -173,7 +173,7 @@ describe('ensureAuthenticatedTheme', () => {
 
   test('returns the password when is provided and custom_app_token', async () => {
     // When
-    const got = await ensureAuthenticatedThemes('mystore', 'password')
+    const got = await ensureAuthenticatedThemes('mystore.myshopify.com', 'password')
 
     // Then
     expect(got).toEqual({token: 'password', storeFqdn: 'mystore.myshopify.com'})
@@ -183,7 +183,7 @@ describe('ensureAuthenticatedTheme', () => {
 
   test('returns the password when is provided and theme_access_token', async () => {
     // When
-    const got = await ensureAuthenticatedThemes('mystore', 'shptka_password')
+    const got = await ensureAuthenticatedThemes('mystore.myshopify.com', 'shptka_password')
 
     // Then
     expect(got).toEqual({token: 'shptka_password', storeFqdn: 'mystore.myshopify.com'})

packages/cli-kit/src/public/node/session.ts

@@ -1,4 +1,3 @@
-import {normalizeStoreFqdn} from './context/fqdn.js'
 import {BugError} from './error.js'
 import {getPartnersToken} from './environment.js'
 import {nonRandomUUID} from './crypto.js'
@@ -190,7 +189,7 @@ export async function ensureAuthenticatedThemes(
 ${outputToken.json(scopes)}
 `)
   if (password) {
-    const session = {token: password, storeFqdn: await normalizeStoreFqdn(store)}
+    const session = {token: password, storeFqdn: store}
     const authMethod = isThemeAccessSession(session) ? 'theme_access_token' : 'custom_app_token'
     setLastSeenAuthMethod(authMethod)
     setLastSeenUserIdAfterAuth(nonRandomUUID(password))