allow for registering devices when build app for internal distribution

expo · Apr 16, 2021 · 3ec4aad · 3ec4aad
1 parent 5ae6180
commit 3ec4aad
Show file tree

Hide file tree

Showing 4 changed files with 62 additions and 21 deletions.
diff --git a/packages/eas-cli/src/credentials/ios/actions/new/SetupAdhocProvisioningProfile.ts b/packages/eas-cli/src/credentials/ios/actions/new/SetupAdhocProvisioningProfile.ts
@@ -1,16 +1,19 @@
 import assert from 'assert';
+import chalk from 'chalk';
 import differenceBy from 'lodash/differenceBy';
 import isEqual from 'lodash/isEqual';
 import nullthrows from 'nullthrows';
 
+import DeviceCreateAction, { RegistrationMethod } from '../../../../devices/actions/create/action';
 import {
+  AppleDeviceFragment,
   AppleProvisioningProfileFragment,
   AppleTeamFragment,
   IosAppBuildCredentialsFragment,
   IosDistributionType,
 } from '../../../../graphql/generated';
 import Log from '../../../../log';
-import { confirmAsync } from '../../../../prompts';
+import { confirmAsync, pressAnyKeyToContinueAsync } from '../../../../prompts';
 import { Context } from '../../../context';
 import { AppLookupParams } from '../../api/GraphqlClient';
 import { MissingCredentialsNonInteractiveError } from '../../errors';
@@ -64,16 +67,18 @@ export class SetupAdhocProvisioningProfile {
     assert(appleTeam, 'Apple Team must be defined here');
 
     // 2. Fetch devices registered on EAS servers
-    const registeredAppleDevices = await ctx.newIos.getDevicesForAppleTeamAsync(
-      this.app,
-      appleTeam
-    );
-    const registeredAppleDeviceIdentifiers = registeredAppleDevices.map(
-      ({ identifier }) => identifier
-    );
-    if (registeredAppleDeviceIdentifiers.length === 0) {
-      // TODO: implement device registration
-      throw new Error(`Run 'eas device:create' to register your devices first`);
+    let registeredAppleDevices = await ctx.newIos.getDevicesForAppleTeamAsync(this.app, appleTeam);
+    if (registeredAppleDevices.length === 0) {
+      const shouldRegisterDevices = await confirmAsync({
+        message: `You don't have any registered devices yet. Would you like to register them now?`,
+        initial: true,
+      });
+
+      if (shouldRegisterDevices) {
+        registeredAppleDevices = await this.registerDevicesAsync(ctx, appleTeam);
+      } else {
+        throw new Error(`Run 'eas device:create' to register your devices first`);
+      }
     }
 
     // 3. Choose devices for internal distribution
@@ -182,6 +187,36 @@ export class SetupAdhocProvisioningProfile {
       }));
     }
   }
+
+  private async registerDevicesAsync(
+    ctx: Context,
+    appleTeam: AppleTeamFragment
+  ): Promise<AppleDeviceFragment[]> {
+    const action = new DeviceCreateAction(this.app.account, appleTeam);
+    const method = await action.runAsync();
+
+    while (true) {
+      if (method !== RegistrationMethod.INPUT) {
+        Log.newLine();
+        Log.log(chalk.bold("Press any key if you've already finished device registration."));
+        await pressAnyKeyToContinueAsync();
+      }
+      Log.newLine();
+
+      const devices = await ctx.newIos.getDevicesForAppleTeamAsync(this.app, appleTeam, {
+        useCache: false,
+      });
+      if (devices.length === 0) {
+        Log.warn('There are still no registered devices.');
+        // if the user used the input method there should be some devices available
+        if (method === RegistrationMethod.INPUT) {
+          throw new Error('Input registration method has failed');
+        }
+      } else {
+        return devices;
+      }
+    }
+  }
 }
 
 function doUDIDsMatch(udidsA: string[], udidsB: string[]): boolean {

diff --git a/packages/eas-cli/src/credentials/ios/api/GraphqlClient.ts b/packages/eas-cli/src/credentials/ios/api/GraphqlClient.ts
@@ -3,6 +3,7 @@ import nullthrows from 'nullthrows';
 import {
   AppFragment,
   AppleAppIdentifierFragment,
+  AppleDeviceFragment,
   AppleDistributionCertificateFragment,
   AppleTeamFragment,
   CommonIosAppCredentialsFragment,
@@ -26,10 +27,7 @@ import { IosAppBuildCredentialsMutation } from './graphql/mutations/IosAppBuildC
 import { IosAppCredentialsMutation } from './graphql/mutations/IosAppCredentialsMutation';
 import { AppQuery } from './graphql/queries/AppQuery';
 import { AppleAppIdentifierQuery } from './graphql/queries/AppleAppIdentifierQuery';
-import {
-  AppleDeviceFragmentWithAppleTeam,
-  AppleDeviceQuery,
-} from './graphql/queries/AppleDeviceQuery';
+import { AppleDeviceQuery } from './graphql/queries/AppleDeviceQuery';
 import { AppleDistributionCertificateQuery } from './graphql/queries/AppleDistributionCertificateQuery';
 import {
   AppleProvisioningProfileQuery,
@@ -215,9 +213,12 @@ export async function createOrGetExistingAppleAppIdentifierAsync(
 
 export async function getDevicesForAppleTeamAsync(
   { account }: AppLookupParams,
-  { appleTeamIdentifier }: AppleTeamFragment
-): Promise<AppleDeviceFragmentWithAppleTeam[]> {
-  return await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(account.id, appleTeamIdentifier);
+  { appleTeamIdentifier }: AppleTeamFragment,
+  { useCache = true }: { useCache?: boolean } = {}
+): Promise<AppleDeviceFragment[]> {
+  return await AppleDeviceQuery.getAllByAppleTeamIdentifierAsync(account.id, appleTeamIdentifier, {
+    useCache,
+  });
 }
 
 export async function createProvisioningProfileAsync(

diff --git a/packages/eas-cli/src/credentials/ios/api/graphql/queries/AppleDeviceQuery.ts b/packages/eas-cli/src/credentials/ios/api/graphql/queries/AppleDeviceQuery.ts
@@ -34,7 +34,8 @@ export type AppleDevicesByIdentifierQueryResult = AppleDeviceQueryResult & {
 const AppleDeviceQuery = {
   async getAllByAppleTeamIdentifierAsync(
     accountId: string,
-    appleTeamIdentifier: string
+    appleTeamIdentifier: string,
+    { useCache = true }: { useCache?: boolean } = {}
   ): Promise<AppleDeviceFragmentWithAppleTeam[]> {
     const data = await withErrorHandlingAsync(
       graphqlClient
@@ -63,7 +64,10 @@ const AppleDeviceQuery = {
             accountId,
             appleTeamIdentifier,
           },
-          { additionalTypenames: ['AppleDevice'] }
+          {
+            additionalTypenames: ['AppleDevice'],
+            requestPolicy: useCache ? 'cache-first' : 'network-only',
+          }
         )
         .toPromise()
     );

diff --git a/packages/eas-cli/src/devices/actions/create/action.ts b/packages/eas-cli/src/devices/actions/create/action.ts
@@ -19,7 +19,7 @@ export default class DeviceCreateAction {
     private appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>
   ) {}
 
-  public async runAsync(): Promise<void> {
+  public async runAsync(): Promise<RegistrationMethod> {
     const method = await this.askForRegistrationMethodAsync();
     if (method === RegistrationMethod.WEBSITE) {
       await runRegistrationUrlMethodAsync(this.account.id, this.appleTeam);
@@ -29,6 +29,7 @@ export default class DeviceCreateAction {
       Log.log('Bye!');
       process.exit(0);
     }
+    return method;
   }
 
   private async askForRegistrationMethodAsync(): Promise<RegistrationMethod> {