review feedback

expo · Aug 17, 2020 · 500304f · 500304f
1 parent b9027ec
commit 500304f
Show file tree

Hide file tree

Showing 13 changed files with 174 additions and 145 deletions.
diff --git a/packages/expo-cli/src/commands/eas-build/build/builders/__tests__/AndroidBuilder-test.ts b/packages/expo-cli/src/commands/eas-build/build/builders/__tests__/AndroidBuilder-test.ts
@@ -35,6 +35,16 @@ function setupCredentialsConfig() {
   });
 }
 
+const originalWarn = console.warn;
+const originalLog = console.log;
+beforeAll(() => {
+  console.warn = jest.fn();
+  console.log = jest.fn();
+});
+afterAll(() => {
+  console.warn = originalWarn;
+  console.log = originalLog;
+});
 beforeEach(() => {
   vol.reset();
 });

diff --git a/packages/expo-cli/src/commands/eas-build/build/builders/__tests__/iOSBuilder-test.ts b/packages/expo-cli/src/commands/eas-build/build/builders/__tests__/iOSBuilder-test.ts
@@ -40,6 +40,16 @@ function setupCredentialsConfig() {
   });
 }
 
+const originalWarn = console.warn;
+const originalLog = console.log;
+beforeAll(() => {
+  console.warn = jest.fn();
+  console.log = jest.fn();
+});
+afterAll(() => {
+  console.warn = originalWarn;
+  console.log = originalLog;
+});
 beforeEach(() => {
   vol.reset();
 });

diff --git a/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts b/packages/expo-cli/src/commands/eas-build/build/builders/iOSBuilder.ts
@@ -2,7 +2,6 @@ import { BuildType, Job, Platform, iOS, sanitizeJob } from '@expo/build-tools';
 import { IOSConfig } from '@expo/config';
 import chalk from 'chalk';
 import figures from 'figures';
-import once from 'lodash/once';
 import ora from 'ora';
 
 import iOSCredentialsProvider, {
@@ -16,10 +15,10 @@ import {
   iOSManagedBuildProfile,
 } from '../../../../easJson';
 import log from '../../../../log';
-import prompts from '../../../../prompts';
 import { ensureCredentialsAsync } from '../credentials';
 import { Builder, BuilderContext } from '../types';
 import * as gitUtils from '../utils/git';
+import { getBundleIdentifier } from '../utils/xcode';
 
 interface CommonJobProperties {
   platform: Platform.iOS;
@@ -83,7 +82,7 @@ class iOSBuilder implements Builder {
     if (!this.credentials) {
       throw new Error('Call ensureCredentialsAsync first!');
     }
-    const bundleIdentifier = await getBundleIdentifier(this.ctx);
+    const bundleIdentifier = await getBundleIdentifier(this.ctx.projectDir, this.ctx.exp);
 
     const spinner = ora('Making sure your iOS project is set up properly');
 
@@ -176,69 +175,5 @@ class iOSBuilder implements Builder {
     );
   }
 }
-const getBundleIdentifier = once(_getBundleIdentifier);
-
-async function _getBundleIdentifier(ctx: BuilderContext): Promise<string> {
-  const bundleIdentifierFromPbxproj = IOSConfig.BundleIdenitifer.getBundleIdentifierFromPbxproj(
-    ctx.projectDir
-  );
-  const bundleIdentifierFromConfig = IOSConfig.BundleIdenitifer.getBundleIdentifier(ctx.exp);
-  if (bundleIdentifierFromPbxproj !== null && bundleIdentifierFromConfig !== null) {
-    if (bundleIdentifierFromPbxproj === bundleIdentifierFromConfig) {
-      return bundleIdentifierFromPbxproj;
-    } else {
-      log.newLine();
-      log(
-        log.chalk.yellow(
-          `We detected that your Xcode project is configured with a different bundle identifier than the one defined in app.json/app.config.js.
-If you choose the one defined in app.json/app.config.js we'll automatically configure your Xcode project with it.
-However, if you choose the one defined in the Xcode project you'll have to update app.json/app.config.js on your own.
-Otherwise, you'll see this prompt again in the future.`
-        )
-      );
-      log.newLine();
-      const { bundleIdentifier } = await prompts({
-        type: 'select',
-        name: 'bundleIdentifier',
-        message: 'Which bundle identifier should we use?',
-        choices: [
-          {
-            title: `Defined in the Xcode project: ${log.chalk.bold(bundleIdentifierFromPbxproj)}`,
-            value: bundleIdentifierFromPbxproj,
-          },
-          {
-            title: `Defined in app.json/app.config.js: ${log.chalk.bold(
-              bundleIdentifierFromConfig
-            )}`,
-            value: bundleIdentifierFromConfig,
-          },
-        ],
-      });
-      return bundleIdentifier;
-    }
-  } else if (bundleIdentifierFromPbxproj === null && bundleIdentifierFromConfig === null) {
-    throw new Error('Please define "expo.ios.bundleIdentifier" in app.json/app.config.js');
-  } else {
-    if (bundleIdentifierFromPbxproj !== null) {
-      log(
-        `Using ${log.chalk.bold(
-          bundleIdentifierFromPbxproj
-        )} as the bundle identifier (read from the Xcode project).`
-      );
-      return bundleIdentifierFromPbxproj;
-    } else {
-      // bundleIdentifierFromConfig is never null in this case
-      // the following line is to satisfy TS
-      const bundleIdentifier = bundleIdentifierFromConfig ?? '';
-      log(
-        `Using ${log.chalk.bold(
-          bundleIdentifier
-        )} as the bundle identifier (read from app.json/app.config.js).
-We'll automatically configure your Xcode project using this value.`
-      );
-      return bundleIdentifier;
-    }
-  }
-}
 
 export default iOSBuilder;
diff --git a/packages/expo-cli/src/commands/eas-build/build/utils/xcode.ts b/packages/expo-cli/src/commands/eas-build/build/utils/xcode.ts
@@ -0,0 +1,70 @@
+import { ExpoConfig, IOSConfig } from '@expo/config';
+import once from 'lodash/once';
+
+import log from '../../../../log';
+import prompts from '../../../../prompts';
+
+export const getBundleIdentifier = once(_getBundleIdentifier);
+
+async function _getBundleIdentifier(projectDir: string, manifest: ExpoConfig): Promise<string> {
+  const bundleIdentifierFromPbxproj = IOSConfig.BundleIdenitifer.getBundleIdentifierFromPbxproj(
+    projectDir
+  );
+  const bundleIdentifierFromConfig = IOSConfig.BundleIdenitifer.getBundleIdentifier(manifest);
+  if (bundleIdentifierFromPbxproj !== null && bundleIdentifierFromConfig !== null) {
+    if (bundleIdentifierFromPbxproj === bundleIdentifierFromConfig) {
+      return bundleIdentifierFromPbxproj;
+    } else {
+      log.newLine();
+      log(
+        log.chalk.yellow(
+          `We detected that your Xcode project is configured with a different bundle identifier than the one defined in app.json/app.config.js.
+If you choose the one defined in app.json/app.config.js we'll automatically configure your Xcode project with it.
+However, if you choose the one defined in the Xcode project you'll have to update app.json/app.config.js on your own.
+Otherwise, you'll see this prompt again in the future.`
+        )
+      );
+      log.newLine();
+      const { bundleIdentifier } = await prompts({
+        type: 'select',
+        name: 'bundleIdentifier',
+        message: 'Which bundle identifier should we use?',
+        choices: [
+          {
+            title: `Defined in the Xcode project: ${log.chalk.bold(bundleIdentifierFromPbxproj)}`,
+            value: bundleIdentifierFromPbxproj,
+          },
+          {
+            title: `Defined in app.json/app.config.js: ${log.chalk.bold(
+              bundleIdentifierFromConfig
+            )}`,
+            value: bundleIdentifierFromConfig,
+          },
+        ],
+      });
+      return bundleIdentifier;
+    }
+  } else if (bundleIdentifierFromPbxproj === null && bundleIdentifierFromConfig === null) {
+    throw new Error('Please define "expo.ios.bundleIdentifier" in app.json/app.config.js');
+  } else {
+    if (bundleIdentifierFromPbxproj !== null) {
+      log(
+        `Using ${log.chalk.bold(
+          bundleIdentifierFromPbxproj
+        )} as the bundle identifier (read from the Xcode project).`
+      );
+      return bundleIdentifierFromPbxproj;
+    } else {
+      // bundleIdentifierFromConfig is never null in this case
+      // the following line is to satisfy TS
+      const bundleIdentifier = bundleIdentifierFromConfig ?? '';
+      log(
+        `Using ${log.chalk.bold(
+          bundleIdentifier
+        )} as the bundle identifier (read from app.json/app.config.js).
+We'll automatically configure your Xcode project using this value.`
+      );
+      return bundleIdentifier;
+    }
+  }
+}
diff --git a/packages/expo-cli/src/commands/eas-build/credentialsSync/action.ts b/packages/expo-cli/src/commands/eas-build/credentialsSync/action.ts
@@ -1,10 +1,12 @@
 import CommandError from '../../../CommandError';
 import { Context } from '../../../credentials/context';
-import { updateLocalCredentialsJsonAsync } from '../../../credentials/local';
+import * as credentialsJson from '../../../credentials/credentialsJson/update';
 import { runCredentialsManager } from '../../../credentials/route';
 import { SetupAndroidBuildCredentialsFromLocal } from '../../../credentials/views/SetupAndroidKeystore';
 import { SetupIosBuildCredentialsFromLocal } from '../../../credentials/views/SetupIosBuildCredentials';
+import log from '../../../log';
 import prompts from '../../../prompts';
+import { getBundleIdentifier } from '../build/utils/xcode';
 import { BuildCommandPlatform } from '../types';
 
 interface Options {
@@ -24,31 +26,37 @@ export default async function credentialsSyncAction(projectDir: string, options:
       message: 'What do you want to do?',
       choices: [
         {
-          title: 'Update credentials on Expo servers with local credentials.json content',
+          title: 'Update credentials on the Expo servers with local credentials.json contents',
           value: 'remote',
         },
-        { title: 'Update local credentials.json with values from Expo servers', value: 'local' },
+        {
+          title: 'Update or create local credentials.json with credentials from Expo servers',
+          value: 'local',
+        },
       ],
     },
     {
       type: 'select',
       name: 'platform',
-      message: 'Do you want to update credentials for both platforms?',
+      message: 'Which platform would you like to update?',
       choices: [
-        { title: 'Android & iOS', value: BuildCommandPlatform.ALL },
-        { title: 'only Android', value: BuildCommandPlatform.ANDROID },
-        { title: 'only iOS', value: BuildCommandPlatform.IOS },
+        { title: 'Android', value: BuildCommandPlatform.ANDROID },
+        { title: 'iOS', value: BuildCommandPlatform.IOS },
+        { title: 'both', value: BuildCommandPlatform.ALL },
       ],
     },
   ]);
   if (update === 'local') {
-    await updateLocalCredentialsJsonAsync(projectDir, platform);
+    await updateLocalCredentialsAsync(projectDir, platform);
   } else {
     await updateRemoteCredentialsAsync(projectDir, platform);
   }
 }
 
-async function updateRemoteCredentialsAsync(projectDir: string, platform: BuildCommandPlatform) {
+async function updateRemoteCredentialsAsync(
+  projectDir: string,
+  platform: BuildCommandPlatform
+): Promise<void> {
   const ctx = new Context();
   await ctx.init(projectDir);
   if (!ctx.hasProjectContext) {
@@ -59,10 +67,7 @@ async function updateRemoteCredentialsAsync(projectDir: string, platform: BuildC
     await runCredentialsManager(ctx, new SetupAndroidBuildCredentialsFromLocal(experienceName));
   }
   if (['all', 'ios'].includes(platform)) {
-    const bundleIdentifier = ctx.manifest.ios?.bundleIdentifier;
-    if (!bundleIdentifier) {
-      throw new Error('"expo.ios.bundleIdentifier" field is required in your app.json');
-    }
+    const bundleIdentifier = await getBundleIdentifier(projectDir, ctx.manifest);
     const appLookupParams = {
       accountName: ctx.manifest.owner ?? ctx.user.username,
       projectName: ctx.manifest.slug,
@@ -71,3 +76,23 @@ async function updateRemoteCredentialsAsync(projectDir: string, platform: BuildC
     await runCredentialsManager(ctx, new SetupIosBuildCredentialsFromLocal(appLookupParams));
   }
 }
+
+export async function updateLocalCredentialsAsync(
+  projectDir: string,
+  platform: BuildCommandPlatform
+): Promise<void> {
+  const ctx = new Context();
+  await ctx.init(projectDir);
+  if (!ctx.hasProjectContext) {
+    throw new Error('project context is required'); // should be checked earlier
+  }
+  if ([BuildCommandPlatform.ALL, BuildCommandPlatform.ANDROID].includes(platform)) {
+    log('Updating Android credentials in credentials.json');
+    await credentialsJson.updateAndroidCredentialsAsync(ctx);
+  }
+  if ([BuildCommandPlatform.ALL, BuildCommandPlatform.IOS].includes(platform)) {
+    const bundleIdentifier = await getBundleIdentifier(projectDir, ctx.manifest);
+    log('Updating iOS credentials in credentials.json');
+    await credentialsJson.updateIosCredentialsAsync(ctx, bundleIdentifier);
+  }
+}