eas-cli 2.1.0 → 2.2.0

package/build/commands/update/view.js

@@ -1,72 +1,38 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.viewUpdateAsync = void 0;
 const tslib_1 = require("tslib");
-const core_1 = require("@oclif/core");
+const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const cli_table3_1 = tslib_1.__importDefault(require("cli-table3"));
-const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const client_1 = require("../../graphql/client");
+const flags_1 = require("../../commandUtils/flags");
+const UpdateQuery_1 = require("../../graphql/queries/UpdateQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const utils_1 = require("../../update/utils");
+const formatFields_1 = tslib_1.__importDefault(require("../../utils/formatFields"));
 const json_1 = require("../../utils/json");
-async function viewUpdateAsync({ groupId, }) {
-    const data = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
-        .query((0, graphql_tag_1.default) `
-          query UpdatesByGroup($groupId: ID!) {
-            updatesByGroup(group: $groupId) {
-              id
-              group
-              runtimeVersion
-              platform
-              message
-              actor {
-                id
-                ... on User {
-                  username
-                }
-                ... on Robot {
-                  firstName
-                }
-              }
-              createdAt
-            }
-          }
-        `, {
-        groupId,
-    }, { additionalTypenames: ['Update'] })
-        .toPromise());
-    if (data.updatesByGroup.length === 0) {
-        throw new Error(`Could not find any updates with group ID: "${groupId}"`);
-    }
-    return data;
-}
-exports.viewUpdateAsync = viewUpdateAsync;
 class UpdateView extends EasCommand_1.default {
     async runAsync() {
-        var _a;
         const { args: { groupId }, flags: { json: jsonFlag }, } = await this.parse(UpdateView);
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const { updatesByGroup } = await viewUpdateAsync({ groupId });
+        const updatesByGroup = await UpdateQuery_1.UpdateQuery.viewUpdateGroupAsync({ groupId });
+        const [updateGroupDescription] = (0, utils_1.getUpdateGroupDescriptions)([updatesByGroup]);
         if (jsonFlag) {
-            (0, json_1.printJsonOnlyOutput)(updatesByGroup);
+            (0, json_1.printJsonOnlyOutput)(updateGroupDescription);
         }
         else {
             const groupTable = new cli_table3_1.default({
                 head: [...utils_1.UPDATE_COLUMNS],
                 wordWrap: true,
             });
-            const representativeUpdate = updatesByGroup[0];
+            log_1.default.log(chalk_1.default.bold('Update group:'));
+            log_1.default.log((0, formatFields_1.default)([{ label: 'ID', value: updateGroupDescription.group }]));
             groupTable.push([
-                (0, utils_1.formatUpdate)(representativeUpdate),
-                representativeUpdate.runtimeVersion,
-                representativeUpdate.group,
-                (0, utils_1.getPlatformsForGroup)({
-                    updates: updatesByGroup,
-                    group: (_a = updatesByGroup[0]) === null || _a === void 0 ? void 0 : _a.group,
-                }),
+                updateGroupDescription.message,
+                updateGroupDescription.runtimeVersion,
+                updateGroupDescription.group,
+                updateGroupDescription.platforms,
             ]);
             log_1.default.log(groupTable.toString());
         }
@@ -82,8 +48,5 @@ UpdateView.args = [
     },
 ];
 UpdateView.flags = {
-    json: core_1.Flags.boolean({
-        description: `Return a json with the updates belonging to the group.`,
-        default: false,
-    }),
+    ...flags_1.EasJsonOnlyFlag,
 };

package/build/commands/webhook/create.d.ts

@@ -3,9 +3,13 @@ import { WebhookType } from '../../graphql/generated';
 export default class WebhookCreate extends EasCommand {
     static description: string;
     static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         event: import("@oclif/core/lib/interfaces").OptionFlag<WebhookType>;
         url: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
         secret: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;
     };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/webhook/create.js

@@ -1,21 +1,21 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const generated_1 = require("../../graphql/generated");
 const WebhookMutation_1 = require("../../graphql/mutations/WebhookMutation");
 const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 const input_1 = require("../../webhooks/input");
 class WebhookCreate extends EasCommand_1.default {
     async runAsync() {
         const { flags } = await this.parse(WebhookCreate);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(WebhookCreate, {
+            nonInteractive: flags['non-interactive'],
+        });
         const webhookInputParams = await (0, input_1.prepareInputParamsAsync)(flags);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
         const spinner = (0, ora_1.ora)('Creating a webhook').start();
         try {
             await WebhookMutation_1.WebhookMutation.createWebhookAsync(projectId, webhookInputParams);
@@ -28,6 +28,7 @@ class WebhookCreate extends EasCommand_1.default {
     }
 }
 exports.default = WebhookCreate;
+_a = WebhookCreate;
 WebhookCreate.description = 'create a webhook';
 WebhookCreate.flags = {
     event: core_1.Flags.enum({
@@ -40,4 +41,8 @@ WebhookCreate.flags = {
     secret: core_1.Flags.string({
         description: "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
     }),
+    ...flags_1.EASNonInteractiveFlag,
+};
+WebhookCreate.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
 };

package/build/commands/webhook/delete.d.ts

@@ -6,5 +6,11 @@ export default class WebhookDelete extends EasCommand {
         required: boolean;
         description: string;
     }[];
+    static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
+    };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/webhook/delete.js

@@ -1,30 +1,33 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const WebhookMutation_1 = require("../../graphql/mutations/WebhookMutation");
 const WebhookQuery_1 = require("../../graphql/queries/WebhookQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
-const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const formatWebhook_1 = require("../../webhooks/formatWebhook");
 class WebhookDelete extends EasCommand_1.default {
     async runAsync() {
-        let { args: { ID: webhookId }, } = await this.parse(WebhookDelete);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
+        let { args: { ID: webhookId }, flags: { 'non-interactive': nonInteractive }, } = await this.parse(WebhookDelete);
+        const { projectConfig: { projectId }, } = await this.getContextAsync(WebhookDelete, {
+            nonInteractive,
+        });
         let webhook = webhookId && (await WebhookQuery_1.WebhookQuery.byIdAsync(webhookId));
         if (!webhookId) {
             const webhooks = await fetchWebhooksByAppIdAsync(projectId);
             if (webhooks.length === 0) {
                 process.exit(1);
             }
+            if (nonInteractive) {
+                throw new Error('Must supply ID argument in non-interactive mode');
+            }
             ({ webhook } = await (0, prompts_1.promptAsync)({
                 type: 'autocomplete',
                 name: 'webhook',
@@ -40,14 +43,16 @@ class WebhookDelete extends EasCommand_1.default {
         log_1.default.addNewLineIfNone();
         log_1.default.log((0, formatWebhook_1.formatWebhook)(webhook));
         log_1.default.newLine();
-        log_1.default.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
-        log_1.default.newLine();
-        const confirmed = await (0, prompts_1.toggleConfirmAsync)({
-            message: 'Are you sure you wish to proceed?',
-        });
-        if (!confirmed) {
-            log_1.default.error(`Canceled deletion of the webhook`);
-            process.exit(1);
+        if (!nonInteractive) {
+            log_1.default.warn(`You are about to permanently delete this webhook.\nThis action is irreversible.`);
+            log_1.default.newLine();
+            const confirmed = await (0, prompts_1.toggleConfirmAsync)({
+                message: 'Are you sure you wish to proceed?',
+            });
+            if (!confirmed) {
+                log_1.default.error(`Canceled deletion of the webhook`);
+                process.exit(1);
+            }
         }
         const spinner = (0, ora_1.ora)('Deleting the webhook').start();
         try {
@@ -61,6 +66,7 @@ class WebhookDelete extends EasCommand_1.default {
     }
 }
 exports.default = WebhookDelete;
+_a = WebhookDelete;
 WebhookDelete.description = 'delete a webhook';
 WebhookDelete.args = [
     {
@@ -69,6 +75,12 @@ WebhookDelete.args = [
         description: 'ID of the webhook to delete',
     },
 ];
+WebhookDelete.flags = {
+    ...flags_1.EASNonInteractiveFlag,
+};
+WebhookDelete.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};
 async function fetchWebhooksByAppIdAsync(appId) {
     const spinner = (0, ora_1.ora)('Fetching webhooks').start();
     try {

package/build/commands/webhook/list.d.ts

@@ -5,5 +5,8 @@ export default class WebhookList extends EasCommand {
     static flags: {
         event: import("@oclif/core/lib/interfaces").OptionFlag<WebhookType>;
     };
+    static contextDefinition: {
+        projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/webhook/list.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
@@ -8,24 +9,23 @@ const generated_1 = require("../../graphql/generated");
 const WebhookQuery_1 = require("../../graphql/queries/WebhookQuery");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const ora_1 = require("../../ora");
-const expoConfig_1 = require("../../project/expoConfig");
 const projectUtils_1 = require("../../project/projectUtils");
 const formatWebhook_1 = require("../../webhooks/formatWebhook");
 class WebhookList extends EasCommand_1.default {
     async runAsync() {
         const { flags: { event }, } = await this.parse(WebhookList);
-        const projectDir = await (0, projectUtils_1.findProjectRootAsync)();
-        const exp = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(exp);
-        const projectFullName = await (0, projectUtils_1.getProjectFullNameAsync)(exp);
-        const spinner = (0, ora_1.ora)(`Fetching the list of webhook on project ${projectFullName}`).start();
+        const { projectConfig: { projectId }, } = await this.getContextAsync(WebhookList, {
+            nonInteractive: true,
+        });
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
+        const spinner = (0, ora_1.ora)(`Fetching the list of webhook on project ${projectDisplayName}`).start();
         try {
             const webhooks = await WebhookQuery_1.WebhookQuery.byAppIdAsync(projectId, event && { event });
             if (webhooks.length === 0) {
-                spinner.fail(`There are no webhooks on project ${projectFullName}`);
+                spinner.fail(`There are no webhooks on project ${projectDisplayName}`);
             }
             else {
-                spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectFullName}`);
+                spinner.succeed(`Found ${webhooks.length} webhooks on project ${projectDisplayName}`);
                 const list = webhooks
                     .map(webhook => (0, formatWebhook_1.formatWebhook)(webhook))
                     .join(`\n\n${chalk_1.default.dim('———')}\n\n`);
@@ -33,12 +33,13 @@ class WebhookList extends EasCommand_1.default {
             }
         }
         catch (err) {
-            spinner.fail(`Something went wrong and we couldn't fetch the webhook list for the project ${projectFullName}`);
+            spinner.fail(`Something went wrong and we couldn't fetch the webhook list for the project ${projectDisplayName}`);
             throw err;
         }
     }
 }
 exports.default = WebhookList;
+_a = WebhookList;
 WebhookList.description = 'list webhooks';
 WebhookList.flags = {
     event: core_1.Flags.enum({
@@ -46,3 +47,6 @@ WebhookList.flags = {
         options: [generated_1.WebhookType.Build, generated_1.WebhookType.Submit],
     }),
 };
+WebhookList.contextDefinition = {
+    ..._a.ContextOptions.ProjectConfig,
+};

package/build/commands/webhook/update.d.ts

@@ -3,6 +3,7 @@ import { WebhookType } from '../../graphql/generated';
 export default class WebhookUpdate extends EasCommand {
     static description: string;
     static flags: {
+        'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
         id: import("@oclif/core/lib/interfaces").OptionFlag<string>;
         event: import("@oclif/core/lib/interfaces").OptionFlag<WebhookType>;
         url: import("@oclif/core/lib/interfaces").OptionFlag<string | undefined>;

package/build/commands/webhook/update.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
+const flags_1 = require("../../commandUtils/flags");
 const generated_1 = require("../../graphql/generated");
 const WebhookMutation_1 = require("../../graphql/mutations/WebhookMutation");
 const WebhookQuery_1 = require("../../graphql/queries/WebhookQuery");
@@ -14,7 +15,7 @@ class WebhookUpdate extends EasCommand_1.default {
         const { flags } = await this.parse(WebhookUpdate);
         const webhookId = flags.id;
         const webhook = await WebhookQuery_1.WebhookQuery.byIdAsync(webhookId);
-        const webhookInputParams = await (0, input_1.prepareInputParamsAsync)((0, pick_1.default)(flags, ['event', 'url', 'secret']), webhook);
+        const webhookInputParams = await (0, input_1.prepareInputParamsAsync)((0, pick_1.default)(flags, ['event', 'url', 'secret', 'non-interactive']), webhook);
         const spinner = (0, ora_1.ora)('Updating a webhook').start();
         try {
             await WebhookMutation_1.WebhookMutation.updateWebhookAsync(webhookId, webhookInputParams);
@@ -43,4 +44,5 @@ WebhookUpdate.flags = {
     secret: core_1.Flags.string({
         description: "Secret used to create a hash signature of the request payload, provided in the 'Expo-Signature' header.",
     }),
+    ...flags_1.EASNonInteractiveFlag,
 };

package/build/credentials/android/actions/BuildCredentialsUtils.js

@@ -8,7 +8,6 @@ const ora_1 = require("../../../ora");
 const applicationId_1 = require("../../../project/android/applicationId");
 const projectUtils_1 = require("../../../project/projectUtils");
 const prompts_1 = require("../../../prompts");
-const Account_1 = require("../../../user/Account");
 /**
  * Legacy credentials can be copied over to EAS if the user does not have
  * EAS credentials set up yet
@@ -64,11 +63,8 @@ exports.promptUserAndCopyLegacyCredentialsAsync = promptUserAndCopyLegacyCredent
 async function getAppLookupParamsFromContextAsync(ctx, gradleContext) {
     ctx.ensureProjectContext();
     const projectName = ctx.exp.slug;
-    const accountName = (0, projectUtils_1.getProjectAccountName)(ctx.exp, ctx.user);
-    const account = (0, Account_1.findAccountByName)(ctx.user.accounts, accountName);
-    if (!account) {
-        throw new Error(`You do not have access to account: ${accountName}`);
-    }
+    const projectId = ctx.projectId;
+    const account = await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
     const androidApplicationIdentifier = await (0, applicationId_1.getApplicationIdAsync)(ctx.projectDir, ctx.exp, gradleContext);
     if (!androidApplicationIdentifier) {
         throw new Error(`android.package needs to be defined in your ${(0, projectUtils_1.getProjectConfigDescription)(ctx.projectDir)} file`);

package/build/credentials/android/actions/CreateFcm.d.ts

@@ -1,8 +1,7 @@
-import { AndroidFcmFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AndroidFcmFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class CreateFcm {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<AndroidFcmFragment>;
 }

package/build/credentials/android/actions/CreateGoogleServiceAccountKey.d.ts

@@ -1,9 +1,8 @@
-import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class CreateGoogleServiceAccountKey {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment>;
     private provideAsync;
     private provideKeyJsonPathAsync;

package/build/credentials/android/actions/CreateKeystore.d.ts

@@ -1,9 +1,8 @@
-import { AndroidKeystoreFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AndroidKeystoreFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class CreateKeystore {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<AndroidKeystoreFragment>;
     private provideOrGenerateAsync;
 }

package/build/credentials/android/actions/CreateKeystore.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.CreateKeystore = void 0;
 const tslib_1 = require("tslib");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
-const projectUtils_1 = require("../../../project/projectUtils");
 const promptForCredentials_1 = require("../../utils/promptForCredentials");
 const credentials_1 = require("../credentials");
 const keystore_1 = require("../utils/keystore");
@@ -16,7 +15,7 @@ class CreateKeystore {
         if (ctx.nonInteractive) {
             throw new Error(`New keystore cannot be created in non-interactive mode.`);
         }
-        const projectId = await (0, projectUtils_1.getProjectIdAsync)(ctx.exp);
+        const projectId = ctx.projectId;
         const keystore = await this.provideOrGenerateAsync(projectId);
         const keystoreFragment = await ctx.android.createKeystoreAsync(this.account, keystore);
         log_1.default.succeed('Created keystore');

package/build/credentials/android/actions/RemoveGoogleServiceAccountKey.d.ts

@@ -1,9 +1,8 @@
-import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class SelectAndRemoveGoogleServiceAccountKey {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<void>;
 }
 export declare class RemoveGoogleServiceAccountKey {

package/build/credentials/android/actions/UseExistingGoogleServiceAccountKey.d.ts

@@ -1,8 +1,7 @@
-import { GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class UseExistingGoogleServiceAccountKey {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<GoogleServiceAccountKeyFragment | null>;
 }

package/build/credentials/android/api/GraphqlClient.d.ts

@@ -1,8 +1,7 @@
-import { AndroidAppBuildCredentialsFragment, AndroidFcmFragment, AndroidFcmVersion, AndroidKeystoreFragment, CommonAndroidAppCredentialsFragment, GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AndroidAppBuildCredentialsFragment, AndroidFcmFragment, AndroidFcmVersion, AndroidKeystoreFragment, CommonAndroidAppCredentialsFragment, GoogleServiceAccountKeyFragment } from '../../../graphql/generated';
 import { GoogleServiceAccountKey, KeystoreWithType } from '../credentials';
 export interface AppLookupParams {
-    account: Account;
+    account: AccountFragment;
     projectName: string;
     androidApplicationIdentifier: string;
 }
@@ -29,11 +28,11 @@ export declare function createOrUpdateAndroidAppBuildCredentialsByNameAsync(appL
     androidKeystoreId: string;
 }): Promise<AndroidAppBuildCredentialsFragment>;
 export declare function createOrUpdateDefaultIosAppBuildCredentialsAsync(): Promise<void>;
-export declare function createKeystoreAsync(account: Account, keystore: KeystoreWithType): Promise<AndroidKeystoreFragment>;
+export declare function createKeystoreAsync(account: AccountFragment, keystore: KeystoreWithType): Promise<AndroidKeystoreFragment>;
 export declare function deleteKeystoreAsync(keystore: AndroidKeystoreFragment): Promise<void>;
-export declare function createFcmAsync(account: Account, fcmApiKey: string, version: AndroidFcmVersion): Promise<AndroidFcmFragment>;
+export declare function createFcmAsync(account: AccountFragment, fcmApiKey: string, version: AndroidFcmVersion): Promise<AndroidFcmFragment>;
 export declare function deleteFcmAsync(fcm: AndroidFcmFragment): Promise<void>;
-export declare function createGoogleServiceAccountKeyAsync(account: Account, jsonKey: GoogleServiceAccountKey): Promise<GoogleServiceAccountKeyFragment>;
+export declare function createGoogleServiceAccountKeyAsync(account: AccountFragment, jsonKey: GoogleServiceAccountKey): Promise<GoogleServiceAccountKeyFragment>;
 export declare function deleteGoogleServiceAccountKeyAsync(googleServiceAccountKey: GoogleServiceAccountKeyFragment): Promise<void>;
-export declare function getGoogleServiceAccountKeysForAccountAsync(account: Account): Promise<GoogleServiceAccountKeyFragment[]>;
+export declare function getGoogleServiceAccountKeysForAccountAsync(account: AccountFragment): Promise<GoogleServiceAccountKeyFragment[]>;
 export declare const formatProjectFullName: ({ account, projectName }: AppLookupParams) => string;

package/build/credentials/context.d.ts

@@ -5,6 +5,10 @@ import { Actor } from '../user/User';
 import * as AndroidGraphqlClient from './android/api/GraphqlClient';
 import * as IosGraphqlClient from './ios/api/GraphqlClient';
 import AppStoreApi from './ios/appstore/AppStoreApi';
+export declare type CredentialsContextProjectInfo = {
+    exp: ExpoConfig;
+    projectId: string;
+};
 export declare class CredentialsContext {
     private options;
     readonly android: typeof AndroidGraphqlClient;
@@ -15,11 +19,11 @@ export declare class CredentialsContext {
     readonly user: Actor;
     readonly easJsonCliConfig?: EasJson['cli'];
     private shouldAskAuthenticateAppStore;
-    private resolvedExp?;
+    private projectInfo;
     constructor(options: {
-        exp?: ExpoConfig;
+        projectInfo: CredentialsContextProjectInfo | null;
         easJsonCliConfig?: EasJson['cli'];
-        nonInteractive?: boolean;
+        nonInteractive: boolean;
         projectDir: string;
         user: Actor;
         env?: Env;
@@ -29,7 +33,7 @@ export declare class CredentialsContext {
     }): ExpoConfig | null;
     get hasProjectContext(): boolean;
     get exp(): ExpoConfig;
+    get projectId(): string;
     ensureProjectContext(): void;
-    logOwnerAndProject(): void;
     bestEffortAppStoreAuthenticateAsync(): Promise<void>;
 }

package/build/credentials/context.js

@@ -5,16 +5,14 @@ const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const log_1 = tslib_1.__importDefault(require("../log"));
 const expoConfig_1 = require("../project/expoConfig");
-const projectUtils_1 = require("../project/projectUtils");
 const prompts_1 = require("../prompts");
-const User_1 = require("../user/User");
 const AndroidGraphqlClient = tslib_1.__importStar(require("./android/api/GraphqlClient"));
 const IosGraphqlClient = tslib_1.__importStar(require("./ios/api/GraphqlClient"));
 const AppStoreApi_1 = tslib_1.__importDefault(require("./ios/appstore/AppStoreApi"));
 const authenticateTypes_1 = require("./ios/appstore/authenticateTypes");
 class CredentialsContext {
     constructor(options) {
-        var _a, _b;
+        var _a;
         this.options = options;
         this.android = AndroidGraphqlClient;
         this.appStore = new AppStoreApi_1.default();
@@ -24,11 +22,7 @@ class CredentialsContext {
         this.projectDir = options.projectDir;
         this.user = options.user;
         this.nonInteractive = (_a = options.nonInteractive) !== null && _a !== void 0 ? _a : false;
-        this.resolvedExp = options.exp;
-        if (!this.resolvedExp) {
-            this.resolvedExp =
-                (_b = CredentialsContext.getExpoConfigInProject(this.projectDir, { env: options.env })) !== null && _b !== void 0 ? _b : undefined;
-        }
+        this.projectInfo = options.projectInfo;
     }
     static getExpoConfigInProject(projectDir, { env } = {}) {
         try {
@@ -40,11 +34,15 @@ class CredentialsContext {
         }
     }
     get hasProjectContext() {
-        return !!this.resolvedExp;
+        return !!this.projectInfo;
     }
     get exp() {
         this.ensureProjectContext();
-        return this.resolvedExp;
+        return this.projectInfo.exp;
+    }
+    get projectId() {
+        this.ensureProjectContext();
+        return this.projectInfo.projectId;
     }
     ensureProjectContext() {
         if (this.hasProjectContext) {
@@ -53,19 +51,6 @@ class CredentialsContext {
         // trigger getConfig error
         (0, expoConfig_1.getExpoConfig)(this.options.projectDir);
     }
-    logOwnerAndProject() {
-        var _a;
-        const { user } = this.options;
-        if (this.hasProjectContext) {
-            const owner = (0, projectUtils_1.getProjectAccountName)(this.exp, user);
-            // Figure out if User A is configuring credentials as admin for User B's project
-            const isProxyUser = user.__typename === 'Robot' || owner !== user.username;
-            log_1.default.log(`Accessing credentials ${isProxyUser ? 'on behalf of' : 'for'} ${owner} in project ${this.exp.slug}`);
-        }
-        else {
-            log_1.default.log(`Accessing credentials for ${(_a = this.exp.owner) !== null && _a !== void 0 ? _a : (0, User_1.getActorDisplayName)(user)}`);
-        }
-    }
     async bestEffortAppStoreAuthenticateAsync() {
         if (this.appStore.authCtx || !this.shouldAskAuthenticateAppStore) {
             // skip prompts if already have apple ctx or already asked about it

package/build/credentials/ios/IosCredentialsProvider.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const eas_build_job_1 = require("@expo/eas-build-job");
 const eas_json_1 = require("@expo/eas-json");
-const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
 const target_1 = require("../../project/ios/target");
 const prompts_1 = require("../../prompts");
@@ -59,7 +58,7 @@ class IosCredentialsProvider {
             return null;
         }
         const applicationTarget = (0, target_1.findApplicationTarget)(targets);
-        const app = (0, BuildCredentialsUtils_1.getAppFromContext)(ctx);
+        const app = await (0, BuildCredentialsUtils_1.getAppFromContextAsync)(ctx);
         const appLookupParams = {
             ...app,
             bundleIdentifier: applicationTarget.bundleIdentifier,
@@ -93,10 +92,16 @@ class IosCredentialsProvider {
         }
     }
     async disablePushNotificationsSetupInEasJsonAsync(ctx) {
-        const easJsonPath = eas_json_1.EasJsonReader.formatEasJsonPath(ctx.projectDir);
-        const easJson = await fs_extra_1.default.readJSON(easJsonPath);
-        easJson.cli = { ...easJson === null || easJson === void 0 ? void 0 : easJson.cli, promptToConfigurePushNotifications: false };
-        await fs_extra_1.default.writeFile(easJsonPath, `${JSON.stringify(easJson, null, 2)}\n`);
+        const easJsonAccessor = new eas_json_1.EasJsonAccessor(ctx.projectDir);
+        await easJsonAccessor.readRawJsonAsync();
+        easJsonAccessor.patch(easJsonRawObject => {
+            easJsonRawObject.cli = {
+                ...easJsonRawObject === null || easJsonRawObject === void 0 ? void 0 : easJsonRawObject.cli,
+                promptToConfigurePushNotifications: false,
+            };
+            return easJsonRawObject;
+        });
+        await easJsonAccessor.writeAsync();
         log_1.default.withTick('Updated eas.json');
     }
     assertProvisioningProfileType(provisioningProfile, targetName) {

package/build/credentials/ios/actions/AppleTeamFormatting.d.ts

@@ -0,0 +1,2 @@
+import { AppleTeamFragment } from '../../../graphql/generated';
+export declare function formatAppleTeam({ appleTeamIdentifier, appleTeamName, }: Pick<AppleTeamFragment, 'appleTeamIdentifier' | 'appleTeamName'>): string;

package/build/credentials/ios/actions/AppleTeamFormatting.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.formatAppleTeam = void 0;
+function formatAppleTeam({ appleTeamIdentifier, appleTeamName, }) {
+    return `Team ID: ${appleTeamIdentifier}${appleTeamName ? `, Team name: ${appleTeamName}` : ''}`;
+}
+exports.formatAppleTeam = formatAppleTeam;