eas-cli 2.0.0 → 2.2.0

package/build/credentials/ios/appstore/AppStoreApi.d.ts

@@ -1,6 +1,9 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { ProfileType } from '@expo/app-store';
 import { AscApiKey, AscApiKeyInfo, DistributionCertificate, DistributionCertificateStoreInfo, ProvisioningProfile, ProvisioningProfileStoreInfo, PushKey, PushKeyStoreInfo } from './Credentials.types';
 import { Options as AuthenticateOptions } from './authenticate';
 import { AuthCtx, AuthenticationMode, UserAuthCtx } from './authenticateTypes';
+import { ApplePlatform } from './constants';
 import { AppLookupParams, IosCapabilitiesOptions } from './ensureAppExists';
 import { ProfileClass } from './provisioningProfile';
 export default class AppStoreApi {
@@ -17,10 +20,10 @@ export default class AppStoreApi {
     createPushKeyAsync(name?: string): Promise<PushKey>;
     revokePushKeyAsync(ids: string[]): Promise<void>;
     useExistingProvisioningProfileAsync(bundleIdentifier: string, provisioningProfile: ProvisioningProfile, distCert: DistributionCertificate): Promise<ProvisioningProfile>;
-    listProvisioningProfilesAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
-    createProvisioningProfileAsync(bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
-    revokeProvisioningProfileAsync(bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
-    createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
+    listProvisioningProfilesAsync(bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
+    createProvisioningProfileAsync(bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
+    revokeProvisioningProfileAsync(bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<void>;
+    createOrReuseAdhocProvisioningProfileAsync(udids: string[], bundleIdentifier: string, distCertSerialNumber: string, profileType: ProfileType): Promise<ProvisioningProfile>;
     listAscApiKeysAsync(): Promise<AscApiKeyInfo[]>;
     getAscApiKeyAsync(keyId: string): Promise<AscApiKeyInfo | null>;
     createAscApiKeyAsync({ nickname }: {

package/build/credentials/ios/appstore/AppStoreApi.js

@@ -69,21 +69,21 @@ class AppStoreApi {
         const ctx = await this.ensureAuthenticatedAsync();
         return await (0, provisioningProfile_1.useExistingProvisioningProfileAsync)(ctx, bundleIdentifier, provisioningProfile, distCert);
     }
-    async listProvisioningProfilesAsync(bundleIdentifier, profileClass) {
+    async listProvisioningProfilesAsync(bundleIdentifier, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.listProvisioningProfilesAsync)(ctx, bundleIdentifier, profileClass);
+        return await (0, provisioningProfile_1.listProvisioningProfilesAsync)(ctx, bundleIdentifier, applePlatform, profileClass);
     }
-    async createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, profileClass) {
+    async createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.createProvisioningProfileAsync)(ctx, bundleIdentifier, distCert, profileName, profileClass);
+        return await (0, provisioningProfile_1.createProvisioningProfileAsync)(ctx, bundleIdentifier, distCert, profileName, applePlatform, profileClass);
     }
-    async revokeProvisioningProfileAsync(bundleIdentifier, profileClass) {
+    async revokeProvisioningProfileAsync(bundleIdentifier, applePlatform, profileClass) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfile_1.revokeProvisioningProfileAsync)(ctx, bundleIdentifier, profileClass);
+        return await (0, provisioningProfile_1.revokeProvisioningProfileAsync)(ctx, bundleIdentifier, applePlatform, profileClass);
     }
-    async createOrReuseAdhocProvisioningProfileAsync(udids, bundleIdentifier, distCertSerialNumber) {
+    async createOrReuseAdhocProvisioningProfileAsync(udids, bundleIdentifier, distCertSerialNumber, profileType) {
         const ctx = await this.ensureAuthenticatedAsync();
-        return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber);
+        return await (0, provisioningProfileAdhoc_1.createOrReuseAdhocProvisioningProfileAsync)(ctx, udids, bundleIdentifier, distCertSerialNumber, profileType);
     }
     async listAscApiKeysAsync() {
         const userCtx = await this.ensureUserAuthenticatedAsync();

package/build/credentials/ios/appstore/Credentials.types.d.ts

@@ -1,19 +1,5 @@
 /// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { UserRole } from '@expo/apple-utils';
-export interface Device {
-    id: string;
-    teamId: string;
-    identifier: string;
-    name?: string;
-    model?: string;
-    deviceClass?: DeviceClass;
-    softwareVersion?: string;
-    enabled: boolean;
-}
-export declare enum DeviceClass {
-    IPHONE = "iphone",
-    IPAD = "ipad"
-}
 export interface DistributionCertificateStoreInfo {
     id: string;
     name: string;

package/build/credentials/ios/appstore/Credentials.types.js

@@ -1,8 +1,2 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.DeviceClass = void 0;
-var DeviceClass;
-(function (DeviceClass) {
-    DeviceClass["IPHONE"] = "iphone";
-    DeviceClass["IPAD"] = "ipad";
-})(DeviceClass = exports.DeviceClass || (exports.DeviceClass = {}));

package/build/credentials/ios/appstore/constants.d.ts

@@ -0,0 +1 @@
+export { Platform as ApplePlatform } from '@expo/apple-utils';

package/build/credentials/ios/appstore/constants.js

@@ -0,0 +1,6 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ApplePlatform = void 0;
+// Renamed to avoid conflation with Android/iOS/Web Platform constants
+var apple_utils_1 = require("@expo/apple-utils");
+Object.defineProperty(exports, "ApplePlatform", { enumerable: true, get: function () { return apple_utils_1.Platform; } });

package/build/credentials/ios/appstore/distributionCertificate.js

@@ -21,7 +21,7 @@ async function getDistributionCertificateAsync(context, serialNumber) {
     const certificates = await apple_utils_1.Certificate.getAsync(context, {
         query: {
             filter: {
-                certificateType: apple_utils_1.CertificateType.IOS_DISTRIBUTION,
+                certificateType: [apple_utils_1.CertificateType.IOS_DISTRIBUTION, apple_utils_1.CertificateType.DISTRIBUTION],
             },
         },
     });

package/build/credentials/ios/appstore/provisioningProfile.d.ts

@@ -1,10 +1,12 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
 import { DistributionCertificate, ProvisioningProfile, ProvisioningProfileStoreInfo } from './Credentials.types';
 import { AuthCtx } from './authenticateTypes';
+import { ApplePlatform } from './constants';
 export declare enum ProfileClass {
     Adhoc = "ad_hoc",
     General = "general"
 }
 export declare function useExistingProvisioningProfileAsync(authCtx: AuthCtx, bundleIdentifier: string, provisioningProfile: ProvisioningProfile, distCert: DistributionCertificate): Promise<ProvisioningProfile>;
-export declare function listProvisioningProfilesAsync(authCtx: AuthCtx, bundleIdentifier: string, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
-export declare function createProvisioningProfileAsync(authCtx: AuthCtx, bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
-export declare function revokeProvisioningProfileAsync(authCtx: AuthCtx, bundleIdentifier: string, profileClass?: ProfileClass): Promise<void>;
+export declare function listProvisioningProfilesAsync(authCtx: AuthCtx, bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfileStoreInfo[]>;
+export declare function createProvisioningProfileAsync(authCtx: AuthCtx, bundleIdentifier: string, distCert: DistributionCertificate, profileName: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<ProvisioningProfile>;
+export declare function revokeProvisioningProfileAsync(authCtx: AuthCtx, bundleIdentifier: string, applePlatform: ApplePlatform, profileClass?: ProfileClass): Promise<void>;

package/build/credentials/ios/appstore/provisioningProfile.js

@@ -7,13 +7,36 @@ const authType_1 = require("../utils/authType");
 const p12Certificate_1 = require("../utils/p12Certificate");
 const authenticate_1 = require("./authenticate");
 const bundleId_1 = require("./bundleId");
+const constants_1 = require("./constants");
 const distributionCertificate_1 = require("./distributionCertificate");
 var ProfileClass;
 (function (ProfileClass) {
     ProfileClass["Adhoc"] = "ad_hoc";
     ProfileClass["General"] = "general";
 })(ProfileClass = exports.ProfileClass || (exports.ProfileClass = {}));
-function resolveProfileType(profileClass, isEnterprise) {
+function resolveProfileType(applePlatform, profileClass, isEnterprise) {
+    switch (applePlatform) {
+        case constants_1.ApplePlatform.IOS:
+            return resolveProfileTypeIos(profileClass, isEnterprise);
+        case constants_1.ApplePlatform.TV_OS:
+            return resolveProfileTypeAppleTv(profileClass, isEnterprise);
+        case constants_1.ApplePlatform.MAC_OS:
+            throw new Error(`${applePlatform} profiles are not supported`);
+    }
+}
+function resolveProfileTypeAppleTv(profileClass, isEnterprise) {
+    if (isEnterprise) {
+        return profileClass === ProfileClass.Adhoc
+            ? apple_utils_1.ProfileType.TVOS_APP_ADHOC
+            : apple_utils_1.ProfileType.TVOS_APP_INHOUSE;
+    }
+    else {
+        return profileClass === ProfileClass.Adhoc
+            ? apple_utils_1.ProfileType.TVOS_APP_ADHOC
+            : apple_utils_1.ProfileType.TVOS_APP_STORE;
+    }
+}
+function resolveProfileTypeIos(profileClass, isEnterprise) {
     if (isEnterprise) {
         return profileClass === ProfileClass.Adhoc
             ? apple_utils_1.ProfileType.IOS_APP_ADHOC
@@ -95,11 +118,11 @@ async function useExistingProvisioningProfileAsync(authCtx, bundleIdentifier, pr
     }
 }
 exports.useExistingProvisioningProfileAsync = useExistingProvisioningProfileAsync;
-async function listProvisioningProfilesAsync(authCtx, bundleIdentifier, profileClass = ProfileClass.General) {
+async function listProvisioningProfilesAsync(authCtx, bundleIdentifier, applePlatform, profileClass = ProfileClass.General) {
     const spinner = (0, ora_1.ora)(`Fetching Apple provisioning profiles`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
-        const profileType = resolveProfileType(profileClass, authCtx.team.inHouse);
+        const profileType = resolveProfileType(applePlatform, profileClass, authCtx.team.inHouse);
         const profiles = (await (0, bundleId_1.getProfilesForBundleIdAsync)(context, bundleIdentifier)).filter(profile => profile.attributes.profileType === profileType);
         const result = await Promise.all(profiles.map(profile => transformProfileAsync(profile, authCtx)));
         spinner.succeed(`Fetched Apple provisioning profiles`);
@@ -111,14 +134,14 @@ async function listProvisioningProfilesAsync(authCtx, bundleIdentifier, profileC
     }
 }
 exports.listProvisioningProfilesAsync = listProvisioningProfilesAsync;
-async function createProvisioningProfileAsync(authCtx, bundleIdentifier, distCert, profileName, profileClass = ProfileClass.General) {
+async function createProvisioningProfileAsync(authCtx, bundleIdentifier, distCert, profileName, applePlatform, profileClass = ProfileClass.General) {
     const spinner = (0, ora_1.ora)(`Creating Apple provisioning profile`).start();
     try {
         if (!distCert.distCertSerialNumber) {
             distCert.distCertSerialNumber = (0, p12Certificate_1.findP12CertSerialNumber)(distCert.certP12, distCert.certPassword);
         }
         const context = (0, authenticate_1.getRequestContext)(authCtx);
-        const profileType = resolveProfileType(profileClass, authCtx.team.inHouse);
+        const profileType = resolveProfileType(applePlatform, profileClass, authCtx.team.inHouse);
         const certificate = await (0, distributionCertificate_1.getCertificateBySerialNumberAsync)(context, distCert.distCertSerialNumber);
         const bundleIdItem = await (0, bundleId_1.getBundleIdForIdentifierAsync)(context, bundleIdentifier);
         const profile = await apple_utils_1.Profile.createAsync(context, {
@@ -138,12 +161,12 @@ async function createProvisioningProfileAsync(authCtx, bundleIdentifier, distCer
     }
 }
 exports.createProvisioningProfileAsync = createProvisioningProfileAsync;
-async function revokeProvisioningProfileAsync(authCtx, bundleIdentifier, profileClass = ProfileClass.General) {
+async function revokeProvisioningProfileAsync(authCtx, bundleIdentifier, applePlatform, profileClass = ProfileClass.General) {
     const spinner = (0, ora_1.ora)(`Revoking Apple provisioning profile`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
         const profiles = await (0, bundleId_1.getProfilesForBundleIdAsync)(context, bundleIdentifier);
-        const profileType = resolveProfileType(profileClass, authCtx.team.inHouse);
+        const profileType = resolveProfileType(applePlatform, profileClass, authCtx.team.inHouse);
         await Promise.all(profiles
             .filter(profile => profile.attributes.profileType === profileType)
             .map(profile => apple_utils_1.Profile.deleteAsync(context, { id: profile.id })));

package/build/credentials/ios/appstore/provisioningProfileAdhoc.d.ts

@@ -1,3 +1,5 @@
+/// <reference types="@expo/apple-utils/ts-declarations/expo__app-store" />
+import { ProfileType } from '@expo/apple-utils';
 import { ProvisioningProfile } from './Credentials.types';
 import { AuthCtx } from './authenticateTypes';
-export declare function createOrReuseAdhocProvisioningProfileAsync(authCtx: AuthCtx, udids: string[], bundleIdentifier: string, distCertSerialNumber: string): Promise<ProvisioningProfile>;
+export declare function createOrReuseAdhocProvisioningProfileAsync(authCtx: AuthCtx, udids: string[], bundleIdentifier: string, distCertSerialNumber: string, profileType: ProfileType): Promise<ProvisioningProfile>;

package/build/credentials/ios/appstore/provisioningProfileAdhoc.js

@@ -12,8 +12,8 @@ function uniqueItems(items) {
     return [...set];
 }
 async function registerMissingDevicesAsync(context, udids) {
-    const allIosProfileDevices = await apple_utils_1.Device.getAllIOSProfileDevicesAsync(context);
-    const alreadyAdded = allIosProfileDevices.filter(device => udids.includes(device.attributes.udid));
+    const allDevices = await apple_utils_1.Device.getAsync(context);
+    const alreadyAdded = allDevices.filter(device => udids.includes(device.attributes.udid));
     const alreadyAddedUdids = alreadyAdded.map(i => i.attributes.udid);
     await Promise.all(udids.map(async (udid) => {
         if (!alreadyAddedUdids.includes(udid)) {
@@ -26,9 +26,9 @@ async function registerMissingDevicesAsync(context, udids) {
     }));
     return alreadyAdded;
 }
-async function findProfileByBundleIdAsync(context, bundleId, certSerialNumber) {
+async function findProfileAsync(context, { bundleId, certSerialNumber, profileType, }) {
     const expoProfiles = (await (0, bundleId_1.getProfilesForBundleIdAsync)(context, bundleId)).filter(profile => {
-        return (profile.attributes.profileType === apple_utils_1.ProfileType.IOS_APP_ADHOC &&
+        return (profile.attributes.profileType === profileType &&
             profile.attributes.name.startsWith('*[expo]') &&
             profile.attributes.profileState !== apple_utils_1.ProfileState.EXPIRED);
     });
@@ -79,7 +79,7 @@ async function findProfileByIdAsync(context, profileId, bundleId) {
     profiles = profiles.filter(profile => profile.attributes.profileType === apple_utils_1.ProfileType.IOS_APP_ADHOC);
     return (_a = profiles.find(profile => profile.id === profileId)) !== null && _a !== void 0 ? _a : null;
 }
-async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNumber, profileId, }) {
+async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNumber, profileId, profileType, }) {
     var _a, _b, _c, _d, _e;
     // We register all missing devices on the Apple Developer Portal. They are identified by UDIDs.
     const devices = await registerMissingDevicesAsync(context, udids);
@@ -94,7 +94,7 @@ async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNu
     }
     else {
         // If no profile id is passed, try to find a suitable provisioning profile for the App ID.
-        const results = await findProfileByBundleIdAsync(context, bundleId, certSerialNumber);
+        const results = await findProfileAsync(context, { bundleId, certSerialNumber, profileType });
         existingProfile = results.profile;
         didUpdate = results.didUpdate;
     }
@@ -126,8 +126,7 @@ async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNu
             // This method does not support App Store Connect API.
             await existingProfile.regenerateAsync();
         }
-        const updatedProfile = (await findProfileByBundleIdAsync(context, bundleId, certSerialNumber))
-            .profile;
+        const updatedProfile = (await findProfileAsync(context, { bundleId, certSerialNumber, profileType })).profile;
         if (!updatedProfile) {
             throw new Error(`Failed to locate updated profile for bundle identifier "${bundleId}" and serial number "${certSerialNumber}"`);
         }
@@ -153,7 +152,7 @@ async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNu
         name: `*[expo] ${bundleId} AdHoc ${Date.now()}`,
         certificates: [distributionCertificate.id],
         devices: devices.map(device => device.id),
-        profileType: apple_utils_1.ProfileType.IOS_APP_ADHOC,
+        profileType,
     });
     return {
         didUpdate: true,
@@ -163,7 +162,7 @@ async function manageAdHocProfilesAsync(context, { udids, bundleId, certSerialNu
         provisioningProfile: newProfile.attributes.profileContent,
     };
 }
-async function createOrReuseAdhocProvisioningProfileAsync(authCtx, udids, bundleIdentifier, distCertSerialNumber) {
+async function createOrReuseAdhocProvisioningProfileAsync(authCtx, udids, bundleIdentifier, distCertSerialNumber, profileType) {
     const spinner = (0, ora_1.ora)(`Handling Apple ad hoc provisioning profiles`).start();
     try {
         const context = (0, authenticate_1.getRequestContext)(authCtx);
@@ -171,6 +170,7 @@ async function createOrReuseAdhocProvisioningProfileAsync(authCtx, udids, bundle
             udids,
             bundleId: bundleIdentifier,
             certSerialNumber: distCertSerialNumber,
+            profileType,
         });
         if (didCreate) {
             spinner.succeed(`Created new profile: ${profileName}`);

package/build/credentials/ios/types.d.ts

@@ -1,9 +1,8 @@
 import { JSONObject } from '@expo/json-file';
 import type { XCBuildConfiguration } from 'xcode';
-import { CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment } from '../../graphql/generated';
-import { Account } from '../../user/Account';
+import { AccountFragment, CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment } from '../../graphql/generated';
 export interface App {
-    account: Account;
+    account: AccountFragment;
     projectName: string;
 }
 export interface Target {

package/build/credentials/ios/utils/printCredentials.d.ts

@@ -1,4 +1,4 @@
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { App, IosAppBuildCredentialsMap, IosAppCredentialsMap, Target } from '../types';
 export declare function displayEmptyIosCredentials(appLookupParams: AppLookupParams): void;
 export declare function displayIosCredentials(app: App, appCredentialsMap: IosAppCredentialsMap, targets: Target[]): void;

package/build/credentials/ios/validators/validateProvisioningProfile.d.ts

@@ -1,4 +1,5 @@
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
-export declare function validateProvisioningProfileAsync(ctx: CredentialsContext, app: AppLookupParams, buildCredentials: Partial<IosAppBuildCredentialsFragment> | null): Promise<boolean>;
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
+import { Target } from '../types';
+export declare function validateProvisioningProfileAsync(ctx: CredentialsContext, target: Target, app: AppLookupParams, buildCredentials: Partial<IosAppBuildCredentialsFragment> | null): Promise<boolean>;

package/build/credentials/ios/validators/validateProvisioningProfile.js

@@ -8,10 +8,11 @@ const minimatch_1 = tslib_1.__importDefault(require("minimatch"));
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const generated_1 = require("../../../graphql/generated");
 const log_1 = tslib_1.__importDefault(require("../../../log"));
+const target_1 = require("../../../project/ios/target");
 const provisioningProfile_1 = require("../appstore/provisioningProfile");
 const p12Certificate_1 = require("../utils/p12Certificate");
 const provisioningProfile_2 = require("../utils/provisioningProfile");
-async function validateProvisioningProfileAsync(ctx, app, buildCredentials) {
+async function validateProvisioningProfileAsync(ctx, target, app, buildCredentials) {
     if (!buildCredentials ||
         !buildCredentials.distributionCertificate ||
         !buildCredentials.provisioningProfile) {
@@ -25,7 +26,7 @@ async function validateProvisioningProfileAsync(ctx, app, buildCredentials) {
         log_1.default.warn("Skipping Provisioning Profile validation on Apple Servers because we aren't authenticated.");
         return true;
     }
-    return await validateProvisioningProfileWithAppleAsync(ctx, app, buildCredentials);
+    return await validateProvisioningProfileWithAppleAsync(ctx, target, app, buildCredentials);
 }
 exports.validateProvisioningProfileAsync = validateProvisioningProfileAsync;
 function validateProvisioningProfileWithoutApple(app, { provisioningProfile, distributionCertificate }) {
@@ -59,10 +60,11 @@ function validateProvisioningProfileWithoutApple(app, { provisioningProfile, dis
     }
     return true;
 }
-async function validateProvisioningProfileWithAppleAsync(ctx, app, buildCredentials) {
+async function validateProvisioningProfileWithAppleAsync(ctx, target, app, buildCredentials) {
     (0, assert_1.default)(buildCredentials.provisioningProfile, 'Provisioning Profile must be defined');
     const { developerPortalIdentifier, provisioningProfile } = buildCredentials.provisioningProfile;
-    const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(app.bundleIdentifier, buildCredentials.iosDistributionType === generated_1.IosDistributionType.AdHoc
+    const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(target);
+    const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(app.bundleIdentifier, applePlatform, buildCredentials.iosDistributionType === generated_1.IosDistributionType.AdHoc
         ? provisioningProfile_1.ProfileClass.Adhoc
         : provisioningProfile_1.ProfileClass.General);
     const configuredProfileFromApple = profilesFromApple.find(appleProfile => developerPortalIdentifier

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

@@ -1,5 +1,8 @@
-import { CredentialsContext } from '../context';
+import { Actor } from '../../user/User';
+import { CredentialsContext, CredentialsContextProjectInfo } from '../context';
 export interface Action<T = void> {
+    actor: Actor;
+    projectInfo: CredentialsContextProjectInfo | null;
     runAsync(ctx: CredentialsContext): Promise<T>;
 }
 export declare class PressAnyKeyToContinue {

package/build/credentials/manager/ManageAndroid.js

@@ -6,10 +6,7 @@ const eas_build_job_1 = require("@expo/eas-build-job");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const log_1 = tslib_1.__importStar(require("../../log"));
 const gradle_1 = require("../../project/android/gradle");
-const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const Account_1 = require("../../user/Account");
-const actions_1 = require("../../user/actions");
 const AssignFcm_1 = require("../android/actions/AssignFcm");
 const AssignGoogleServiceAccountKey_1 = require("../android/actions/AssignGoogleServiceAccountKey");
 const BuildCredentialsUtils_1 = require("../android/actions/BuildCredentialsUtils");
@@ -37,22 +34,17 @@ class ManageAndroid {
         this.projectDir = projectDir;
     }
     async runAsync(currentActions = AndroidActions_1.highLevelActions) {
-        const hasProjectContext = !!context_1.CredentialsContext.getExpoConfigInProject(this.projectDir);
+        const hasProjectContext = !!this.callingAction.projectInfo;
         const buildProfile = hasProjectContext
             ? await new SelectBuildProfileFromEasJson_1.SelectBuildProfileFromEasJson(this.projectDir, eas_build_job_1.Platform.ANDROID).runAsync()
             : null;
         const ctx = new context_1.CredentialsContext({
             projectDir: process.cwd(),
-            user: await (0, actions_1.ensureLoggedInAsync)(),
+            projectInfo: this.callingAction.projectInfo,
+            user: this.callingAction.actor,
             env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            nonInteractive: false,
         });
-        const accountName = ctx.hasProjectContext
-            ? (0, projectUtils_1.getProjectAccountName)(ctx.exp, ctx.user)
-            : (0, actions_1.ensureActorHasUsername)(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}`);
-        }
         let gradleContext;
         if (ctx.hasProjectContext) {
             (0, assert_1.default)(buildProfile, 'buildProfile must be defined in a project context');
@@ -127,8 +119,6 @@ class ManageAndroid {
     }
     async createProjectContextAsync(ctx, buildProfile) {
         (0, assert_1.default)(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-        // ensure the project exists on the EAS server
-        await (0, projectUtils_1.getProjectIdAsync)(ctx.exp);
         return await (0, gradle_1.resolveGradleBuildContextAsync)(ctx.projectDir, buildProfile);
     }
     async runProjectSpecificActionAsync(ctx, action, gradleContext) {

package/build/credentials/manager/ManageIos.js

@@ -11,7 +11,6 @@ const scheme_1 = require("../../project/ios/scheme");
 const target_1 = require("../../project/ios/target");
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
-const Account_1 = require("../../user/Account");
 const actions_1 = require("../../user/actions");
 const context_1 = require("../context");
 const AscApiKeyUtils_1 = require("../ios/actions/AscApiKeyUtils");
@@ -46,26 +45,26 @@ class ManageIos {
         this.projectDir = projectDir;
     }
     async runAsync(currentActions = IosActions_1.highLevelActions) {
-        const hasProjectContext = !!context_1.CredentialsContext.getExpoConfigInProject(this.projectDir);
-        const buildProfile = hasProjectContext
+        const buildProfile = this.callingAction.projectInfo
             ? await new SelectBuildProfileFromEasJson_1.SelectBuildProfileFromEasJson(this.projectDir, eas_build_job_1.Platform.IOS).runAsync()
             : null;
         const ctx = new context_1.CredentialsContext({
             projectDir: process.cwd(),
-            user: await (0, actions_1.ensureLoggedInAsync)(),
+            projectInfo: this.callingAction.projectInfo,
+            user: this.callingAction.actor,
             env: buildProfile === null || buildProfile === void 0 ? void 0 : buildProfile.env,
+            nonInteractive: false,
         });
         const buildCredentialsActions = (0, IosActions_1.getBuildCredentialsActions)(ctx);
         const pushKeyActions = (0, IosActions_1.getPushKeyActions)(ctx);
         const ascApiKeyActions = (0, IosActions_1.getAscApiKeyActions)(ctx);
         await ctx.bestEffortAppStoreAuthenticateAsync();
-        const accountName = ctx.hasProjectContext
-            ? (0, projectUtils_1.getProjectAccountName)(ctx.exp, ctx.user)
-            : (0, actions_1.ensureActorHasUsername)(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 getAccountForProjectAsync = async (projectId) => {
+            return await (0, projectUtils_1.getOwnerAccountForProjectIdAsync)(projectId);
+        };
+        const account = ctx.hasProjectContext
+            ? await getAccountForProjectAsync(ctx.projectId)
+            : (0, actions_1.ensureActorHasPrimaryAccount)(ctx.user);
         let app = null;
         let targets = null;
         if (ctx.hasProjectContext) {
@@ -80,7 +79,7 @@ class ManageIos {
                     (0, assert_1.default)(targets && app);
                     const iosAppCredentialsMap = {};
                     for (const target of targets) {
-                        const appLookupParams = (0, BuildCredentialsUtils_1.getAppLookupParamsFromContext)(ctx, target);
+                        const appLookupParams = await (0, BuildCredentialsUtils_1.getAppLookupParamsFromContextAsync)(ctx, target);
                         iosAppCredentialsMap[target.targetName] =
                             await ctx.ios.getIosAppCredentialsWithCommonFieldsAsync(appLookupParams);
                     }
@@ -147,8 +146,6 @@ class ManageIos {
     }
     async createProjectContextAsync(ctx, account, buildProfile) {
         (0, assert_1.default)(ctx.hasProjectContext, 'createProjectContextAsync: must have project context.');
-        // ensure the project exists on the EAS server
-        await (0, projectUtils_1.getProjectIdAsync)(ctx.exp);
         const app = { account, projectName: ctx.exp.slug };
         const xcodeBuildContext = await (0, scheme_1.resolveXcodeBuildContextAsync)({
             projectDir: ctx.projectDir,
@@ -207,14 +204,14 @@ class ManageIos {
             return;
         }
         const target = await this.selectTargetAsync(targets);
-        const appLookupParams = (0, BuildCredentialsUtils_1.getAppLookupParamsFromContext)(ctx, target);
+        const appLookupParams = await (0, BuildCredentialsUtils_1.getAppLookupParamsFromContextAsync)(ctx, target);
         switch (action) {
             case Actions_1.IosActionType.UseExistingDistributionCertificate: {
                 const distCert = await (0, DistributionCertificateUtils_1.selectValidDistributionCertificateAsync)(ctx, appLookupParams);
                 if (!distCert) {
                     return;
                 }
-                await this.setupProvisioningProfileWithSpecificDistCertAsync(ctx, appLookupParams, distCert, distributionType);
+                await this.setupProvisioningProfileWithSpecificDistCertAsync(ctx, target, appLookupParams, distCert, distributionType);
                 return;
             }
             case Actions_1.IosActionType.CreateDistributionCertificate: {
@@ -223,7 +220,7 @@ class ManageIos {
                     message: `Do you want ${appLookupParams.projectName} to use the new Distribution Certificate?`,
                 });
                 if (confirm) {
-                    await this.setupProvisioningProfileWithSpecificDistCertAsync(ctx, appLookupParams, distCert, distributionType);
+                    await this.setupProvisioningProfileWithSpecificDistCertAsync(ctx, target, appLookupParams, distCert, distributionType);
                 }
                 return;
             }
@@ -297,14 +294,17 @@ class ManageIos {
                 throw new Error('Unknown action selected');
         }
     }
-    async setupProvisioningProfileWithSpecificDistCertAsync(ctx, appLookupParams, distCert, distributionType) {
+    async setupProvisioningProfileWithSpecificDistCertAsync(ctx, target, appLookupParams, distCert, distributionType) {
         log_1.default.log(`Setting up ${appLookupParams.projectName} to use Distribution Certificate`);
         log_1.default.log(`Creating provisioning profile...`);
         if (distributionType === generated_1.IosDistributionType.AdHoc) {
-            return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile(appLookupParams).runWithDistributionCertificateAsync(ctx, distCert);
+            return await new SetUpAdhocProvisioningProfile_1.SetUpAdhocProvisioningProfile({
+                app: appLookupParams,
+                target,
+            }).runWithDistributionCertificateAsync(ctx, distCert);
         }
         else {
-            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(appLookupParams, distributionType).createAndAssignProfileAsync(ctx, distCert);
+            return await new SetUpProvisioningProfile_1.SetUpProvisioningProfile(appLookupParams, target, distributionType).createAndAssignProfileAsync(ctx, distCert);
         }
     }
     async selectTargetAsync(targets) {

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

@@ -2,7 +2,7 @@ import { Platform } from '@expo/eas-build-job';
 import { BuildProfile } from '@expo/eas-json';
 export declare class SelectBuildProfileFromEasJson<T extends Platform> {
     private platform;
-    private easJsonReader;
+    private easJsonAccessor;
     constructor(projectDir: string, platform: T);
     runAsync(): Promise<BuildProfile<T>>;
     getProfileNameFromEasConfigAsync(): Promise<string>;

package/build/credentials/manager/SelectBuildProfileFromEasJson.js

@@ -8,16 +8,16 @@ const prompts_1 = require("../../prompts");
 class SelectBuildProfileFromEasJson {
     constructor(projectDir, platform) {
         this.platform = platform;
-        this.easJsonReader = new eas_json_1.EasJsonReader(projectDir);
+        this.easJsonAccessor = new eas_json_1.EasJsonAccessor(projectDir);
     }
     async runAsync() {
         const profileName = await this.getProfileNameFromEasConfigAsync();
-        const easConfig = await this.easJsonReader.getBuildProfileAsync(this.platform, profileName);
+        const easConfig = await eas_json_1.EasJsonUtils.getBuildProfileAsync(this.easJsonAccessor, this.platform, profileName);
         log_1.default.succeed(`Using build profile: ${profileName}`);
         return easConfig;
     }
     async getProfileNameFromEasConfigAsync() {
-        const buildProfileNames = await this.easJsonReader.getBuildProfileNamesAsync();
+        const buildProfileNames = await eas_json_1.EasJsonUtils.getBuildProfileNamesAsync(this.easJsonAccessor);
         if (buildProfileNames.length === 0) {
             throw new Error('You need at least one iOS build profile declared in eas.json. Go to https://docs.expo.dev/build/eas-json/ for more details');
         }

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

@@ -1,5 +1,9 @@
+import { Actor } from '../../user/User';
+import { CredentialsContextProjectInfo } from '../context';
 export declare class SelectPlatform {
+    readonly actor: Actor;
+    readonly projectInfo: CredentialsContextProjectInfo | null;
     private readonly flagPlatform?;
-    constructor(flagPlatform?: string | undefined);
+    constructor(actor: Actor, projectInfo: CredentialsContextProjectInfo | null, flagPlatform?: string | undefined);
     runAsync(): Promise<void>;
 }

package/build/credentials/manager/SelectPlatform.js

@@ -5,15 +5,17 @@ const platform_1 = require("../../platform");
 const ManageAndroid_1 = require("./ManageAndroid");
 const ManageIos_1 = require("./ManageIos");
 class SelectPlatform {
-    constructor(flagPlatform) {
+    constructor(actor, projectInfo, flagPlatform) {
+        this.actor = actor;
+        this.projectInfo = projectInfo;
         this.flagPlatform = flagPlatform;
     }
     async runAsync() {
         const platform = await (0, platform_1.selectPlatformAsync)(this.flagPlatform);
         if (platform === 'ios') {
-            return await new ManageIos_1.ManageIos(new SelectPlatform(platform), process.cwd()).runAsync();
+            return await new ManageIos_1.ManageIos(this, process.cwd()).runAsync();
         }
-        return await new ManageAndroid_1.ManageAndroid(new SelectPlatform(platform), process.cwd()).runAsync();
+        return await new ManageAndroid_1.ManageAndroid(this, process.cwd()).runAsync();
     }
 }
 exports.SelectPlatform = SelectPlatform;

package/build/devices/actions/create/action.d.ts

@@ -1,6 +1,5 @@
 import AppStoreApi from '../../../credentials/ios/appstore/AppStoreApi';
-import { AppleTeam } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AppleTeam } from '../../../graphql/generated';
 export declare enum RegistrationMethod {
     WEBSITE = 0,
     INPUT = 1,
@@ -11,7 +10,7 @@ export default class DeviceCreateAction {
     private appStoreApi;
     private account;
     private appleTeam;
-    constructor(appStoreApi: AppStoreApi, account: Account, appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>);
+    constructor(appStoreApi: AppStoreApi, account: AccountFragment, appleTeam: Pick<AppleTeam, 'appleTeamIdentifier' | 'appleTeamName' | 'id'>);
     runAsync(): Promise<RegistrationMethod>;
     private askForRegistrationMethodAsync;
 }

package/build/devices/actions/create/developerPortalMethod.js

@@ -59,9 +59,9 @@ async function findUnregisteredPortalDevicesAsync(appleAuthCtx, accountId, apple
         acc[device.identifier] = device;
         return acc;
     }, {});
-    const portalDevices = await apple_utils_1.Device.getAllIOSProfileDevicesAsync((0, authenticate_1.getRequestContext)(appleAuthCtx));
+    const portalDevices = await apple_utils_1.Device.getAsync((0, authenticate_1.getRequestContext)(appleAuthCtx));
     return portalDevices.filter(portalDevice => !(portalDevice.attributes.udid in expoRegisteredDevicesByUdid) &&
-        [apple_utils_1.DeviceClass.IPAD, apple_utils_1.DeviceClass.IPHONE].includes(portalDevice.attributes.deviceClass));
+        [apple_utils_1.DeviceClass.IPAD, apple_utils_1.DeviceClass.IPHONE, apple_utils_1.DeviceClass.APPLE_TV].includes(portalDevice.attributes.deviceClass));
 }
 async function chooseDevicesToImportAsync(devices) {
     const { chosenDevices } = await (0, prompts_1.promptAsync)({