eas-cli 2.1.0 → 2.2.1

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

@@ -1,5 +1,4 @@
 import { AppleTeamFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare function resolveAppleTeamIfAuthenticatedAsync(ctx: CredentialsContext, app: AppLookupParams): Promise<AppleTeamFragment | null>;
-export declare function formatAppleTeam({ appleTeamIdentifier, appleTeamName }: AppleTeamFragment): string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatAppleTeam = exports.resolveAppleTeamIfAuthenticatedAsync = void 0;
+exports.resolveAppleTeamIfAuthenticatedAsync = void 0;
 async function resolveAppleTeamIfAuthenticatedAsync(ctx, app) {
     if (!ctx.appStore.authCtx) {
         return null;
@@ -11,7 +11,3 @@ async function resolveAppleTeamIfAuthenticatedAsync(ctx, app) {
     });
 }
 exports.resolveAppleTeamIfAuthenticatedAsync = resolveAppleTeamIfAuthenticatedAsync;
-function formatAppleTeam({ appleTeamIdentifier, appleTeamName }) {
-    return `Team ID: ${appleTeamIdentifier}${appleTeamName ? `, Team name: ${appleTeamName}` : ''}`;
-}
-exports.formatAppleTeam = formatAppleTeam;

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

@@ -1,5 +1,4 @@
-import { AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AppStoreConnectApiKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { AscApiKey } from '../appstore/Credentials.types';
 import { AscApiKeyPath, MinimalAscApiKey } from '../credentials';
@@ -11,10 +10,10 @@ export declare function promptForIssuerIdAsync(): Promise<string>;
 export declare function getMinimalAscApiKeyAsync(ascApiKey: AscApiKey): Promise<MinimalAscApiKey>;
 export declare function provideOrGenerateAscApiKeyAsync(ctx: CredentialsContext, purpose: AppStoreApiKeyPurpose): Promise<MinimalAscApiKey>;
 export declare function getAscApiKeyName(purpose: AppStoreApiKeyPurpose): string;
-export declare function getAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: Account, { filterDifferentAppleTeam }?: {
+export declare function getAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: AccountFragment, { filterDifferentAppleTeam }?: {
     filterDifferentAppleTeam?: boolean;
 }): Promise<AppStoreConnectApiKeyFragment[]>;
-export declare function selectAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: Account, { filterDifferentAppleTeam }?: {
+export declare function selectAscApiKeysFromAccountAsync(ctx: CredentialsContext, account: AccountFragment, { filterDifferentAppleTeam }?: {
     filterDifferentAppleTeam?: boolean;
 }): Promise<AppStoreConnectApiKeyFragment | null>;
 export declare function sortAscApiKeysByUpdatedAtDesc(keys: AppStoreConnectApiKeyFragment[]): AppStoreConnectApiKeyFragment[];

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

@@ -12,7 +12,7 @@ const date_1 = require("../../../utils/date");
 const promptForCredentials_1 = require("../../utils/promptForCredentials");
 const credentials_1 = require("../credentials");
 const validateAscApiKey_1 = require("../validators/validateAscApiKey");
-const AppleTeamUtils_1 = require("./AppleTeamUtils");
+const AppleTeamFormatting_1 = require("./AppleTeamFormatting");
 var AppStoreApiKeyPurpose;
 (function (AppStoreApiKeyPurpose) {
     AppStoreApiKeyPurpose["SUBMISSION_SERVICE"] = "EAS Submit";
@@ -188,7 +188,7 @@ function formatAscApiKey(ascApiKey) {
         line += chalk_1.default.gray(`\n    Name: ${name}`);
     }
     if (appleTeam) {
-        line += chalk_1.default.gray(`\n    ${(0, AppleTeamUtils_1.formatAppleTeam)(appleTeam)}`);
+        line += chalk_1.default.gray(`\n    ${(0, AppleTeamFormatting_1.formatAppleTeam)(appleTeam)}`);
     }
     line += chalk_1.default.gray(`\n    Updated: ${(0, date_1.fromNow)(new Date(updatedAt))} ago`);
     return line;

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

@@ -1,6 +1,6 @@
 import { AppStoreConnectApiKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
 export declare class AssignAscApiKey {
     private app;

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

@@ -1,6 +1,6 @@
 import { ApplePushKeyFragment, CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare class AssignPushKey {
     private app;
     constructor(app: AppLookupParams);

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

@@ -1,11 +1,11 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, AppleTeamFragment, IosDistributionType as GraphQLIosDistributionType, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { App, Target } from '../types';
 export declare function getAllBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams): Promise<IosAppBuildCredentialsFragment[]>;
 export declare function getBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<IosAppBuildCredentialsFragment | null>;
 export declare function getProvisioningProfileAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleProvisioningProfileFragment | null>;
 export declare function getDistributionCertificateAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType): Promise<AppleDistributionCertificateFragment | null>;
 export declare function assignBuildCredentialsAsync(ctx: CredentialsContext, app: AppLookupParams, iosDistributionType: GraphQLIosDistributionType, distCert: AppleDistributionCertificateFragment, provisioningProfile: AppleProvisioningProfileFragment, appleTeam?: AppleTeamFragment): Promise<IosAppBuildCredentialsFragment>;
-export declare function getAppFromContext(ctx: CredentialsContext): App;
-export declare function getAppLookupParamsFromContext(ctx: CredentialsContext, target: Target): AppLookupParams;
+export declare function getAppFromContextAsync(ctx: CredentialsContext): Promise<App>;
+export declare function getAppLookupParamsFromContextAsync(ctx: CredentialsContext, target: Target): Promise<AppLookupParams>;

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

@@ -1,10 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAppLookupParamsFromContext = exports.getAppFromContext = exports.assignBuildCredentialsAsync = exports.getDistributionCertificateAsync = exports.getProvisioningProfileAsync = exports.getBuildCredentialsAsync = exports.getAllBuildCredentialsAsync = void 0;
+exports.getAppLookupParamsFromContextAsync = exports.getAppFromContextAsync = exports.assignBuildCredentialsAsync = exports.getDistributionCertificateAsync = exports.getProvisioningProfileAsync = exports.getBuildCredentialsAsync = exports.getAllBuildCredentialsAsync = void 0;
 const tslib_1 = require("tslib");
 const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const projectUtils_1 = require("../../../project/projectUtils");
-const Account_1 = require("../../../user/Account");
 const AppleTeamUtils_1 = require("./AppleTeamUtils");
 async function getAllBuildCredentialsAsync(ctx, app) {
     const appCredentials = await ctx.ios.getIosAppCredentialsWithBuildCredentialsAsync(app, {});
@@ -49,22 +48,19 @@ async function assignBuildCredentialsAsync(ctx, app, iosDistributionType, distCe
     });
 }
 exports.assignBuildCredentialsAsync = assignBuildCredentialsAsync;
-function getAppFromContext(ctx) {
+async function getAppFromContextAsync(ctx) {
     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);
     return {
         account,
         projectName,
     };
 }
-exports.getAppFromContext = getAppFromContext;
-function getAppLookupParamsFromContext(ctx, target) {
-    const app = getAppFromContext(ctx);
+exports.getAppFromContextAsync = getAppFromContextAsync;
+async function getAppLookupParamsFromContextAsync(ctx, target) {
+    const app = await getAppFromContextAsync(ctx);
     return { ...app, bundleIdentifier: target.bundleIdentifier };
 }
-exports.getAppLookupParamsFromContext = getAppLookupParamsFromContext;
+exports.getAppLookupParamsFromContextAsync = getAppLookupParamsFromContextAsync;

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

@@ -1,7 +1,7 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 export declare class ConfigureProvisioningProfile {
     private app;

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

@@ -29,7 +29,7 @@ class ConfigureProvisioningProfile {
             log_1.default.warn('Make sure to recreate the profile if you selected a new distribution certificate.');
             return null;
         }
-        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(this.target);
+        const applePlatform = await (0, target_1.getApplePlatformFromTarget)(this.target);
         const profilesFromApple = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier, applePlatform);
         const [matchingProfile] = profilesFromApple.filter(appleInfo => developerPortalIdentifier
             ? appleInfo.provisioningProfileId === developerPortalIdentifier

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

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

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

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

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

@@ -1,7 +1,7 @@
 import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
 import { AppleProvisioningProfileMutationResult } from '../api/graphql/mutations/AppleProvisioningProfileMutation';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 export declare class CreateProvisioningProfile {
     private app;

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

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

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

@@ -1,4 +1,3 @@
 import { AppleDevice, AppleDeviceFragment } from '../../../graphql/generated';
 export declare function chooseDevicesAsync(allDevices: AppleDeviceFragment[], preselectedDeviceIdentifiers?: string[]): Promise<AppleDevice[]>;
-export declare function chooseDevicesToDeleteAsync(allDevices: AppleDeviceFragment[]): Promise<AppleDevice[]>;
 export declare function formatDeviceLabel(device: AppleDeviceFragment): string;

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

@@ -1,6 +1,6 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.formatDeviceLabel = exports.chooseDevicesToDeleteAsync = exports.chooseDevicesAsync = void 0;
+exports.formatDeviceLabel = exports.chooseDevicesAsync = void 0;
 const AppleDevice_1 = require("../../../graphql/types/credentials/AppleDevice");
 const prompts_1 = require("../.././../prompts");
 async function chooseDevicesAsync(allDevices, preselectedDeviceIdentifiers = []) {
@@ -10,7 +10,7 @@ async function chooseDevicesAsync(allDevices, preselectedDeviceIdentifiers = [])
     const { devices } = await (0, prompts_1.promptAsync)({
         type: 'multiselect',
         name: 'devices',
-        message: 'Select devices for the adhoc build:',
+        message: 'Select devices for the ad hoc build:',
         hint: '- Space to select. Return to submit',
         choices: allDevices.map(device => ({
             value: device,
@@ -23,25 +23,9 @@ async function chooseDevicesAsync(allDevices, preselectedDeviceIdentifiers = [])
     return devices;
 }
 exports.chooseDevicesAsync = chooseDevicesAsync;
-async function chooseDevicesToDeleteAsync(allDevices) {
-    const { devices } = await (0, prompts_1.promptAsync)({
-        type: 'multiselect',
-        name: 'devices',
-        message: 'Which devices do you want to remove?',
-        choices: allDevices.map(device => ({
-            value: device,
-            title: formatDeviceLabel(device),
-            selected: false,
-        })),
-        instructions: false,
-    });
-    return devices;
-}
-exports.chooseDevicesToDeleteAsync = chooseDevicesToDeleteAsync;
 function formatDeviceLabel(device) {
-    var _a;
     const deviceDetails = formatDeviceDetails(device);
-    return `${(_a = device.name) !== null && _a !== void 0 ? _a : device.identifier}${deviceDetails !== '' ? ` ${deviceDetails}` : ''}`;
+    return `${device.identifier}${deviceDetails !== '' ? ` ${deviceDetails}` : ''}${device.name ? ` (${device.name})` : ''}`;
 }
 exports.formatDeviceLabel = formatDeviceLabel;
 function formatDeviceDetails(device) {

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

@@ -1,13 +1,12 @@
-import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { DistributionCertificate } from '../appstore/Credentials.types';
 export declare function formatDistributionCertificate(distributionCertificate: AppleDistributionCertificateFragment, validSerialNumbers?: string[]): string;
 /**
  * select a distribution certificate from an account (validity status shown on a best effort basis)
  * */
-export declare function selectDistributionCertificateWithDependenciesAsync(ctx: CredentialsContext, account: Account): Promise<AppleDistributionCertificateFragment | null>;
+export declare function selectDistributionCertificateWithDependenciesAsync(ctx: CredentialsContext, account: AccountFragment): Promise<AppleDistributionCertificateFragment | null>;
 /**
  * select a distribution certificate from a valid set (curated on a best effort basis)
  * */

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

@@ -13,14 +13,14 @@ const CredentialsUtils_1 = require("../appstore/CredentialsUtils");
 const distributionCertificate_1 = require("../appstore/distributionCertificate");
 const credentials_1 = require("../credentials");
 const validateDistributionCertificate_1 = require("../validators/validateDistributionCertificate");
-const AppleTeamUtils_1 = require("./AppleTeamUtils");
+const AppleTeamFormatting_1 = require("./AppleTeamFormatting");
 function formatDistributionCertificate(distributionCertificate, validSerialNumbers) {
     const { serialNumber, developerPortalIdentifier, appleTeam, validityNotBefore, validityNotAfter, updatedAt, } = distributionCertificate;
     let line = '';
     if (developerPortalIdentifier) {
         line += `Cert ID: ${developerPortalIdentifier}`;
     }
-    line += `${line === '' ? '' : ', '}Serial number: ${serialNumber}${appleTeam ? `, ${(0, AppleTeamUtils_1.formatAppleTeam)(appleTeam)}` : ''}`;
+    line += `${line === '' ? '' : ', '}Serial number: ${serialNumber}${appleTeam ? `, ${(0, AppleTeamFormatting_1.formatAppleTeam)(appleTeam)}` : ''}`;
     line += chalk_1.default.gray(`\n    Created: ${(0, date_1.fromNow)(new Date(validityNotBefore))} ago, Updated: ${(0, date_1.fromNow)(new Date(updatedAt))} ago,`);
     line += chalk_1.default.gray(`\n    Expires: ${(0, dateformat_1.default)(validityNotAfter, 'expiresHeaderFormat')}`);
     const apps = distributionCertificate.iosAppBuildCredentialsList.map(buildCredentials => buildCredentials.iosAppCredentials.app);

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

@@ -18,7 +18,7 @@ async function generateProvisioningProfileAsync(ctx, target, bundleIdentifier, d
     const appleAuthCtx = await ctx.appStore.ensureAuthenticatedAsync();
     const type = appleAuthCtx.team.inHouse ? 'Enterprise ' : 'AppStore';
     const profileName = `*[expo] ${bundleIdentifier} ${type} ${new Date().toISOString()}`; // Apple drops [ if its the first char (!!)
-    const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(target);
+    const applePlatform = await (0, target_1.getApplePlatformFromTarget)(target);
     return await ctx.appStore.createProvisioningProfileAsync(bundleIdentifier, distCert, profileName, applePlatform);
 }
 exports.generateProvisioningProfileAsync = generateProvisioningProfileAsync;

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

@@ -1,12 +1,11 @@
-import { ApplePushKeyFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, ApplePushKeyFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { PushKey } from '../appstore/Credentials.types';
 export declare function provideOrGeneratePushKeyAsync(ctx: CredentialsContext): Promise<PushKey>;
 /**
  * select a push key from an account (validity status shown on a best effort basis)
  * */
-export declare function selectPushKeyAsync(ctx: CredentialsContext, account: Account): Promise<ApplePushKeyFragment | null>;
+export declare function selectPushKeyAsync(ctx: CredentialsContext, account: AccountFragment): Promise<ApplePushKeyFragment | null>;
 export declare function getValidAndTrackedPushKeysOnEasServersAsync(ctx: CredentialsContext, pushKeysForAccount: ApplePushKeyFragment[]): Promise<ApplePushKeyFragment[]>;
 export declare function sortPushKeys(pushKeys: ApplePushKeyFragment[], validPushKeys?: ApplePushKeyFragment[]): ApplePushKeyFragment[];
 export declare function formatPushKey(pushKey: ApplePushKeyFragment, validPushKeyIdentifiers?: string[]): string;

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

@@ -11,7 +11,7 @@ const CredentialsUtils_1 = require("../appstore/CredentialsUtils");
 const pushKey_1 = require("../appstore/pushKey");
 const credentials_1 = require("../credentials");
 const validatePushKey_1 = require("../validators/validatePushKey");
-const AppleTeamUtils_1 = require("./AppleTeamUtils");
+const AppleTeamFormatting_1 = require("./AppleTeamFormatting");
 async function provideOrGeneratePushKeyAsync(ctx) {
     if (!ctx.nonInteractive) {
         const userProvided = await promptForPushKeyAsync(ctx);
@@ -153,7 +153,7 @@ function formatPushKey(pushKey, validPushKeyIdentifiers) {
     const { keyIdentifier, appleTeam, updatedAt } = pushKey;
     let line = '';
     line += `Push Key ID: ${pushKey.keyIdentifier}`;
-    line += ` ${appleTeam ? `, ${(0, AppleTeamUtils_1.formatAppleTeam)(appleTeam)}` : ''}`;
+    line += ` ${appleTeam ? `, ${(0, AppleTeamFormatting_1.formatAppleTeam)(appleTeam)}` : ''}`;
     line += chalk_1.default.gray(`\n    Updated: ${(0, date_1.fromNow)(new Date(updatedAt))} ago,`);
     const apps = pushKey.iosAppCredentialsList.map(appCredentials => appCredentials.app);
     if (apps.length) {

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

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

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

@@ -1,15 +1,14 @@
-import { AppleDistributionCertificateFragment } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AppleDistributionCertificateFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 export declare class SelectAndRemoveDistributionCertificate {
     private account;
-    constructor(account: Account);
+    constructor(account: AccountFragment);
     runAsync(ctx: CredentialsContext): Promise<void>;
 }
 export declare class RemoveDistributionCertificate {
     private account;
     private distributionCertificate;
-    constructor(account: Account, distributionCertificate: AppleDistributionCertificateFragment);
+    constructor(account: AccountFragment, distributionCertificate: AppleDistributionCertificateFragment);
     runAsync(ctx: CredentialsContext): Promise<void>;
     private removeInvalidProvisioningProfilesAsync;
 }

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

@@ -1,6 +1,6 @@
 import { AppleProvisioningProfileIdentifiersFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare class RemoveProvisioningProfiles {
     private apps;
     private provisioningProfiles;

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

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

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

@@ -1,6 +1,6 @@
 import { AppleDistributionCertificateFragment, IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 interface Options {
     app: AppLookupParams;

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

@@ -79,7 +79,7 @@ class SetUpAdhocProvisioningProfile {
         const provisionedDeviceIdentifiers = ((_e = (_d = currentBuildCredentials === null || currentBuildCredentials === void 0 ? void 0 : currentBuildCredentials.provisioningProfile) === null || _d === void 0 ? void 0 : _d.appleDevices) !== null && _e !== void 0 ? _e : []).map(i => i.identifier);
         const chosenDevices = await (0, DeviceUtils_1.chooseDevicesAsync)(registeredAppleDevices, provisionedDeviceIdentifiers);
         // 4. Reuse or create the profile on Apple Developer Portal
-        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(target);
+        const applePlatform = await (0, target_1.getApplePlatformFromTarget)(target);
         const profileType = applePlatform === constants_1.ApplePlatform.TV_OS
             ? apple_utils_1.ProfileType.TVOS_APP_ADHOC
             : apple_utils_1.ProfileType.IOS_APP_ADHOC;

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

@@ -1,6 +1,6 @@
 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { AppStoreApiKeyPurpose } from './AscApiKeyUtils';
 export declare enum SetupAscApiKeyChoice {
     GENERATE = "GENERATE",

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

@@ -1,6 +1,6 @@
 import { AppleDistributionCertificate, AppleDistributionCertificateFragment, IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare class SetUpDistributionCertificate {
     private app;
     private distributionType;

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

@@ -1,6 +1,6 @@
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 /**
  * It's used when setting up credentials for internal distribution but `enterpriseProvisioning` is not set.

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

@@ -1,6 +1,6 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 /**
  * Sets up either APP_STORE or ENTERPRISE provisioning profiles

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

@@ -57,7 +57,7 @@ class SetUpProvisioningProfile {
             return await this.createAndAssignProfileAsync(ctx, distCert);
         }
         // See if the profile we have exists on the Apple Servers
-        const applePlatform = await (0, target_1.getApplePlatformFromSdkRoot)(this.target);
+        const applePlatform = await (0, target_1.getApplePlatformFromTarget)(this.target);
         const existingProfiles = await ctx.appStore.listProvisioningProfilesAsync(this.app.bundleIdentifier, applePlatform);
         const currentProfileFromServer = this.getCurrentProfileStoreInfo(existingProfiles, currentProfile);
         if (!currentProfileFromServer) {

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

@@ -1,6 +1,6 @@
 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare class SetUpPushKey {
     private app;
     constructor(app: AppLookupParams);

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

@@ -1,6 +1,6 @@
 import { CommonIosAppCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare const PROMPT_FOR_APP_SPECIFIC_PASSWORD = "PROMPT_FOR_APP_SPECIFIC_PASSWORD";
 export declare class SetUpSubmissionCredentials {
     private setupAscApiKeyAction;

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

@@ -2,7 +2,7 @@ import { DistributionType, IosEnterpriseProvisioning } from '@expo/eas-json';
 import { JSONObject } from '@expo/json-file';
 import { IosAppBuildCredentialsFragment } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
-import { AppLookupParams as GraphQLAppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams as GraphQLAppLookupParams } from '../api/graphql/types/AppLookupParams';
 import { Target } from '../types';
 interface Options {
     app: GraphQLAppLookupParams;

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

@@ -1,7 +1,7 @@
 import { AppleDistributionCertificateFragment, AppleProvisioningProfileFragment, AppleTeamFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
 import { CredentialsContext } from '../../context';
 import { IosTargetCredentials } from '../../credentialsJson/types';
-import { AppLookupParams } from '../api/GraphqlClient';
+import { AppLookupParams } from '../api/graphql/types/AppLookupParams';
 export declare class SetUpTargetBuildCredentialsFromCredentialsJson {
     private app;
     private distributionType;

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

@@ -1,16 +1,10 @@
-import { AppStoreConnectApiKeyFragment, AppleAppIdentifierFragment, AppleDeviceFragment, AppleDistributionCertificateFragment, ApplePushKeyFragment, AppleTeamFragment, CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
-import { Account } from '../../../user/Account';
+import { AccountFragment, AppStoreConnectApiKeyFragment, AppleAppIdentifierFragment, AppleDeviceFragment, AppleDistributionCertificateFragment, ApplePushKeyFragment, AppleTeamFragment, CommonIosAppCredentialsFragment, IosAppBuildCredentialsFragment, IosDistributionType } from '../../../graphql/generated';
 import { DistributionCertificate, PushKey } from '../appstore/Credentials.types';
 import { MinimalAscApiKey } from '../credentials';
 import { AppleDistributionCertificateMutationResult } from './graphql/mutations/AppleDistributionCertificateMutation';
 import { AppleProvisioningProfileMutationResult } from './graphql/mutations/AppleProvisioningProfileMutation';
 import { AppleProvisioningProfileQueryResult } from './graphql/queries/AppleProvisioningProfileQuery';
-export interface AppLookupParams {
-    account: Account;
-    projectName: string;
-    bundleIdentifier: string;
-    parentBundleIdentifier?: string;
-}
+import { AppLookupParams } from './graphql/types/AppLookupParams';
 export declare function createOrUpdateIosAppBuildCredentialsAsync(appLookupParams: AppLookupParams, { appleTeam, appleAppIdentifierId, iosDistributionType, appleProvisioningProfileId, appleDistributionCertificateId, }: {
     appleTeam: AppleTeamFragment;
     appleAppIdentifierId: string;
@@ -29,7 +23,7 @@ export declare function updateIosAppCredentialsAsync(appCredentials: CommonIosAp
     applePushKeyId?: string;
     ascApiKeyIdForSubmissions?: string;
 }): Promise<CommonIosAppCredentialsFragment>;
-export declare function createOrGetExistingAppleTeamAsync(account: Account, { appleTeamIdentifier, appleTeamName }: {
+export declare function createOrGetExistingAppleTeamAsync(account: AccountFragment, { appleTeamIdentifier, appleTeamName }: {
     appleTeamIdentifier: string;
     appleTeamName?: string;
 }): Promise<AppleTeamFragment>;
@@ -52,14 +46,14 @@ export declare function deleteProvisioningProfilesAsync(appleProvisioningProfile
 export declare function getDistributionCertificateForAppAsync(appLookupParams: AppLookupParams, iosDistributionType: IosDistributionType, { appleTeam }?: {
     appleTeam: AppleTeamFragment | null;
 }): Promise<AppleDistributionCertificateFragment | null>;
-export declare function getDistributionCertificatesForAccountAsync(account: Account): Promise<AppleDistributionCertificateFragment[]>;
-export declare function createDistributionCertificateAsync(account: Account, distCert: DistributionCertificate): Promise<AppleDistributionCertificateMutationResult>;
+export declare function getDistributionCertificatesForAccountAsync(account: AccountFragment): Promise<AppleDistributionCertificateFragment[]>;
+export declare function createDistributionCertificateAsync(account: AccountFragment, distCert: DistributionCertificate): Promise<AppleDistributionCertificateMutationResult>;
 export declare function deleteDistributionCertificateAsync(distributionCertificateId: string): Promise<void>;
-export declare function createPushKeyAsync(account: Account, pushKey: PushKey): Promise<ApplePushKeyFragment>;
-export declare function getPushKeysForAccountAsync(account: Account): Promise<ApplePushKeyFragment[]>;
+export declare function createPushKeyAsync(account: AccountFragment, pushKey: PushKey): Promise<ApplePushKeyFragment>;
+export declare function getPushKeysForAccountAsync(account: AccountFragment): Promise<ApplePushKeyFragment[]>;
 export declare function getPushKeyForAppAsync(appLookupParams: AppLookupParams): Promise<ApplePushKeyFragment | null>;
 export declare function deletePushKeyAsync(pushKeyId: string): Promise<void>;
-export declare function createAscApiKeyAsync(account: Account, ascApiKey: MinimalAscApiKey): Promise<AppStoreConnectApiKeyFragment>;
-export declare function getAscApiKeysForAccountAsync(account: Account): Promise<AppStoreConnectApiKeyFragment[]>;
+export declare function createAscApiKeyAsync(account: AccountFragment, ascApiKey: MinimalAscApiKey): Promise<AppStoreConnectApiKeyFragment>;
+export declare function getAscApiKeysForAccountAsync(account: AccountFragment): Promise<AppStoreConnectApiKeyFragment[]>;
 export declare function getAscApiKeyForAppSubmissionsAsync(appLookupParams: AppLookupParams): Promise<AppStoreConnectApiKeyFragment | null>;
 export declare function deleteAscApiKeyAsync(ascApiKeyId: string): Promise<void>;

package/build/credentials/ios/api/graphql/mutations/AppleTeamMutation.d.ts

@@ -1,7 +1,6 @@
-import { AppleTeamFragment, AppleTeamInput } from '../../../../../graphql/generated';
-import { Account } from '../../../../../user/Account';
+import { AccountFragment, AppleTeamFragment, AppleTeamInput } from '../../../../../graphql/generated';
 export declare type AppleTeamMutationResult = AppleTeamFragment & {
-    account: Account;
+    account: AccountFragment;
 };
 export declare const AppleTeamMutation: {
     createAppleTeamAsync(appleTeamInput: AppleTeamInput, accountId: string): Promise<AppleTeamMutationResult>;

package/build/credentials/ios/api/graphql/mutations/AppleTeamMutation.js

@@ -5,6 +5,7 @@ const tslib_1 = require("tslib");
 const graphql_1 = require("graphql");
 const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const client_1 = require("../../../../../graphql/client");
+const Account_1 = require("../../../../../graphql/types/Account");
 const AppleTeam_1 = require("../../../../../graphql/types/credentials/AppleTeam");
 exports.AppleTeamMutation = {
     async createAppleTeamAsync(appleTeamInput, accountId) {
@@ -17,12 +18,13 @@ exports.AppleTeamMutation = {
                   ...AppleTeamFragment
                   account {
                     id
-                    name
+                    ...AccountFragment
                   }
                 }
               }
             }
             ${(0, graphql_1.print)(AppleTeam_1.AppleTeamFragmentNode)}
+            ${(0, graphql_1.print)(Account_1.AccountFragmentNode)}
           `, {
             appleTeamInput,
             accountId,