Force all requests in app management to have an unauthorizedHandler

Author: isaacroldan

packages/app/src/cli/utilities/developer-platform-client/app-management-client.ts

@@ -80,7 +80,7 @@ export async function adminRequestDoc<TResult, TVariables extends Variables>(
   }
   let unauthorizedHandler: UnauthorizedHandler | undefined
   if ('refresh' in session) {
-    unauthorizedHandler = {type: 'simple', handler: session.refresh as () => Promise<void>}
+    unauthorizedHandler = {type: 'token_refresh', handler: session.refresh as () => Promise<{token: string}>}
   }
   const result = graphqlRequestDoc<TResult, TVariables>({
     ...opts,

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

@@ -1,4 +1,4 @@
-import {appDevRequest} from './app-dev.js'
+import {appDevRequestDoc} from './app-dev.js'
 import {graphqlRequestDoc} from './graphql.js'
 import {serviceEnvironment, Environment} from '../../../private/node/context/service.js'
 import {test, vi, expect, describe} from 'vitest'
@@ -33,7 +33,7 @@ describe('appDevRequest', () => {
     const query = 'query' as unknown as TypedDocumentNode<object, {variables: string}>
 
     // When
-    await appDevRequest(query, shopFqdn, mockedToken, {variables: 'variables'})
+    await appDevRequestDoc(query, shopFqdn, mockedToken, {variables: 'variables'})
 
     // Then
     expect(graphqlRequestDoc).toHaveBeenLastCalledWith({
@@ -51,7 +51,7 @@ describe('appDevRequest', () => {
     const query = 'query' as unknown as TypedDocumentNode<object, {variables: string}>
 
     // When
-    await appDevRequest(query, shopFqdn, mockedToken, {variables: 'variables'})
+    await appDevRequestDoc(query, shopFqdn, mockedToken, {variables: 'variables'})
 
     // Then
     expect(graphqlRequestDoc).toHaveBeenLastCalledWith({

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

@@ -1,4 +1,4 @@
-import {graphqlRequestDoc} from './graphql.js'
+import {graphqlRequestDoc, UnauthorizedHandler} from './graphql.js'
 import {appDevFqdn, normalizeStoreFqdn} from '../context/fqdn.js'
 import {serviceEnvironment} from '../../../private/node/context/service.js'
 import Bottleneck from 'bottleneck'
@@ -14,36 +14,45 @@ const limiter = new Bottleneck({
 })
 
 /**
- * Executes an org-scoped GraphQL query against the App Management API.
- * Uses typed documents.
- *
  * @param query - GraphQL query to execute.
  * @param shopFqdn - The shop fqdn.
  * @param token - Partners token.
  * @param variables - GraphQL variables to pass to the query.
+ * @param unauthorizedHandler - Unauthorized handler to use.
+ */
+export interface AppDevRequestOptions<TResult, TVariables extends Variables> {
+  query: TypedDocumentNode<TResult, TVariables>
+  shopFqdn: string
+  token: string
+  unauthorizedHandler: UnauthorizedHandler
+  variables?: TVariables
+}
+/**
+ * Executes an org-scoped GraphQL query against the App Management API.
+ * Uses typed documents.
+ *
+ * @param options - The options for the request.
  * @returns The response of the query of generic type <T>.
  */
-export async function appDevRequest<TResult, TVariables extends Variables>(
-  query: TypedDocumentNode<TResult, TVariables>,
-  shopFqdn: string,
-  token: string,
-  variables?: TVariables,
+export async function appDevRequestDoc<TResult, TVariables extends Variables>(
+  options: AppDevRequestOptions<TResult, TVariables>,
 ): Promise<TResult> {
   const api = 'App Dev'
-  const normalizedShopFqdn = await normalizeStoreFqdn(shopFqdn)
+  const normalizedShopFqdn = await normalizeStoreFqdn(options.shopFqdn)
   const fqdn = await appDevFqdn(normalizedShopFqdn)
   const url = `https://${fqdn}/app_dev/unstable/graphql.json`
 
   const addedHeaders = serviceEnvironment() === 'local' ? {'x-forwarded-host': normalizedShopFqdn} : undefined
 
   const result = limiter.schedule<TResult>(() =>
     graphqlRequestDoc<TResult, TVariables>({
-      query,
+      query: options.query,
       api,
       url,
-      token,
+      token: options.token,
       addedHeaders,
-      variables,
+      variables: options.variables,
+      unauthorizedHandler: options.unauthorizedHandler,
     }),
   )
 

packages/cli-kit/src/public/node/api/app-dev.ts

@@ -50,38 +50,45 @@ export interface RequestOptions {
 }
 
 /**
- * Executes an org-scoped GraphQL query against the App Management API. Uses typed documents.
- *
  * @param orgId - The organization ID.
  * @param query - GraphQL query to execute.
  * @param token - Partners token.
  * @param variables - GraphQL variables to pass to the query.
  * @param cacheOptions - Cache options for the request. If not present, the request will not be cached.
  * @param requestOptions - Preferred behaviour for the request.
  * @param unauthorizedHandler - Optional handler for unauthorized requests.
+ */
+export interface AppManagementRequestOptions<TResult, TVariables extends Variables> {
+  organizationId: string
+  query: TypedDocumentNode<TResult, TVariables>
+  token: string
+  variables?: TVariables
+  cacheOptions?: CacheOptions
+  requestOptions?: RequestOptions
+  unauthorizedHandler: UnauthorizedHandler
+}
+
+/**
+ * Executes an org-scoped GraphQL query against the App Management API. Uses typed documents.
+ *
+ * @param options - The options for the request.
  * @returns The response of the query of generic type <T>.
  */
 export async function appManagementRequestDoc<TResult, TVariables extends Variables>(
-  orgId: string,
-  query: TypedDocumentNode<TResult, TVariables>,
-  token: string,
-  variables?: TVariables,
-  cacheOptions?: CacheOptions,
-  requestOptions?: RequestOptions,
-  unauthorizedHandler?: UnauthorizedHandler,
+  options: AppManagementRequestOptions<TResult, TVariables>,
 ): Promise<TResult> {
   // For app management, we need to cache the response based on the orgId.
-  const cacheExtraKey = (cacheOptions?.cacheExtraKey ?? '') + orgId
-  const newCacheOptions = cacheOptions ? {...cacheOptions, cacheExtraKey} : undefined
+  const cacheExtraKey = (options.cacheOptions?.cacheExtraKey ?? '') + options.organizationId
+  const newCacheOptions = options.cacheOptions ? {...options.cacheOptions, cacheExtraKey} : undefined
 
   const result = limiter.schedule<TResult>(async () =>
     graphqlRequestDoc<TResult, TVariables>({
-      ...(await setupRequest(orgId, token)),
-      query,
-      variables,
+      ...(await setupRequest(options.organizationId, options.token)),
+      query: options.query,
+      variables: options.variables,
       cacheOptions: newCacheOptions,
-      preferredBehaviour: requestOptions?.requestMode,
-      unauthorizedHandler,
+      preferredBehaviour: options.requestOptions?.requestMode,
+      unauthorizedHandler: options.unauthorizedHandler,
     }),
   )
 

packages/cli-kit/src/public/node/api/app-management.ts

@@ -1,4 +1,4 @@
-import {CacheOptions, Exact, GraphQLVariables, graphqlRequest, graphqlRequestDoc} from './graphql.js'
+import {CacheOptions, GraphQLVariables, UnauthorizedHandler, graphqlRequest, graphqlRequestDoc} from './graphql.js'
 import {handleDeprecations} from './partners.js'
 import {businessPlatformFqdn} from '../context/fqdn.js'
 import {TypedDocumentNode} from '@graphql-typed-document-node/core'
@@ -45,25 +45,34 @@ export async function businessPlatformRequest<T>(
 }
 
 /**
- * Executes a GraphQL query against the Business Platform Destinations API. Uses typed documents.
- *
  * @param query - GraphQL query to execute.
  * @param token - Business Platform token.
  * @param variables - GraphQL variables to pass to the query.
  * @param cacheOptions - Cache options for the request. If not present, the request will not be cached.
+ */
+export interface BusinessPlatformRequestOptions<TResult, TVariables extends Variables> {
+  query: TypedDocumentNode<TResult, TVariables>
+  token: string
+  variables?: TVariables
+  cacheOptions?: CacheOptions
+  unauthorizedHandler: UnauthorizedHandler
+}
+
+/**
+ * Executes a GraphQL query against the Business Platform Destinations API. Uses typed documents.
+ *
+ * @param options - The options for the request.
  * @returns The response of the query of generic type <TResult>.
  */
 export async function businessPlatformRequestDoc<TResult, TVariables extends Variables>(
-  query: TypedDocumentNode<TResult, TVariables>,
-  token: string,
-  variables?: TVariables,
-  cacheOptions?: CacheOptions,
+  options: BusinessPlatformRequestOptions<TResult, TVariables>,
 ): Promise<TResult> {
   return graphqlRequestDoc<TResult, TVariables>({
-    ...(await setupRequest(token)),
-    query,
-    variables,
-    cacheOptions,
+    ...(await setupRequest(options.token)),
+    query: options.query,
+    variables: options.variables,
+    cacheOptions: options.cacheOptions,
+    unauthorizedHandler: options.unauthorizedHandler,
   })
 }
 
@@ -85,46 +94,47 @@ async function setupOrganizationsRequest(token: string, organizationId: string)
   }
 }
 
+export interface BusinessPlatformOrganizationsRequestNonTypedOptions {
+  query: string
+  token: string
+  organizationId: string
+  variables?: GraphQLVariables
+}
+
 /**
  * Executes a GraphQL query against the Business Platform Organizations API.
  *
- * @param query - GraphQL query to execute.
- * @param token - Business Platform token.
- * @param organizationId - Organization ID as a numeric (non-GID) value.
- * @param variables - GraphQL variables to pass to the query.
+ * @param options - The options for the request.
  * @returns The response of the query of generic type <T>.
  */
 export async function businessPlatformOrganizationsRequest<T>(
-  query: string,
-  token: string,
-  organizationId: string,
-  variables?: GraphQLVariables,
+  options: BusinessPlatformOrganizationsRequestNonTypedOptions,
 ): Promise<T> {
   return graphqlRequest<T>({
-    query,
-    ...(await setupOrganizationsRequest(token, organizationId)),
-    variables,
+    query: options.query,
+    ...(await setupOrganizationsRequest(options.token, options.organizationId)),
+    variables: options.variables,
   })
 }
 
+export interface BusinessPlatformOrganizationsRequestOptions<TResult, TVariables extends Variables>
+  extends BusinessPlatformRequestOptions<TResult, TVariables> {
+  organizationId: string
+}
+
 /**
  * Executes a GraphQL query against the Business Platform Organizations API. Uses typed documents.
  *
- * @param query - GraphQL query to execute.
- * @param token - Business Platform token.
- * @param organizationId - Organization ID as a numeric value.
- * @param variables - GraphQL variables to pass to the query.
+ * @param options - The options for the request.
  * @returns The response of the query of generic type <T>.
  */
 export async function businessPlatformOrganizationsRequestDoc<TResult, TVariables extends Variables>(
-  query: TypedDocumentNode<TResult, TVariables> | TypedDocumentNode<TResult, Exact<{[key: string]: never}>>,
-  token: string,
-  organizationId: string,
-  variables?: TVariables,
+  options: BusinessPlatformOrganizationsRequestOptions<TResult, TVariables>,
 ): Promise<TResult> {
   return graphqlRequestDoc<TResult, TVariables>({
-    query,
-    ...(await setupOrganizationsRequest(token, organizationId)),
-    variables,
+    query: options.query,
+    ...(await setupOrganizationsRequest(options.token, options.organizationId)),
+    variables: options.variables,
+    unauthorizedHandler: options.unauthorizedHandler,
   })
 }

packages/cli-kit/src/public/node/api/business-platform.ts

@@ -1,4 +1,4 @@
-import {graphqlRequestDoc} from './graphql.js'
+import {graphqlRequestDoc, UnauthorizedHandler} from './graphql.js'
 import {handleDeprecations} from './app-management.js'
 import {appManagementFqdn} from '../context/fqdn.js'
 import {TypedDocumentNode} from '@graphql-typed-document-node/core'
@@ -42,6 +42,7 @@ async function setupRequest(orgId: string, token: string, appId: string) {
  * @param token - Authentication token.
  * @param appId - App identifier.
  * @param variables - Optional query variables.
+ * @param unauthorizedHandler - Optional handler for unauthorized requests.
  * @returns Promise resolving to the typed query result.
  */
 export async function functionsRequestDoc<TResult, TVariables extends Variables>(
@@ -50,12 +51,14 @@ export async function functionsRequestDoc<TResult, TVariables extends Variables>
   token: string,
   appId: string,
   variables?: TVariables,
+  unauthorizedHandler?: UnauthorizedHandler,
 ): Promise<TResult> {
   const result = await limiter.schedule<TResult>(async () => {
     return graphqlRequestDoc<TResult, TVariables>({
       ...(await setupRequest(orgId, token, appId)),
       query,
       variables,
+      unauthorizedHandler,
     })
   })
 

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

@@ -32,6 +32,7 @@ export async function initializeDevServerSession(
   session.refresh = async () => {
     outputDebug('Refreshing theme session...')
     const newSession = await fetchDevServerSession(themeId, adminSession, adminPassword, storefrontPassword)
+    return newSession.token
     Object.assign(session, newSession)
   }
 

packages/theme/src/cli/utilities/theme-environment/dev-server-session.ts

@@ -41,7 +41,7 @@ export interface DevServerSession extends AdminSession {
    * Refreshes the current session, ensuring any tokens and session cookies
    * are up-to-date.
    */
-  refresh?: () => Promise<void>
+  refresh?: () => Promise<string>
 }
 
 /**