Rename PartnersSession to Session and move it to cli-kit

Author: gonzaloriestra

packages/app/src/cli/api/graphql/current_account_info.ts

@@ -1,35 +1,9 @@
-import {AccountInfo} from '../../services/context/partner-account-info.js'
+import {CurrentAccountInfoQuery} from './partners/generated/current-account-info.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
+import {AccountInfo} from '@shopify/cli-kit/node/session'
 import {AbortError} from '@shopify/cli-kit/node/error'
-import {gql} from 'graphql-request'
 
-export const CurrentAccountInfoQuery = gql`
-  query currentAccountInfo {
-    currentAccountInfo {
-      __typename
-      ... on ServiceAccount {
-        orgName
-      }
-      ... on UserAccount {
-        email
-      }
-    }
-  }
-`
-
-type AccountInfoSchema =
-  | {
-      __typename: 'UserAccount'
-      email: string
-    }
-  | {
-      __typename: 'ServiceAccount'
-      orgName: string
-    }
-
-export interface CurrentAccountInfoSchema {
-  currentAccountInfo: AccountInfoSchema
-}
+export type CurrentAccountInfoSchema = CurrentAccountInfoQuery
 
 export async function getCurrentAccountInfo(developerPlatformClient: DeveloperPlatformClient) {
   const {currentAccountInfo} = await developerPlatformClient.currentAccountInfo()
@@ -41,7 +15,7 @@ export async function getCurrentAccountInfo(developerPlatformClient: DeveloperPl
   return mapAccountInfo(currentAccountInfo)
 }
 
-function mapAccountInfo(accountInfo: AccountInfoSchema): AccountInfo {
+function mapAccountInfo(accountInfo: CurrentAccountInfoQuery['currentAccountInfo']): AccountInfo {
   if (accountInfo.__typename === 'UserAccount') {
     return {
       type: 'UserAccount',

packages/app/src/cli/api/graphql/partners/generated/current-account-info.ts

@@ -0,0 +1,58 @@
+/* eslint-disable @typescript-eslint/consistent-type-definitions */
+import * as Types from './types.js'
+
+import {TypedDocumentNode as DocumentNode} from '@graphql-typed-document-node/core'
+
+export type CurrentAccountInfoQueryVariables = Types.Exact<{[key: string]: never}>
+
+export type CurrentAccountInfoQuery = {
+  currentAccountInfo: {__typename: 'ServiceAccount'; orgName: string} | {__typename: 'UserAccount'; email: string}
+}
+
+export const CurrentAccountInfo = {
+  kind: 'Document',
+  definitions: [
+    {
+      kind: 'OperationDefinition',
+      operation: 'query',
+      name: {kind: 'Name', value: 'currentAccountInfo'},
+      selectionSet: {
+        kind: 'SelectionSet',
+        selections: [
+          {
+            kind: 'Field',
+            name: {kind: 'Name', value: 'currentAccountInfo'},
+            selectionSet: {
+              kind: 'SelectionSet',
+              selections: [
+                {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {kind: 'NamedType', name: {kind: 'Name', value: 'ServiceAccount'}},
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      {kind: 'Field', name: {kind: 'Name', value: 'orgName'}},
+                      {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
+                    ],
+                  },
+                },
+                {
+                  kind: 'InlineFragment',
+                  typeCondition: {kind: 'NamedType', name: {kind: 'Name', value: 'UserAccount'}},
+                  selectionSet: {
+                    kind: 'SelectionSet',
+                    selections: [
+                      {kind: 'Field', name: {kind: 'Name', value: 'email'}},
+                      {kind: 'Field', name: {kind: 'Name', value: '__typename'}},
+                    ],
+                  },
+                },
+              ],
+            },
+          },
+        ],
+      },
+    },
+  ],
+} as unknown as DocumentNode<CurrentAccountInfoQuery, CurrentAccountInfoQueryVariables>

packages/app/src/cli/api/graphql/partners/queries/current-account-info.graphql

@@ -0,0 +1,11 @@
+query currentAccountInfo {
+  currentAccountInfo {
+    __typename
+    ... on ServiceAccount {
+      orgName
+    }
+    ... on UserAccount {
+      email
+    }
+  }
+}

packages/app/src/cli/models/app/app.test-data.ts

@@ -24,7 +24,6 @@ import {ExtensionInstance} from '../extensions/extension-instance.js'
 import {loadLocalExtensionsSpecifications} from '../extensions/load-specifications.js'
 import {FunctionConfigType} from '../extensions/specifications/function.js'
 import {BaseConfigType} from '../extensions/schemas.js'
-import {PartnersSession} from '../../services/context/partner-account-info.js'
 import {WebhooksConfig} from '../extensions/specifications/types/app_config_webhook.js'
 import {PaymentsAppExtensionConfigType} from '../extensions/specifications/payments_app_extension.js'
 import {
@@ -79,6 +78,7 @@ import {AppProxySpecIdentifier} from '../extensions/specifications/app_config_ap
 import {ExtensionSpecification} from '../extensions/specification.js'
 import {AppLogsOptions} from '../../services/app-logs/utils.js'
 import {AppLogsSubscribeMutationVariables} from '../../api/graphql/app-management/generated/app-logs-subscribe.js'
+import {Session} from '@shopify/cli-kit/node/session'
 import {vi} from 'vitest'
 import {joinPath} from '@shopify/cli-kit/node/path'
 
@@ -1223,7 +1223,7 @@ export const testRemoteExtensionTemplates: ExtensionTemplate[] = [
   themeAppExtensionTemplate,
 ]
 
-export const testPartnersUserSession: PartnersSession = {
+export const testPartnersUserSession: Session = {
   token: 'token',
   businessPlatformToken: 'businessPlatformToken',
   accountInfo: {
@@ -1520,7 +1520,7 @@ export function testDeveloperPlatformClient(stubs: Partial<DeveloperPlatformClie
   return retVal as DeveloperPlatformClient
 }
 
-export const testPartnersServiceSession: PartnersSession = {
+export const testPartnersServiceSession: Session = {
   token: 'partnersToken',
   businessPlatformToken: 'businessPlatformToken',
   accountInfo: {

packages/app/src/cli/models/app/loader.test.ts

@@ -298,6 +298,7 @@ wrong = "property"
     await writeConfig(appConfiguration)
     const pnpmLockPath = joinPath(tmpDir, pnpmLockfile)
     await writeFile(pnpmLockPath, '')
+    vi.mocked(captureOutput).mockResolvedValue(tmpDir)
 
     // When
     const app = await loadTestingApp()

packages/app/src/cli/services/context.test.ts

@@ -9,7 +9,6 @@ import link from './app/config/link.js'
 import {fetchSpecifications} from './generate/fetch-extension-specifications.js'
 import * as patchAppConfigurationFileModule from './app/patch-app-configuration-file.js'
 import {DeployOptions} from './deploy.js'
-import {isServiceAccount, isUserAccount} from './context/partner-account-info.js'
 import {
   MinimalAppIdentifiers,
   Organization,
@@ -36,6 +35,7 @@ import {
   selectDeveloperPlatformClient,
 } from '../utilities/developer-platform-client.js'
 import {RemoteAwareExtensionSpecification} from '../models/extensions/specification.js'
+import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session'
 import {afterEach, beforeAll, beforeEach, describe, expect, test, vi} from 'vitest'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {mockAndCaptureOutput} from '@shopify/cli-kit/node/testing/output'
@@ -138,6 +138,7 @@ vi.mock('@shopify/cli-kit/node/ui')
 vi.mock('./deploy/mode.js')
 vi.mock('./app/config/link.js')
 vi.mock('./context/partner-account-info.js')
+vi.mock('@shopify/cli-kit/node/session')
 vi.mock('./generate/fetch-extension-specifications.js')
 vi.mock('./app/select-app.js')
 vi.mock('../utilities/developer-platform-client.js')

packages/app/src/cli/services/context.ts

@@ -5,7 +5,6 @@ import {createExtension} from './dev/create-extension.js'
 import {CachedAppInfo} from './local-storage.js'
 import {setAppConfigValue, unsetAppConfigValue} from './app/patch-app-configuration-file.js'
 import {DeployOptions} from './deploy.js'
-import {isServiceAccount, isUserAccount} from './context/partner-account-info.js'
 import {formatConfigInfoBody} from './format-config-info-body.js'
 import {selectOrganizationPrompt} from '../prompts/dev.js'
 import {AppInterface, CurrentAppConfiguration, AppLinkedInterface} from '../models/app/app.js'
@@ -26,6 +25,7 @@ import {
   DeveloperPlatformClient,
   selectDeveloperPlatformClient,
 } from '../utilities/developer-platform-client.js'
+import {isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session'
 import {tryParseInt} from '@shopify/cli-kit/common/string'
 import {Token, renderConfirmationPrompt, renderInfo, renderWarning} from '@shopify/cli-kit/node/ui'
 import {AbortError} from '@shopify/cli-kit/node/error'

packages/app/src/cli/services/context/partner-account-info.test.ts

@@ -1,7 +1,8 @@
-import {AccountInfo, fetchCurrentAccountInformation} from './partner-account-info.js'
+import {fetchCurrentAccountInformation} from './partner-account-info.js'
 import {testDeveloperPlatformClient} from '../../models/app/app.test-data.js'
 import {getCurrentAccountInfo} from '../../api/graphql/current_account_info.js'
 import {clearCachedAccountInfo, getCachedAccountInfo, setCachedAccountInfo} from '../../utilities/app-conf-store.js'
+import {AccountInfo} from '@shopify/cli-kit/node/session'
 import {beforeEach, describe, expect, test, vi} from 'vitest'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputDebug} from '@shopify/cli-kit/node/output'

packages/app/src/cli/services/context/partner-account-info.ts

@@ -2,37 +2,7 @@ import {getCurrentAccountInfo} from '../../api/graphql/current_account_info.js'
 import {getCachedAccountInfo, setCachedAccountInfo} from '../../utilities/app-conf-store.js'
 import {DeveloperPlatformClient} from '../../utilities/developer-platform-client.js'
 import {outputDebug} from '@shopify/cli-kit/node/output'
-
-export interface PartnersSession {
-  token: string
-  businessPlatformToken: string
-  accountInfo: AccountInfo
-  userId: string
-}
-
-export type AccountInfo = UserAccountInfo | ServiceAccountInfo | UnknownAccountInfo
-
-interface UserAccountInfo {
-  type: 'UserAccount'
-  email: string
-}
-
-interface ServiceAccountInfo {
-  type: 'ServiceAccount'
-  orgName: string
-}
-
-interface UnknownAccountInfo {
-  type: 'UnknownAccount'
-}
-
-export function isUserAccount(account: AccountInfo): account is UserAccountInfo {
-  return account.type === 'UserAccount'
-}
-
-export function isServiceAccount(account: AccountInfo): account is ServiceAccountInfo {
-  return account.type === 'ServiceAccount'
-}
+import {AccountInfo} from '@shopify/cli-kit/node/session'
 
 export async function fetchCurrentAccountInformation(
   developerPlatformClient: DeveloperPlatformClient,

packages/app/src/cli/services/dev/fetch.ts

@@ -1,16 +1,12 @@
 import {Organization, OrganizationStore} from '../../models/organization.js'
 import {FindAppPreviewModeSchema} from '../../api/graphql/find_app_preview_mode.js'
-import {
-  AccountInfo,
-  fetchCurrentAccountInformation,
-  isServiceAccount,
-  isUserAccount,
-} from '../context/partner-account-info.js'
+import {fetchCurrentAccountInformation} from '../context/partner-account-info.js'
 import {
   DeveloperPlatformClient,
   allDeveloperPlatformClients,
   selectDeveloperPlatformClient,
 } from '../../utilities/developer-platform-client.js'
+import {AccountInfo, isServiceAccount, isUserAccount} from '@shopify/cli-kit/node/session'
 import {AbortError} from '@shopify/cli-kit/node/error'
 import {outputContent, outputToken} from '@shopify/cli-kit/node/output'