eas-cli 7.1.3 → 7.2.0

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

@@ -0,0 +1,59 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpGoogleServiceAccountKeyForFcmV1 = void 0;
+const tslib_1 = require("tslib");
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const AssignGoogleServiceAccountKeyForFcmV1_1 = require("./AssignGoogleServiceAccountKeyForFcmV1");
+const CreateGoogleServiceAccountKey_1 = require("./CreateGoogleServiceAccountKey");
+const UseExistingGoogleServiceAccountKey_1 = require("./UseExistingGoogleServiceAccountKey");
+const log_1 = tslib_1.__importDefault(require("../../../log"));
+const prompts_1 = require("../../../prompts");
+const errors_1 = require("../../errors");
+class SetUpGoogleServiceAccountKeyForFcmV1 {
+    constructor(app) {
+        this.app = app;
+    }
+    async runAsync(ctx) {
+        const isKeySetup = await this.isGoogleServiceAccountKeySetupAsync(ctx);
+        if (isKeySetup) {
+            log_1.default.succeed('Google Service Account Key for FCM V1 already set up.');
+            return (0, nullthrows_1.default)(await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app), 'androidAppCredentials cannot be null if google service account key is already set up');
+        }
+        if (ctx.nonInteractive) {
+            throw new errors_1.MissingCredentialsNonInteractiveError('Google Service Account Keys cannot be set up in --non-interactive mode.');
+        }
+        const keysForAccount = await ctx.android.getGoogleServiceAccountKeysForAccountAsync(ctx.graphqlClient, this.app.account);
+        let googleServiceAccountKey = null;
+        if (keysForAccount.length === 0) {
+            googleServiceAccountKey = await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(this.app.account).runAsync(ctx);
+        }
+        else {
+            googleServiceAccountKey = await this.createOrUseExistingKeyAsync(ctx);
+        }
+        return await new AssignGoogleServiceAccountKeyForFcmV1_1.AssignGoogleServiceAccountKeyForFcmV1(this.app).runAsync(ctx, googleServiceAccountKey);
+    }
+    async isGoogleServiceAccountKeySetupAsync(ctx) {
+        const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app);
+        return !!(appCredentials === null || appCredentials === void 0 ? void 0 : appCredentials.googleServiceAccountKeyForFcmV1);
+    }
+    async createOrUseExistingKeyAsync(ctx) {
+        var _a;
+        const { action } = await (0, prompts_1.promptAsync)({
+            type: 'select',
+            name: 'action',
+            message: 'Select the Google Service Account Key to use for FCM V1:',
+            choices: [
+                {
+                    title: '[Choose an existing key]',
+                    value: 'CHOOSE_EXISTING',
+                },
+                { title: '[Upload a new service account key]', value: 'GENERATE' },
+            ],
+        });
+        if (action === 'GENERATE') {
+            return await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(this.app.account).runAsync(ctx);
+        }
+        return ((_a = (await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx))) !== null && _a !== void 0 ? _a : (await this.createOrUseExistingKeyAsync(ctx)));
+    }
+}
+exports.SetUpGoogleServiceAccountKeyForFcmV1 = SetUpGoogleServiceAccountKeyForFcmV1;

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

@@ -0,0 +1,10 @@
+import { CommonAndroidAppCredentialsFragment } from '../../../graphql/generated';
+import { CredentialsContext } from '../../context';
+import { AppLookupParams } from '../api/GraphqlClient';
+export declare class SetUpGoogleServiceAccountKeyForSubmissions {
+    private app;
+    constructor(app: AppLookupParams);
+    runAsync(ctx: CredentialsContext): Promise<CommonAndroidAppCredentialsFragment>;
+    private isGoogleServiceAccountKeySetupAsync;
+    private createOrUseExistingKeyAsync;
+}

package/build/credentials/android/actions/{SetUpGoogleServiceAccountKey.js → SetUpGoogleServiceAccountKeyForSubmissions.js}

@@ -1,15 +1,15 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.SetUpGoogleServiceAccountKey = void 0;
+exports.SetUpGoogleServiceAccountKeyForSubmissions = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
-const AssignGoogleServiceAccountKey_1 = require("./AssignGoogleServiceAccountKey");
+const AssignGoogleServiceAccountKeyForSubmissions_1 = require("./AssignGoogleServiceAccountKeyForSubmissions");
 const CreateGoogleServiceAccountKey_1 = require("./CreateGoogleServiceAccountKey");
 const UseExistingGoogleServiceAccountKey_1 = require("./UseExistingGoogleServiceAccountKey");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
 const prompts_1 = require("../../../prompts");
 const errors_1 = require("../../errors");
-class SetUpGoogleServiceAccountKey {
+class SetUpGoogleServiceAccountKeyForSubmissions {
     constructor(app) {
         this.app = app;
     }
@@ -30,7 +30,7 @@ class SetUpGoogleServiceAccountKey {
         else {
             googleServiceAccountKey = await this.createOrUseExistingKeyAsync(ctx);
         }
-        return await new AssignGoogleServiceAccountKey_1.AssignGoogleServiceAccountKey(this.app).runAsync(ctx, googleServiceAccountKey);
+        return await new AssignGoogleServiceAccountKeyForSubmissions_1.AssignGoogleServiceAccountKeyForSubmissions(this.app).runAsync(ctx, googleServiceAccountKey);
     }
     async isGoogleServiceAccountKeySetupAsync(ctx) {
         const appCredentials = await ctx.android.getAndroidAppCredentialsWithCommonFieldsAsync(ctx.graphqlClient, this.app);
@@ -56,4 +56,4 @@ class SetUpGoogleServiceAccountKey {
         return ((_a = (await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(this.app.account).runAsync(ctx))) !== null && _a !== void 0 ? _a : (await this.createOrUseExistingKeyAsync(ctx)));
     }
 }
-exports.SetUpGoogleServiceAccountKey = SetUpGoogleServiceAccountKey;
+exports.SetUpGoogleServiceAccountKeyForSubmissions = SetUpGoogleServiceAccountKeyForSubmissions;

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

@@ -11,9 +11,10 @@ export declare function getAndroidAppBuildCredentialsListAsync(graphqlClient: Ex
 export declare function getLegacyAndroidAppCredentialsWithCommonFieldsAsync(graphqlClient: ExpoGraphqlClient, appLookupParams: AppLookupParams): Promise<CommonAndroidAppCredentialsFragment | null>;
 export declare function getLegacyAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, appLookupParams: AppLookupParams): Promise<AndroidAppBuildCredentialsFragment | null>;
 export declare function createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, appLookupParams: AppLookupParams): Promise<CommonAndroidAppCredentialsFragment>;
-export declare function updateAndroidAppCredentialsAsync(graphqlClient: ExpoGraphqlClient, appCredentials: CommonAndroidAppCredentialsFragment, { androidFcmId, googleServiceAccountKeyForSubmissionsId, }: {
+export declare function updateAndroidAppCredentialsAsync(graphqlClient: ExpoGraphqlClient, appCredentials: CommonAndroidAppCredentialsFragment, { androidFcmId, googleServiceAccountKeyForSubmissionsId, googleServiceAccountKeyForFcmV1Id, }: {
     androidFcmId?: string;
     googleServiceAccountKeyForSubmissionsId?: string;
+    googleServiceAccountKeyForFcmV1Id?: string;
 }): Promise<CommonAndroidAppCredentialsFragment>;
 export declare function updateAndroidAppBuildCredentialsAsync(graphqlClient: ExpoGraphqlClient, buildCredentials: AndroidAppBuildCredentialsFragment, { androidKeystoreId, }: {
     androidKeystoreId: string;

package/build/credentials/android/api/GraphqlClient.js

@@ -50,7 +50,7 @@ async function createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync
     }
 }
 exports.createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync = createOrGetExistingAndroidAppCredentialsWithBuildCredentialsAsync;
-async function updateAndroidAppCredentialsAsync(graphqlClient, appCredentials, { androidFcmId, googleServiceAccountKeyForSubmissionsId, }) {
+async function updateAndroidAppCredentialsAsync(graphqlClient, appCredentials, { androidFcmId, googleServiceAccountKeyForSubmissionsId, googleServiceAccountKeyForFcmV1Id, }) {
     let updatedAppCredentials = appCredentials;
     if (androidFcmId) {
         updatedAppCredentials = await AndroidAppCredentialsMutation_1.AndroidAppCredentialsMutation.setFcmKeyAsync(graphqlClient, appCredentials.id, androidFcmId);
@@ -59,6 +59,10 @@ async function updateAndroidAppCredentialsAsync(graphqlClient, appCredentials, {
         updatedAppCredentials =
             await AndroidAppCredentialsMutation_1.AndroidAppCredentialsMutation.setGoogleServiceAccountKeyForSubmissionsAsync(graphqlClient, appCredentials.id, googleServiceAccountKeyForSubmissionsId);
     }
+    if (googleServiceAccountKeyForFcmV1Id) {
+        updatedAppCredentials =
+            await AndroidAppCredentialsMutation_1.AndroidAppCredentialsMutation.setGoogleServiceAccountKeyForFcmV1Async(graphqlClient, appCredentials.id, googleServiceAccountKeyForFcmV1Id);
+    }
     return updatedAppCredentials;
 }
 exports.updateAndroidAppCredentialsAsync = updateAndroidAppCredentialsAsync;

package/build/credentials/android/api/graphql/mutations/AndroidAppCredentialsMutation.d.ts

@@ -6,4 +6,5 @@ export declare const AndroidAppCredentialsMutation: {
     }, appId: string, applicationIdentifier: string): Promise<CommonAndroidAppCredentialsFragment>;
     setFcmKeyAsync(graphqlClient: ExpoGraphqlClient, androidAppCredentialsId: string, fcmId: string): Promise<CommonAndroidAppCredentialsFragment>;
     setGoogleServiceAccountKeyForSubmissionsAsync(graphqlClient: ExpoGraphqlClient, androidAppCredentialsId: string, googleServiceAccountKeyId: string): Promise<CommonAndroidAppCredentialsFragment>;
+    setGoogleServiceAccountKeyForFcmV1Async(graphqlClient: ExpoGraphqlClient, androidAppCredentialsId: string, googleServiceAccountKeyId: string): Promise<CommonAndroidAppCredentialsFragment>;
 };

package/build/credentials/android/api/graphql/mutations/AndroidAppCredentialsMutation.js

@@ -83,4 +83,30 @@ exports.AndroidAppCredentialsMutation = {
         (0, assert_1.default)(data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions, 'GraphQL: `setGoogleServiceAccountKeyForSubmissions` not defined in server response');
         return data.androidAppCredentials.setGoogleServiceAccountKeyForSubmissions;
     },
+    async setGoogleServiceAccountKeyForFcmV1Async(graphqlClient, androidAppCredentialsId, googleServiceAccountKeyId) {
+        const data = await (0, client_1.withErrorHandlingAsync)(graphqlClient
+            .mutation((0, graphql_tag_1.default) `
+            mutation SetGoogleServiceAccountKeyForFcmV1Mutation(
+              $androidAppCredentialsId: ID!
+              $googleServiceAccountKeyId: ID!
+            ) {
+              androidAppCredentials {
+                setGoogleServiceAccountKeyForFcmV1(
+                  id: $androidAppCredentialsId
+                  googleServiceAccountKeyId: $googleServiceAccountKeyId
+                ) {
+                  id
+                  ...CommonAndroidAppCredentialsFragment
+                }
+              }
+            }
+            ${(0, graphql_1.print)(AndroidAppCredentials_1.CommonAndroidAppCredentialsFragmentNode)}
+          `, {
+            androidAppCredentialsId,
+            googleServiceAccountKeyId,
+        })
+            .toPromise());
+        (0, assert_1.default)(data.androidAppCredentials.setGoogleServiceAccountKeyForFcmV1, 'GraphQL: `setGoogleServiceAccountKeyForFcmV1` not defined in server response');
+        return data.androidAppCredentials.setGoogleServiceAccountKeyForFcmV1;
+    },
 };

package/build/credentials/android/utils/googleServiceAccountKey.js

@@ -74,7 +74,7 @@ function formatGoogleServiceAccountKey({ projectIdentifier, privateKeyIdentifier
 async function detectGoogleServiceAccountKeyPathAsync(projectDir) {
     const foundFilePaths = await (0, fast_glob_1.default)('**/*.json', {
         cwd: projectDir,
-        ignore: ['app.json', 'package*.json', 'tsconfig.json', 'node_modules'],
+        ignore: ['app.json', 'package*.json', 'tsconfig.json', 'node_modules', 'google-services.json'],
     });
     const googleServiceFiles = foundFilePaths
         .map(file => path_1.default.join(projectDir, file))

package/build/credentials/android/utils/printCredentials.js

@@ -22,7 +22,7 @@ function displayEmptyAndroidCredentials(appLookupParams) {
 exports.displayEmptyAndroidCredentials = displayEmptyAndroidCredentials;
 function displayAndroidFcmCredentials(appCredentials) {
     const maybeFcm = appCredentials.androidFcm;
-    log_1.default.log((0, formatFields_1.default)([{ label: 'Push Notifications (FCM)', value: '' }], {
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Push Notifications (FCM Legacy)', value: '' }], {
         labelFormat: chalk_1.default.cyan.bold,
     }));
     if (!maybeFcm) {
@@ -49,7 +49,28 @@ function displayAndroidFcmCredentials(appCredentials) {
 }
 function displayGoogleServiceAccountKeyForSubmissions(appCredentials) {
     const maybeGsaKey = appCredentials.googleServiceAccountKeyForSubmissions;
-    log_1.default.log((0, formatFields_1.default)([{ label: 'Google Service Account Key For Submissions', value: '' }], {
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Submissions: Google Service Account Key for Play Store Submissions', value: '' }], {
+        labelFormat: chalk_1.default.cyan.bold,
+    }));
+    if (!maybeGsaKey) {
+        log_1.default.log((0, formatFields_1.default)([{ label: '', value: 'None assigned yet' }]));
+        log_1.default.newLine();
+        return;
+    }
+    const { projectIdentifier, privateKeyIdentifier, clientEmail, clientIdentifier, updatedAt } = maybeGsaKey;
+    const fields = [
+        { label: 'Project ID', value: projectIdentifier },
+        { label: 'Client Email', value: clientEmail },
+        { label: 'Client ID', value: clientIdentifier },
+        { label: 'Private Key ID', value: privateKeyIdentifier },
+        { label: 'Updated', value: `${(0, date_1.fromNow)(new Date(updatedAt))} ago` },
+    ];
+    log_1.default.log((0, formatFields_1.default)(fields, { labelFormat: chalk_1.default.cyan.bold }));
+    log_1.default.newLine();
+}
+function displayGoogleServiceAccountKeyForFcmV1(appCredentials) {
+    const maybeGsaKey = appCredentials.googleServiceAccountKeyForFcmV1;
+    log_1.default.log((0, formatFields_1.default)([{ label: 'Push Notifications (FCM V1): Google Service Account Key For FCM V1', value: '' }], {
         labelFormat: chalk_1.default.cyan.bold,
     }));
     if (!maybeGsaKey) {
@@ -70,6 +91,7 @@ function displayGoogleServiceAccountKeyForSubmissions(appCredentials) {
 }
 function displayEASAndroidAppCredentials(appCredentials) {
     displayAndroidFcmCredentials(appCredentials);
+    displayGoogleServiceAccountKeyForFcmV1(appCredentials);
     displayGoogleServiceAccountKeyForSubmissions(appCredentials);
     const sortedBuildCredentialsList = (0, BuildCredentialsUtils_1.sortBuildCredentials)(appCredentials.androidAppBuildCredentialsList);
     for (const buildCredentials of sortedBuildCredentialsList) {

package/build/credentials/manager/Actions.d.ts

@@ -11,22 +11,28 @@ export declare enum Scope {
 export declare enum AndroidActionType {
     ManageBuildCredentials = 0,
     ManageFcm = 1,
-    ManageGoogleServiceAccountKey = 2,
-    ManageCredentialsJson = 3,
-    GoBackToCaller = 4,
-    GoBackToHighLevelActions = 5,
-    CreateKeystore = 6,
-    SetDefaultKeystore = 7,
-    DownloadKeystore = 8,
-    RemoveKeystore = 9,
-    CreateFcm = 10,
-    RemoveFcm = 11,
-    CreateGsaKey = 12,
-    UseExistingGsaKey = 13,
-    RemoveGsaKey = 14,
-    SetUpGsaKey = 15,
-    UpdateCredentialsJson = 16,
-    SetUpBuildCredentialsFromCredentialsJson = 17
+    ManageGoogleServiceAccountKeyForSubmissions = 2,
+    ManageGoogleServiceAccount = 3,
+    ManageGoogleServiceAccountKeyForFcmV1 = 4,
+    ManageCredentialsJson = 5,
+    GoBackToCaller = 6,
+    GoBackToHighLevelActions = 7,
+    CreateKeystore = 8,
+    SetDefaultKeystore = 9,
+    DownloadKeystore = 10,
+    RemoveKeystore = 11,
+    CreateFcm = 12,
+    RemoveFcm = 13,
+    CreateGsaKey = 14,
+    UseExistingGsaKeyForSubmissions = 15,
+    RemoveGsaKey = 16,
+    SetUpGsaKeyForSubmissions = 17,
+    CreateGsaKeyForFcmV1 = 18,
+    UseExistingGsaKeyForFcmV1 = 19,
+    RemoveGsaKeyForFcmV1 = 20,
+    SetUpGsaKeyForFcmV1 = 21,
+    UpdateCredentialsJson = 22,
+    SetUpBuildCredentialsFromCredentialsJson = 23
 }
 export declare enum IosActionType {
     ManageCredentialsJson = 0,

package/build/credentials/manager/Actions.js

@@ -11,22 +11,28 @@ var AndroidActionType;
 (function (AndroidActionType) {
     AndroidActionType[AndroidActionType["ManageBuildCredentials"] = 0] = "ManageBuildCredentials";
     AndroidActionType[AndroidActionType["ManageFcm"] = 1] = "ManageFcm";
-    AndroidActionType[AndroidActionType["ManageGoogleServiceAccountKey"] = 2] = "ManageGoogleServiceAccountKey";
-    AndroidActionType[AndroidActionType["ManageCredentialsJson"] = 3] = "ManageCredentialsJson";
-    AndroidActionType[AndroidActionType["GoBackToCaller"] = 4] = "GoBackToCaller";
-    AndroidActionType[AndroidActionType["GoBackToHighLevelActions"] = 5] = "GoBackToHighLevelActions";
-    AndroidActionType[AndroidActionType["CreateKeystore"] = 6] = "CreateKeystore";
-    AndroidActionType[AndroidActionType["SetDefaultKeystore"] = 7] = "SetDefaultKeystore";
-    AndroidActionType[AndroidActionType["DownloadKeystore"] = 8] = "DownloadKeystore";
-    AndroidActionType[AndroidActionType["RemoveKeystore"] = 9] = "RemoveKeystore";
-    AndroidActionType[AndroidActionType["CreateFcm"] = 10] = "CreateFcm";
-    AndroidActionType[AndroidActionType["RemoveFcm"] = 11] = "RemoveFcm";
-    AndroidActionType[AndroidActionType["CreateGsaKey"] = 12] = "CreateGsaKey";
-    AndroidActionType[AndroidActionType["UseExistingGsaKey"] = 13] = "UseExistingGsaKey";
-    AndroidActionType[AndroidActionType["RemoveGsaKey"] = 14] = "RemoveGsaKey";
-    AndroidActionType[AndroidActionType["SetUpGsaKey"] = 15] = "SetUpGsaKey";
-    AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 16] = "UpdateCredentialsJson";
-    AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 17] = "SetUpBuildCredentialsFromCredentialsJson";
+    AndroidActionType[AndroidActionType["ManageGoogleServiceAccountKeyForSubmissions"] = 2] = "ManageGoogleServiceAccountKeyForSubmissions";
+    AndroidActionType[AndroidActionType["ManageGoogleServiceAccount"] = 3] = "ManageGoogleServiceAccount";
+    AndroidActionType[AndroidActionType["ManageGoogleServiceAccountKeyForFcmV1"] = 4] = "ManageGoogleServiceAccountKeyForFcmV1";
+    AndroidActionType[AndroidActionType["ManageCredentialsJson"] = 5] = "ManageCredentialsJson";
+    AndroidActionType[AndroidActionType["GoBackToCaller"] = 6] = "GoBackToCaller";
+    AndroidActionType[AndroidActionType["GoBackToHighLevelActions"] = 7] = "GoBackToHighLevelActions";
+    AndroidActionType[AndroidActionType["CreateKeystore"] = 8] = "CreateKeystore";
+    AndroidActionType[AndroidActionType["SetDefaultKeystore"] = 9] = "SetDefaultKeystore";
+    AndroidActionType[AndroidActionType["DownloadKeystore"] = 10] = "DownloadKeystore";
+    AndroidActionType[AndroidActionType["RemoveKeystore"] = 11] = "RemoveKeystore";
+    AndroidActionType[AndroidActionType["CreateFcm"] = 12] = "CreateFcm";
+    AndroidActionType[AndroidActionType["RemoveFcm"] = 13] = "RemoveFcm";
+    AndroidActionType[AndroidActionType["CreateGsaKey"] = 14] = "CreateGsaKey";
+    AndroidActionType[AndroidActionType["UseExistingGsaKeyForSubmissions"] = 15] = "UseExistingGsaKeyForSubmissions";
+    AndroidActionType[AndroidActionType["RemoveGsaKey"] = 16] = "RemoveGsaKey";
+    AndroidActionType[AndroidActionType["SetUpGsaKeyForSubmissions"] = 17] = "SetUpGsaKeyForSubmissions";
+    AndroidActionType[AndroidActionType["CreateGsaKeyForFcmV1"] = 18] = "CreateGsaKeyForFcmV1";
+    AndroidActionType[AndroidActionType["UseExistingGsaKeyForFcmV1"] = 19] = "UseExistingGsaKeyForFcmV1";
+    AndroidActionType[AndroidActionType["RemoveGsaKeyForFcmV1"] = 20] = "RemoveGsaKeyForFcmV1";
+    AndroidActionType[AndroidActionType["SetUpGsaKeyForFcmV1"] = 21] = "SetUpGsaKeyForFcmV1";
+    AndroidActionType[AndroidActionType["UpdateCredentialsJson"] = 22] = "UpdateCredentialsJson";
+    AndroidActionType[AndroidActionType["SetUpBuildCredentialsFromCredentialsJson"] = 23] = "SetUpBuildCredentialsFromCredentialsJson";
 })(AndroidActionType || (exports.AndroidActionType = AndroidActionType = {}));
 var IosActionType;
 (function (IosActionType) {

package/build/credentials/manager/AndroidActions.d.ts

@@ -3,4 +3,6 @@ export declare const highLevelActions: ActionInfo[];
 export declare const credentialsJsonActions: ActionInfo[];
 export declare const buildCredentialsActions: ActionInfo[];
 export declare const fcmActions: ActionInfo[];
-export declare const gsaKeyActions: ActionInfo[];
+export declare const gsaKeyActionsForFcmV1: ActionInfo[];
+export declare const gsaKeyActionsForSubmissions: ActionInfo[];
+export declare const gsaActions: ActionInfo[];

package/build/credentials/manager/AndroidActions.js

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.gsaKeyActions = exports.fcmActions = exports.buildCredentialsActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
+exports.gsaActions = exports.gsaKeyActionsForSubmissions = exports.gsaKeyActionsForFcmV1 = exports.fcmActions = exports.buildCredentialsActions = exports.credentialsJsonActions = exports.highLevelActions = void 0;
 const Actions_1 = require("./Actions");
 exports.highLevelActions = [
     {
@@ -9,13 +9,13 @@ exports.highLevelActions = [
         scope: Actions_1.Scope.Manager,
     },
     {
-        value: Actions_1.AndroidActionType.ManageFcm,
-        title: 'Push Notifications: Manage your FCM API Key',
+        value: Actions_1.AndroidActionType.ManageGoogleServiceAccount,
+        title: 'Google Service Account',
         scope: Actions_1.Scope.Manager,
     },
     {
-        value: Actions_1.AndroidActionType.ManageGoogleServiceAccountKey,
-        title: 'Google Service Account: Manage your Service Account Key',
+        value: Actions_1.AndroidActionType.ManageFcm,
+        title: 'Push Notifications (Legacy): Manage your FCM (Legacy) API Key',
         scope: Actions_1.Scope.Manager,
     },
     {
@@ -90,20 +90,54 @@ exports.fcmActions = [
         scope: Actions_1.Scope.Manager,
     },
 ];
-exports.gsaKeyActions = [
+exports.gsaKeyActionsForFcmV1 = [
     {
-        value: Actions_1.AndroidActionType.SetUpGsaKey,
-        title: 'Set up a Google Service Account Key',
+        value: Actions_1.AndroidActionType.SetUpGsaKeyForFcmV1,
+        title: 'Set up a Google Service Account Key for Push Notifications (FCM V1)',
         scope: Actions_1.Scope.Project,
     },
     {
-        value: Actions_1.AndroidActionType.CreateGsaKey,
-        title: 'Upload a Google Service Account Key',
+        value: Actions_1.AndroidActionType.UseExistingGsaKeyForFcmV1,
+        title: 'Select an existing Google Service Account Key for Push Notifications (FCM V1)',
+        scope: Actions_1.Scope.Project,
+    },
+    {
+        value: Actions_1.AndroidActionType.GoBackToHighLevelActions,
+        title: 'Go back',
+        scope: Actions_1.Scope.Manager,
+    },
+];
+exports.gsaKeyActionsForSubmissions = [
+    {
+        value: Actions_1.AndroidActionType.SetUpGsaKeyForSubmissions,
+        title: 'Set up a Google Service Account Key for Play Store Submissions',
+        scope: Actions_1.Scope.Project,
+    },
+    {
+        value: Actions_1.AndroidActionType.UseExistingGsaKeyForSubmissions,
+        title: 'Select an existing Google Service Account Key for Play Store Submissions',
         scope: Actions_1.Scope.Project,
     },
     {
-        value: Actions_1.AndroidActionType.UseExistingGsaKey,
-        title: 'Use an existing Google Service Account Key',
+        value: Actions_1.AndroidActionType.GoBackToHighLevelActions,
+        title: 'Go back',
+        scope: Actions_1.Scope.Manager,
+    },
+];
+exports.gsaActions = [
+    {
+        value: Actions_1.AndroidActionType.ManageGoogleServiceAccountKeyForSubmissions,
+        title: 'Manage your Google Service Account Key for Play Store Submissions',
+        scope: Actions_1.Scope.Manager,
+    },
+    {
+        value: Actions_1.AndroidActionType.ManageGoogleServiceAccountKeyForFcmV1,
+        title: 'Manage your Google Service Account Key for Push Notifications (FCM V1)',
+        scope: Actions_1.Scope.Manager,
+    },
+    {
+        value: Actions_1.AndroidActionType.CreateGsaKey,
+        title: 'Upload a Google Service Account Key',
         scope: Actions_1.Scope.Project,
     },
     {

package/build/credentials/manager/ManageAndroid.js

@@ -15,7 +15,8 @@ const log_1 = tslib_1.__importStar(require("../../log"));
 const gradle_1 = require("../../project/android/gradle");
 const prompts_1 = require("../../prompts");
 const AssignFcm_1 = require("../android/actions/AssignFcm");
-const AssignGoogleServiceAccountKey_1 = require("../android/actions/AssignGoogleServiceAccountKey");
+const AssignGoogleServiceAccountKeyForFcmV1_1 = require("../android/actions/AssignGoogleServiceAccountKeyForFcmV1");
+const AssignGoogleServiceAccountKeyForSubmissions_1 = require("../android/actions/AssignGoogleServiceAccountKeyForSubmissions");
 const BuildCredentialsUtils_1 = require("../android/actions/BuildCredentialsUtils");
 const CreateFcm_1 = require("../android/actions/CreateFcm");
 const CreateGoogleServiceAccountKey_1 = require("../android/actions/CreateGoogleServiceAccountKey");
@@ -24,7 +25,8 @@ const RemoveFcm_1 = require("../android/actions/RemoveFcm");
 const RemoveGoogleServiceAccountKey_1 = require("../android/actions/RemoveGoogleServiceAccountKey");
 const RemoveKeystore_1 = require("../android/actions/RemoveKeystore");
 const SetUpBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetUpBuildCredentialsFromCredentialsJson");
-const SetUpGoogleServiceAccountKey_1 = require("../android/actions/SetUpGoogleServiceAccountKey");
+const SetUpGoogleServiceAccountKeyForFcmV1_1 = require("../android/actions/SetUpGoogleServiceAccountKeyForFcmV1");
+const SetUpGoogleServiceAccountKeyForSubmissions_1 = require("../android/actions/SetUpGoogleServiceAccountKeyForSubmissions");
 const UpdateCredentialsJson_1 = require("../android/actions/UpdateCredentialsJson");
 const UseExistingGoogleServiceAccountKey_1 = require("../android/actions/UseExistingGoogleServiceAccountKey");
 const printCredentials_1 = require("../android/utils/printCredentials");
@@ -101,8 +103,16 @@ class ManageAndroid {
                         currentActions = AndroidActions_1.fcmActions;
                         continue;
                     }
-                    else if (chosenAction === Actions_1.AndroidActionType.ManageGoogleServiceAccountKey) {
-                        currentActions = AndroidActions_1.gsaKeyActions;
+                    else if (chosenAction === Actions_1.AndroidActionType.ManageGoogleServiceAccount) {
+                        currentActions = AndroidActions_1.gsaActions;
+                        continue;
+                    }
+                    else if (chosenAction === Actions_1.AndroidActionType.ManageGoogleServiceAccountKeyForSubmissions) {
+                        currentActions = AndroidActions_1.gsaKeyActionsForSubmissions;
+                        continue;
+                    }
+                    else if (chosenAction === Actions_1.AndroidActionType.ManageGoogleServiceAccountKeyForFcmV1) {
+                        currentActions = AndroidActions_1.gsaKeyActionsForFcmV1;
                         continue;
                     }
                     else if (chosenAction === Actions_1.AndroidActionType.ManageCredentialsJson) {
@@ -165,22 +175,30 @@ class ManageAndroid {
         else if (action === Actions_1.AndroidActionType.RemoveFcm) {
             await new RemoveFcm_1.RemoveFcm(appLookupParams).runAsync(ctx);
         }
-        else if (action === Actions_1.AndroidActionType.CreateGsaKey) {
-            const gsaKey = await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
-            await new AssignGoogleServiceAccountKey_1.AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
+        else if (action === Actions_1.AndroidActionType.SetUpGsaKeyForSubmissions) {
+            await new SetUpGoogleServiceAccountKeyForSubmissions_1.SetUpGoogleServiceAccountKeyForSubmissions(appLookupParams).runAsync(ctx);
         }
-        else if (action === Actions_1.AndroidActionType.UseExistingGsaKey) {
+        else if (action === Actions_1.AndroidActionType.UseExistingGsaKeyForSubmissions) {
             const gsaKey = await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
             if (gsaKey) {
-                await new AssignGoogleServiceAccountKey_1.AssignGoogleServiceAccountKey(appLookupParams).runAsync(ctx, gsaKey);
+                await new AssignGoogleServiceAccountKeyForSubmissions_1.AssignGoogleServiceAccountKeyForSubmissions(appLookupParams).runAsync(ctx, gsaKey);
             }
         }
+        else if (action === Actions_1.AndroidActionType.SetUpGsaKeyForFcmV1) {
+            await new SetUpGoogleServiceAccountKeyForFcmV1_1.SetUpGoogleServiceAccountKeyForFcmV1(appLookupParams).runAsync(ctx);
+        }
+        else if (action === Actions_1.AndroidActionType.UseExistingGsaKeyForFcmV1) {
+            const gsaKey = await new UseExistingGoogleServiceAccountKey_1.UseExistingGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
+            if (gsaKey) {
+                await new AssignGoogleServiceAccountKeyForFcmV1_1.AssignGoogleServiceAccountKeyForFcmV1(appLookupParams).runAsync(ctx, gsaKey);
+            }
+        }
+        else if (action === Actions_1.AndroidActionType.CreateGsaKey) {
+            await new CreateGoogleServiceAccountKey_1.CreateGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
+        }
         else if (action === Actions_1.AndroidActionType.RemoveGsaKey) {
             await new RemoveGoogleServiceAccountKey_1.SelectAndRemoveGoogleServiceAccountKey(appLookupParams.account).runAsync(ctx);
         }
-        else if (action === Actions_1.AndroidActionType.SetUpGsaKey) {
-            await new SetUpGoogleServiceAccountKey_1.SetUpGoogleServiceAccountKey(appLookupParams).runAsync(ctx);
-        }
         else if (action === Actions_1.AndroidActionType.UpdateCredentialsJson) {
             const buildCredentials = await new SelectAndroidBuildCredentials_1.SelectExistingAndroidBuildCredentials(appLookupParams).runAsync(ctx);
             if (buildCredentials) {