eas-cli 7.6.2 → 7.8.0

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

@@ -1,10 +1,14 @@
-import { ActionInfo } from './Actions';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import { ActionInfo, AndroidActionType } from './Actions';
 import { Action } from './HelperActions';
+import { GradleBuildContext } from '../../project/android/gradle';
+import { CredentialsContext } from '../context';
 export declare class ManageAndroid {
-    private callingAction;
-    private projectDir;
+    protected callingAction: Action;
+    protected projectDir: string;
     constructor(callingAction: Action, projectDir: string);
     runAsync(currentActions?: ActionInfo[]): Promise<void>;
-    private createProjectContextAsync;
-    private runProjectSpecificActionAsync;
+    protected createProjectContextAsync(ctx: CredentialsContext, buildProfile: BuildProfile<Platform.ANDROID>): Promise<GradleBuildContext | undefined>;
+    protected runProjectSpecificActionAsync(ctx: CredentialsContext, action: AndroidActionType, gradleContext?: GradleBuildContext): Promise<void>;
 }

package/build/credentials/manager/ManageAndroid.js

@@ -24,6 +24,7 @@ const DownloadKeystore_1 = require("../android/actions/DownloadKeystore");
 const RemoveFcm_1 = require("../android/actions/RemoveFcm");
 const RemoveGoogleServiceAccountKey_1 = require("../android/actions/RemoveGoogleServiceAccountKey");
 const RemoveKeystore_1 = require("../android/actions/RemoveKeystore");
+const SetUpBuildCredentials_1 = require("../android/actions/SetUpBuildCredentials");
 const SetUpBuildCredentialsFromCredentialsJson_1 = require("../android/actions/SetUpBuildCredentialsFromCredentialsJson");
 const SetUpGoogleServiceAccountKeyForFcmV1_1 = require("../android/actions/SetUpGoogleServiceAccountKeyForFcmV1");
 const SetUpGoogleServiceAccountKeyForSubmissions_1 = require("../android/actions/SetUpGoogleServiceAccountKeyForSubmissions");
@@ -208,6 +209,9 @@ class ManageAndroid {
         else if (action === Actions_1.AndroidActionType.SetUpBuildCredentialsFromCredentialsJson) {
             await new SetUpBuildCredentialsFromCredentialsJson_1.SetUpBuildCredentialsFromCredentialsJson(appLookupParams).runAsync(ctx);
         }
+        else if (action === Actions_1.AndroidActionType.SetUpBuildCredentials) {
+            await new SetUpBuildCredentials_1.SetUpBuildCredentials({ app: appLookupParams }).runAsync(ctx);
+        }
     }
 }
 exports.ManageAndroid = ManageAndroid;

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

@@ -1,13 +1,22 @@
-import { ActionInfo } from './Actions';
+import { Platform } from '@expo/eas-build-job';
+import { BuildProfile } from '@expo/eas-json';
+import { ActionInfo, IosActionType } from './Actions';
 import { Action } from './HelperActions';
+import { AccountFragment, AppleDistributionCertificateFragment, IosAppBuildCredentialsFragment, IosDistributionType as IosDistributionTypeGraphql } from '../../graphql/generated';
+import { CredentialsContext } from '../context';
+import { AppLookupParams } from '../ios/api/graphql/types/AppLookupParams';
+import { App, Target } from '../ios/types';
 export declare class ManageIos {
-    private callingAction;
-    private projectDir;
+    protected callingAction: Action;
+    protected projectDir: string;
     constructor(callingAction: Action, projectDir: string);
     runAsync(currentActions?: ActionInfo[]): Promise<void>;
-    private createProjectContextAsync;
-    private runAccountSpecificActionAsync;
-    private runProjectSpecificActionAsync;
-    private setupProvisioningProfileWithSpecificDistCertAsync;
-    private selectTargetAsync;
+    protected createProjectContextAsync(ctx: CredentialsContext, account: AccountFragment, buildProfile: BuildProfile<Platform.IOS>): Promise<{
+        app: App;
+        targets: Target[];
+    }>;
+    protected runAccountSpecificActionAsync(ctx: CredentialsContext, account: AccountFragment, action: IosActionType): Promise<void>;
+    protected runProjectSpecificActionAsync(ctx: CredentialsContext, app: App, targets: Target[], buildProfile: BuildProfile<Platform.IOS>, action: IosActionType): Promise<void>;
+    protected setupProvisioningProfileWithSpecificDistCertAsync(ctx: CredentialsContext, target: Target, appLookupParams: AppLookupParams, distCert: AppleDistributionCertificateFragment, distributionType: IosDistributionTypeGraphql): Promise<IosAppBuildCredentialsFragment>;
+    protected selectTargetAsync(targets: Target[]): Promise<Target>;
 }

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

@@ -0,0 +1,7 @@
+import { Action } from './HelperActions';
+import { ManageAndroid } from './ManageAndroid';
+export declare class SetUpAndroidBuildCredentials extends ManageAndroid {
+    private setUpBuildCredentialsWithProfileNameFromFlag;
+    constructor(callingAction: Action, projectDir: string, setUpBuildCredentialsWithProfileNameFromFlag: string);
+    runAsync(): Promise<void>;
+}

package/build/credentials/manager/SetUpAndroidBuildCredentials.js

@@ -0,0 +1,48 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpAndroidBuildCredentials = void 0;
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const Actions_1 = require("./Actions");
+const CheckBuildProfileFlagAgainstEasJson_1 = require("./CheckBuildProfileFlagAgainstEasJson");
+const ManageAndroid_1 = require("./ManageAndroid");
+const context_1 = require("../context");
+class SetUpAndroidBuildCredentials extends ManageAndroid_1.ManageAndroid {
+    constructor(callingAction, projectDir, setUpBuildCredentialsWithProfileNameFromFlag) {
+        super(callingAction, projectDir);
+        this.setUpBuildCredentialsWithProfileNameFromFlag = setUpBuildCredentialsWithProfileNameFromFlag;
+    }
+    async runAsync() {
+        const hasProjectContext = !!this.callingAction.projectInfo;
+        const buildProfile = hasProjectContext
+            ? await new CheckBuildProfileFlagAgainstEasJson_1.CheckBuildProfileFlagAgainstEasJson(this.projectDir, eas_build_job_1.Platform.ANDROID, this.setUpBuildCredentialsWithProfileNameFromFlag).runAsync()
+            : null;
+        let projectInfo = null;
+        if (hasProjectContext) {
+            const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
+                env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            });
+            projectInfo = { exp, projectId };
+        }
+        const ctx = new context_1.CredentialsContext({
+            projectDir: process.cwd(),
+            projectInfo,
+            user: this.callingAction.actor,
+            graphqlClient: this.callingAction.graphqlClient,
+            analytics: this.callingAction.analytics,
+            env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            nonInteractive: false,
+            vcsClient: this.callingAction.vcsClient,
+        });
+        let gradleContext;
+        if (ctx.hasProjectContext) {
+            (0, assert_1.default)(buildProfile, 'buildProfile must be defined in a project context');
+            gradleContext = await this.createProjectContextAsync(ctx, buildProfile);
+        }
+        if (this.setUpBuildCredentialsWithProfileNameFromFlag) {
+            await this.runProjectSpecificActionAsync(ctx, Actions_1.AndroidActionType.SetUpBuildCredentials, gradleContext);
+        }
+    }
+}
+exports.SetUpAndroidBuildCredentials = SetUpAndroidBuildCredentials;

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

@@ -0,0 +1,19 @@
+import { Platform } from '@expo/eas-build-job';
+import { Analytics } from '../../analytics/AnalyticsManager';
+import { DynamicConfigContextFn } from '../../commandUtils/context/DynamicProjectConfigContextField';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
+import { Actor } from '../../user/User';
+import { Client } from '../../vcs/vcs';
+import { CredentialsContextProjectInfo } from '../context';
+export declare class SetUpBuildCredentialsCommandAction {
+    readonly actor: Actor;
+    readonly graphqlClient: ExpoGraphqlClient;
+    readonly vcsClient: Client;
+    readonly analytics: Analytics;
+    readonly projectInfo: CredentialsContextProjectInfo | null;
+    readonly getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn;
+    private readonly platform;
+    private readonly profileName;
+    constructor(actor: Actor, graphqlClient: ExpoGraphqlClient, vcsClient: Client, analytics: Analytics, projectInfo: CredentialsContextProjectInfo | null, getDynamicPrivateProjectConfigAsync: DynamicConfigContextFn, platform: Platform, profileName: string);
+    runAsync(): Promise<void>;
+}

package/build/credentials/manager/SetUpBuildCredentialsCommandAction.js

@@ -0,0 +1,25 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpBuildCredentialsCommandAction = void 0;
+const eas_build_job_1 = require("@expo/eas-build-job");
+const SetUpAndroidBuildCredentials_1 = require("../manager/SetUpAndroidBuildCredentials");
+const SetUpIosBuildCredentials_1 = require("../manager/SetUpIosBuildCredentials");
+class SetUpBuildCredentialsCommandAction {
+    constructor(actor, graphqlClient, vcsClient, analytics, projectInfo, getDynamicPrivateProjectConfigAsync, platform, profileName) {
+        this.actor = actor;
+        this.graphqlClient = graphqlClient;
+        this.vcsClient = vcsClient;
+        this.analytics = analytics;
+        this.projectInfo = projectInfo;
+        this.getDynamicPrivateProjectConfigAsync = getDynamicPrivateProjectConfigAsync;
+        this.platform = platform;
+        this.profileName = profileName;
+    }
+    async runAsync() {
+        if (this.platform === eas_build_job_1.Platform.IOS) {
+            return await new SetUpIosBuildCredentials_1.SetUpIosBuildCredentials(this, process.cwd(), this.profileName).runAsync();
+        }
+        return await new SetUpAndroidBuildCredentials_1.SetUpAndroidBuildCredentials(this, process.cwd(), this.profileName).runAsync();
+    }
+}
+exports.SetUpBuildCredentialsCommandAction = SetUpBuildCredentialsCommandAction;

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

@@ -0,0 +1,7 @@
+import { Action } from './HelperActions';
+import { ManageIos } from './ManageIos';
+export declare class SetUpIosBuildCredentials extends ManageIos {
+    private setUpBuildCredentialsWithProfileNameFromFlag;
+    constructor(callingAction: Action, projectDir: string, setUpBuildCredentialsWithProfileNameFromFlag: string);
+    runAsync(): Promise<void>;
+}

package/build/credentials/manager/SetUpIosBuildCredentials.js

@@ -0,0 +1,58 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.SetUpIosBuildCredentials = void 0;
+const tslib_1 = require("tslib");
+const eas_build_job_1 = require("@expo/eas-build-job");
+const assert_1 = tslib_1.__importDefault(require("assert"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
+const Actions_1 = require("./Actions");
+const CheckBuildProfileFlagAgainstEasJson_1 = require("./CheckBuildProfileFlagAgainstEasJson");
+const ManageIos_1 = require("./ManageIos");
+const projectUtils_1 = require("../../project/projectUtils");
+const actions_1 = require("../../user/actions");
+const context_1 = require("../context");
+class SetUpIosBuildCredentials extends ManageIos_1.ManageIos {
+    constructor(callingAction, projectDir, setUpBuildCredentialsWithProfileNameFromFlag) {
+        super(callingAction, projectDir);
+        this.setUpBuildCredentialsWithProfileNameFromFlag = setUpBuildCredentialsWithProfileNameFromFlag;
+    }
+    async runAsync() {
+        const buildProfile = this.callingAction.projectInfo
+            ? await new CheckBuildProfileFlagAgainstEasJson_1.CheckBuildProfileFlagAgainstEasJson(this.projectDir, eas_build_job_1.Platform.IOS, this.setUpBuildCredentialsWithProfileNameFromFlag).runAsync()
+            : null;
+        let projectInfo = null;
+        if (this.callingAction.projectInfo) {
+            const { exp, projectId } = await this.callingAction.getDynamicPrivateProjectConfigAsync({
+                env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            });
+            projectInfo = { exp, projectId };
+        }
+        const ctx = new context_1.CredentialsContext({
+            projectDir: process.cwd(),
+            projectInfo,
+            user: this.callingAction.actor,
+            graphqlClient: this.callingAction.graphqlClient,
+            analytics: this.callingAction.analytics,
+            env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            nonInteractive: false,
+            vcsClient: this.callingAction.vcsClient,
+        });
+        await ctx.bestEffortAppStoreAuthenticateAsync();
+        const getAccountForProjectAsync = async (projectId) => {
+            return await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(ctx.graphqlClient, projectId);
+        };
+        const account = ctx.hasProjectContext
+            ? await getAccountForProjectAsync(ctx.projectId)
+            : (0, actions_1.ensureActorHasPrimaryAccount)(ctx.user);
+        let app = null;
+        let targets = null;
+        if (ctx.hasProjectContext) {
+            (0, assert_1.default)(buildProfile, 'buildProfile must be defined in project context');
+            const projectContext = await this.createProjectContextAsync(ctx, account, buildProfile);
+            app = projectContext.app;
+            targets = projectContext.targets;
+        }
+        await this.runProjectSpecificActionAsync(ctx, (0, nullthrows_1.default)(app, 'app must be defined in project context'), (0, nullthrows_1.default)(targets, 'targets must be defined in project context'), (0, nullthrows_1.default)(buildProfile, 'buildProfile must be defined in project context'), Actions_1.IosActionType.SetUpBuildCredentials);
+    }
+}
+exports.SetUpIosBuildCredentials = SetUpIosBuildCredentials;

package/build/devices/utils/formatDevice.js

@@ -8,6 +8,7 @@ const DEVICE_CLASS_DISPLAY_NAMES = {
     [generated_1.AppleDeviceClass.Iphone]: 'iPhone',
     [generated_1.AppleDeviceClass.Ipad]: 'iPad',
     [generated_1.AppleDeviceClass.Mac]: 'Mac',
+    [generated_1.AppleDeviceClass.Unknown]: 'Unknown',
 };
 function formatDeviceClass(device) {
     if (!device.deviceClass || !DEVICE_CLASS_DISPLAY_NAMES[device.deviceClass]) {