[eas-cli] unify channel graphql query types

2026-11-14 10:08:06 -10:00 · 2023-07-24 20:14:42 -07:00
8 changed files with 119 additions and 184 deletions
@@ -2572,18 +2572,6 @@
        "name": "AccountSSOConfiguration",
        "description": "Auth configuration data for an SSO account.",
        "fields": [
-          {
-            "name": "authEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "authProtocol",
            "description": null,
@@ -2664,18 +2652,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "endSessionEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "id",
            "description": null,
@@ -2708,42 +2684,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "jwksEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "revokeEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "tokenEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "updatedAt",
            "description": null,
@@ -2759,18 +2699,6 @@
            },
            "isDeprecated": false,
            "deprecationReason": null
-          },
-          {
-            "name": "userInfoEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
          }
        ],
        "inputFields": null,
@@ -3088,18 +3016,6 @@
        "name": "AccountSSOConfigurationPublicData",
        "description": "Public auth configuration data for an SSO account.",
        "fields": [
-          {
-            "name": "authEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "authProtocol",
            "description": null,
@@ -3133,7 +3049,7 @@
            "deprecationReason": null
          },
          {
-            "name": "clientIdentifier",
+            "name": "authorizationUrl",
            "description": null,
            "args": [],
            "type": {
@@ -3148,18 +3064,6 @@
            "isDeprecated": false,
            "deprecationReason": null
          },
-          {
-            "name": "endSessionEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
          {
            "name": "id",
            "description": null,
@@ -3191,54 +3095,6 @@
            },
            "isDeprecated": false,
            "deprecationReason": null
-          },
-          {
-            "name": "jwksEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "revokeEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "tokenEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
-          },
-          {
-            "name": "userInfoEndpoint",
-            "description": null,
-            "args": [],
-            "type": {
-              "kind": "SCALAR",
-              "name": "String",
-              "ofType": null
-            },
-            "isDeprecated": false,
-            "deprecationReason": null
          }
        ],
        "inputFields": null,
@@ -1,4 +1,5 @@
 import chalk from 'chalk';
+import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
@@ -12,6 +13,7 @@ import {
 } from '../graphql/generated';
 import { BranchQuery, UpdateBranchOnChannelObject } from '../graphql/queries/BranchQuery';
 import { ChannelQuery, UpdateChannelObject } from '../graphql/queries/ChannelQuery';
+import { UpdateChannelBasicInfoFragmentNode } from '../graphql/types/UpdateChannelBasicInfo';
 import Log from '../log';
 import formatFields from '../utils/formatFields';
 import { printJsonOnlyOutput } from '../utils/json';
@@ -227,11 +229,11 @@ export async function createChannelOnAppAsync(
            updateChannel {
              createUpdateChannelForApp(appId: $appId, name: $name, branchMapping: $branchMapping) {
                id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
              }
            }
          }
+          ${print(UpdateChannelBasicInfoFragmentNode)}
        `,
        {
          appId,
@@ -1,5 +1,6 @@
 import { Flags } from '@oclif/core';
 import chalk from 'chalk';
+import { print } from 'graphql';
 import gql from 'graphql-tag';

 import { selectBranchOnAppAsync } from '../../branch/queries';
@@ -9,18 +10,20 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { withErrorHandlingAsync } from '../../graphql/client';
 import {
+  UpdateChannelBasicInfoFragment,
  UpdateChannelBranchMappingMutation,
  UpdateChannelBranchMappingMutationVariables,
 } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
 import { ChannelQuery } from '../../graphql/queries/ChannelQuery';
+import { UpdateChannelBasicInfoFragmentNode } from '../../graphql/types/UpdateChannelBasicInfo';
 import Log from '../../log';
 import { enableJsonOutput, printJsonOnlyOutput } from '../../utils/json';

 export async function updateChannelBranchMappingAsync(
  graphqlClient: ExpoGraphqlClient,
  { channelId, branchMapping }: UpdateChannelBranchMappingMutationVariables
-): Promise<UpdateChannelBranchMappingMutation['updateChannel']['editUpdateChannel']> {
+): Promise<UpdateChannelBasicInfoFragment> {
  const data = await withErrorHandlingAsync(
    graphqlClient
      .mutation<UpdateChannelBranchMappingMutation, UpdateChannelBranchMappingMutationVariables>(
@@ -29,11 +32,11 @@ export async function updateChannelBranchMappingAsync(
            updateChannel {
              editUpdateChannel(channelId: $channelId, branchMapping: $branchMapping) {
                id
-                name
-                branchMapping
+                ...UpdateChannelBasicInfoFragment
              }
            }
          }
+          ${print(UpdateChannelBasicInfoFragmentNode)}
        `,
        { channelId, branchMapping }
      )
@@ -15,7 +15,7 @@ import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/creat
 import { EasNonInteractiveAndJsonFlags } from '../../commandUtils/flags';
 import { UpdateBranch } from '../../graphql/generated';
 import { BranchQuery } from '../../graphql/queries/BranchQuery';
-import { ChannelQuery, UpdateChannelByNameObject } from '../../graphql/queries/ChannelQuery';
+import { ChannelQuery, UpdateChannelObject } from '../../graphql/queries/ChannelQuery';
 import Log from '../../log';
 import { getDisplayNameForProjectIdAsync } from '../../project/projectUtils';
 import { promptAsync, selectAsync } from '../../prompts';
@@ -45,7 +45,7 @@ async function promptForRolloutPercentAsync({
  return rolloutPercent;
 }

-function getRolloutInfo(channel: UpdateChannelByNameObject): {
+function getRolloutInfo(channel: UpdateChannelObject): {
  newBranch: Pick<UpdateBranch, 'name' | 'id'>;
  oldBranch: Pick<UpdateBranch, 'name' | 'id'>;
  currentPercent: number;
@@ -84,7 +84,7 @@ async function startRolloutAsync(
    projectId: string;
    displayName: string;
    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
    nonInteractive: boolean;
  }
 ): Promise<{
@@ -165,7 +165,7 @@ async function editRolloutAsync(
    percent?: number;
    nonInteractive: boolean;
    currentBranchMapping: BranchMapping;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
  }
 ): Promise<{
  newChannelInfo: {
@@ -223,7 +223,7 @@ async function endRolloutAsync(
    branchName?: string;
    nonInteractive: boolean;
    projectId: string;
-    channel: UpdateChannelByNameObject;
+    channel: UpdateChannelObject;
  }
 ): Promise<{
  newChannelInfo: {
@@ -468,20 +468,14 @@ export type AccountQueryByNameArgs = {
 /** Auth configuration data for an SSO account. */
 export type AccountSsoConfiguration = {
  __typename?: 'AccountSSOConfiguration';
-  authEndpoint?: Maybe<Scalars['String']>;
  authProtocol: AuthProtocolType;
  authProviderIdentifier: Scalars['String'];
  clientIdentifier: Scalars['String'];
  clientSecret: Scalars['String'];
  createdAt: Scalars['DateTime'];
-  endSessionEndpoint?: Maybe<Scalars['String']>;
  id: Scalars['ID'];
  issuer: Scalars['String'];
-  jwksEndpoint?: Maybe<Scalars['String']>;
-  revokeEndpoint?: Maybe<Scalars['String']>;
-  tokenEndpoint?: Maybe<Scalars['String']>;
  updatedAt: Scalars['DateTime'];
-  userInfoEndpoint?: Maybe<Scalars['String']>;
 };

 export type AccountSsoConfigurationData = {
@@ -528,17 +522,11 @@ export type AccountSsoConfigurationMutationUpdateAccountSsoConfigurationArgs = {
 /** Public auth configuration data for an SSO account. */
 export type AccountSsoConfigurationPublicData = {
  __typename?: 'AccountSSOConfigurationPublicData';
-  authEndpoint?: Maybe<Scalars['String']>;
  authProtocol: AuthProtocolType;
  authProviderIdentifier: Scalars['String'];
-  clientIdentifier: Scalars['String'];
-  endSessionEndpoint?: Maybe<Scalars['String']>;
+  authorizationUrl: Scalars['String'];
  id: Scalars['ID'];
  issuer: Scalars['String'];
-  jwksEndpoint?: Maybe<Scalars['String']>;
-  revokeEndpoint?: Maybe<Scalars['String']>;
-  tokenEndpoint?: Maybe<Scalars['String']>;
-  userInfoEndpoint?: Maybe<Scalars['String']>;
 };

 export type AccountSsoConfigurationPublicDataQuery = {
@@ -6197,7 +6185,16 @@ export type ViewUpdateChannelsOnAppQueryVariables = Exact<{
 }>;


-export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
+export type ViewUpdateChannelsOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, updateChannels: Array<{ __typename?: 'UpdateChannel', id: string, name: string, createdAt: any, branchMapping: string, updateBranches: Array<{ __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> }> }> } } };
+
+export type ViewUpdateChannelsPaginatedOnAppQueryVariables = Exact<{
+  appId: Scalars['String'];
+  first?: InputMaybe<Scalars['Int']>;
+  after?: InputMaybe<Scalars['String']>;
+}>;
+
+
+export type ViewUpdateChannelsPaginatedOnAppQuery = { __typename?: 'RootQuery', app: { __typename?: 'AppQuery', byId: { __typename?: 'App', id: string, channelsPaginated: { __typename?: 'AppChannelsConnection', edges: Array<{ __typename?: 'AppChannelEdge', node: { __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string } }>, pageInfo: { __typename?: 'PageInfo', hasNextPage: boolean, hasPreviousPage: boolean, startCursor?: string | null, endCursor?: string | null } } } } };

 export type EnvironmentSecretsByAppIdQueryVariables = Exact<{
  appId: Scalars['String'];
@@ -6311,6 +6308,10 @@ export type UpdateFragment = { __typename?: 'Update', id: string, group: string,

 export type UpdateBranchFragment = { __typename?: 'UpdateBranch', id: string, name: string, updates: Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }> };

+export type UpdateBranchWithCurrentGroupFragment = { __typename?: 'UpdateBranch', id: string, name: string, updateGroups: Array<Array<{ __typename?: 'Update', id: string, group: string, message?: string | null, createdAt: any, runtimeVersion: string, platform: string, manifestFragment: string, isRollBackToEmbedded: boolean, manifestPermalink: string, gitCommitHash?: string | null, actor?: { __typename: 'Robot', firstName?: string | null, id: string } | { __typename: 'SSOUser', username: string, id: string } | { __typename: 'User', username: string, id: string } | null, branch: { __typename?: 'UpdateBranch', id: string, name: string }, codeSigningInfo?: { __typename?: 'CodeSigningInfo', keyid: string, sig: string, alg: string } | null }>> };
+
+export type UpdateChannelBasicInfoFragment = { __typename?: 'UpdateChannel', id: string, name: string, branchMapping: string };
+
 export type WebhookFragment = { __typename?: 'Webhook', id: string, event: WebhookType, url: string, createdAt: any, updatedAt: any };

 export type AndroidAppBuildCredentialsFragment = { __typename?: 'AndroidAppBuildCredentials', id: string, isDefault: boolean, isLegacy: boolean, name: string, androidKeystore?: { __typename?: 'AndroidKeystore', id: string, type: AndroidKeystoreType, keystore: string, keystorePassword: string, keyAlias: string, keyPassword?: string | null, md5CertificateFingerprint?: string | null, sha1CertificateFingerprint?: string | null, sha256CertificateFingerprint?: string | null, createdAt: any, updatedAt: any } | null };
@@ -5,21 +5,29 @@ import { ChannelNotFoundError } from '../../channel/errors';
 import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { withErrorHandlingAsync } from '../client';
 import {
+  PageInfo,
+  UpdateChannelBasicInfoFragment,
  ViewUpdateChannelOnAppQuery,
  ViewUpdateChannelOnAppQueryVariables,
  ViewUpdateChannelsOnAppQuery,
  ViewUpdateChannelsOnAppQueryVariables,
+  ViewUpdateChannelsPaginatedOnAppQuery,
+  ViewUpdateChannelsPaginatedOnAppQueryVariables,
 } from '../generated';
-import { UpdateFragmentNode } from '../types/Update';
+import { UpdateBranchWithCurrentGroupFragmentNode } from '../types/UpdateBranchWithCurrentUpdate';
+import { UpdateChannelBasicInfoFragmentNode } from '../types/UpdateChannelBasicInfo';

-export type UpdateChannelObject = NonNullable<
+type ViewUpdateChannelsOnAppObject = NonNullable<
  ViewUpdateChannelsOnAppQuery['app']['byId']['updateChannels']
 >[number];

-export type UpdateChannelByNameObject = NonNullable<
+type UpdateChannelByNameObject = NonNullable<
  ViewUpdateChannelOnAppQuery['app']['byId']['updateChannelByName']
 >;

+// these types should have the same fields
+export type UpdateChannelObject = ViewUpdateChannelsOnAppObject & UpdateChannelByNameObject;
+
 export const ChannelQuery = {
  async viewUpdateChannelAsync(
    graphqlClient: ExpoGraphqlClient,
@@ -40,17 +48,13 @@ export const ChannelQuery = {
                    branchMapping
                    updateBranches(offset: 0, limit: 5) {
                      id
-                      name
-                      updateGroups(offset: 0, limit: 1) {
-                        id
-                        ...UpdateFragment
-                      }
+                      ...UpdateBranchWithCurrentGroupFragment
                    }
                  }
                }
              }
            }
-            ${print(UpdateFragmentNode)}
+            ${print(UpdateBranchWithCurrentGroupFragmentNode)}
          `,
          { appId, channelName },
          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
@@ -80,20 +84,17 @@ export const ChannelQuery = {
                  updateChannels(offset: $offset, limit: $limit) {
                    id
                    name
+                    createdAt
                    branchMapping
                    updateBranches(offset: 0, limit: 5) {
                      id
-                      name
-                      updateGroups(offset: 0, limit: 1) {
-                        id
-                        ...UpdateFragment
-                      }
+                      ...UpdateBranchWithCurrentGroupFragment
                    }
                  }
                }
              }
            }
-            ${print(UpdateFragmentNode)}
+            ${print(UpdateBranchWithCurrentGroupFragmentNode)}
          `,
          { appId, offset, limit },
          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
@@ -108,4 +109,51 @@ export const ChannelQuery = {

    return updateChannels;
  },
+  async viewUpdateChannelsBasicInfoPaginatedOnAppAsync(
+    graphqlClient: ExpoGraphqlClient,
+    { appId, first, after }: ViewUpdateChannelsPaginatedOnAppQueryVariables
+  ): Promise<[UpdateChannelBasicInfoFragment[], PageInfo]> {
+    const response = await withErrorHandlingAsync(
+      graphqlClient
+        .query<
+          ViewUpdateChannelsPaginatedOnAppQuery,
+          ViewUpdateChannelsPaginatedOnAppQueryVariables
+        >(
+          gql`
+            query ViewUpdateChannelsPaginatedOnApp($appId: String!, $first: Int, $after: String) {
+              app {
+                byId(appId: $appId) {
+                  id
+                  channelsPaginated(first: $first, after: $after) {
+                    edges {
+                      node {
+                        id
+                        ...UpdateChannelBasicInfoFragment
+                      }
+                    }
+                    pageInfo {
+                      hasNextPage
+                      hasPreviousPage
+                      startCursor
+                      endCursor
+                    }
+                  }
+                }
+              }
+            }
+            ${print(UpdateChannelBasicInfoFragmentNode)}
+          `,
+          { appId, first, after },
+          { additionalTypenames: ['UpdateChannel', 'UpdateBranch', 'Update'] }
+        )
+        .toPromise()
+    );
+    const { channelsPaginated } = response.app.byId;
+
+    if (!channelsPaginated) {
+      throw new Error(`Could not find channels on project with id ${appId}`);
+    }
+
+    return [channelsPaginated.edges.map(edge => edge.node) ?? [], channelsPaginated.pageInfo];
+  },
 };
@@ -0,0 +1,16 @@
+import { print } from 'graphql';
+import gql from 'graphql-tag';
+
+import { UpdateFragmentNode } from './Update';
+
+export const UpdateBranchWithCurrentGroupFragmentNode = gql`
+  fragment UpdateBranchWithCurrentGroupFragment on UpdateBranch {
+    id
+    name
+    updateGroups(offset: 0, limit: 1) {
+      id
+      ...UpdateFragment
+    }
+  }
+  ${print(UpdateFragmentNode)}
+`;
@@ -0,0 +1,9 @@
+import gql from 'graphql-tag';
+
+export const UpdateChannelBasicInfoFragmentNode = gql`
+  fragment UpdateChannelBasicInfoFragment on UpdateChannel {
+    id
+    name
+    branchMapping
+  }
+`;