eas-cli 3.12.1 → 3.13.1

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

@@ -22,10 +22,10 @@ class SetUpAscApiKey {
         this.purpose = purpose;
         this.choices = [
             {
-                title: '[Choose an existing ASC API Key]',
+                title: '[Choose an existing key]',
                 value: SetupAscApiKeyChoice.USE_EXISTING,
             },
-            { title: '[Add a new ASC API Key]', value: SetupAscApiKeyChoice.GENERATE },
+            { title: '[Add a new key]', value: SetupAscApiKeyChoice.GENERATE },
         ];
     }
     async runAsync(ctx) {
@@ -91,7 +91,7 @@ class SetUpAscApiKey {
             const result = await (0, prompts_1.promptAsync)({
                 type: 'select',
                 name: 'choice',
-                message: 'Select what to use for your project:',
+                message: 'Select the App Store Connect Api Key to use for your project:',
                 choices,
             });
             choice = result.choice;

package/build/easMultiselect.d.ts

@@ -0,0 +1,24 @@
+import { Choice, PromptObject } from 'prompts';
+import { MultiselectPrompt } from 'prompts/lib/elements';
+export type Question<T extends string = string> = PromptObject<T> & {
+    selectionFormat?: string;
+};
+/**
+ * Customized multiselect prompt.
+ *
+ * Additional parameters:
+ *
+ * @param selectionFormat
+ *   String indicating number of selected options. Should contain `<num>` substring.
+ *
+ *   Example:
+ *     'Selected <num> devices'
+ *
+ *   Short format is used when more than one option is selected.
+ *
+ **/
+export default class EasMultiselect extends MultiselectPrompt {
+    constructor(opts: Question);
+    renderDoneOrInstructions(): string;
+}
+export declare const easMultiselect: (args: Question) => Promise<Choice[]>;

package/build/easMultiselect.js

@@ -0,0 +1,46 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.easMultiselect = void 0;
+const elements_1 = require("prompts/lib/elements");
+const noop = () => { };
+/**
+ * Customized multiselect prompt.
+ *
+ * Additional parameters:
+ *
+ * @param selectionFormat
+ *   String indicating number of selected options. Should contain `<num>` substring.
+ *
+ *   Example:
+ *     'Selected <num> devices'
+ *
+ *   Short format is used when more than one option is selected.
+ *
+ **/
+class EasMultiselect extends elements_1.MultiselectPrompt {
+    constructor(opts) {
+        super(opts);
+        this.selectionFormat = opts.selectionFormat;
+    }
+    renderDoneOrInstructions() {
+        if (this.done && this.selectionFormat && this.value) {
+            const selectedOptionsCount = this.value.filter(e => e.selected).length;
+            if (selectedOptionsCount > 1) {
+                return this.selectionFormat.replace('<num>', selectedOptionsCount.toString());
+            }
+        }
+        return super.renderDoneOrInstructions();
+    }
+}
+exports.default = EasMultiselect;
+const easMultiselect = (args) => {
+    const toSelected = (items) => items.filter(item => item.selected).map(item => item.value);
+    return new Promise((res, rej) => {
+        const p = new EasMultiselect(args);
+        const onAbort = toSelected || noop;
+        const onSubmit = toSelected || noop;
+        p.on('submit', x => res(onSubmit(x)));
+        p.on('abort', x => rej(onAbort(x)));
+    });
+};
+exports.easMultiselect = easMultiselect;

package/build/graphql/generated.d.ts

@@ -4055,6 +4055,7 @@ export type UpdateRollBackToEmbeddedGroup = {
 export type UpdatesFilter = {
     platform?: InputMaybe<AppPlatform>;
     runtimeVersions?: InputMaybe<Array<Scalars['String']>>;
+    sdkVersions?: InputMaybe<Array<Scalars['String']>>;
 };
 export type UploadSession = {
     __typename?: 'UploadSession';
@@ -7862,6 +7863,7 @@ export type UpdatePublishMutation = {
                 id: string;
             } | {
                 __typename: 'SSOUser';
+                username: string;
                 id: string;
             } | {
                 __typename: 'User';
@@ -8203,6 +8205,7 @@ export type BranchesByAppQuery = {
                         id: string;
                     } | {
                         __typename: 'SSOUser';
+                        username: string;
                         id: string;
                     } | {
                         __typename: 'User';
@@ -8263,6 +8266,7 @@ export type ViewBranchesOnUpdateChannelQuery = {
                             id: string;
                         } | {
                             __typename: 'SSOUser';
+                            username: string;
                             id: string;
                         } | {
                             __typename: 'User';
@@ -8597,6 +8601,7 @@ export type ViewUpdateChannelOnAppQuery = {
                             id: string;
                         } | {
                             __typename: 'SSOUser';
+                            username: string;
                             id: string;
                         } | {
                             __typename: 'User';
@@ -8659,6 +8664,7 @@ export type ViewUpdateChannelsOnAppQuery = {
                             id: string;
                         } | {
                             __typename: 'SSOUser';
+                            username: string;
                             id: string;
                         } | {
                             __typename: 'User';
@@ -8881,6 +8887,7 @@ export type ViewUpdatesByGroupQuery = {
             id: string;
         } | {
             __typename: 'SSOUser';
+            username: string;
             id: string;
         } | {
             __typename: 'User';
@@ -8935,6 +8942,7 @@ export type ViewUpdateGroupsOnBranchQuery = {
                         id: string;
                     } | {
                         __typename: 'SSOUser';
+                        username: string;
                         id: string;
                     } | {
                         __typename: 'User';
@@ -8988,6 +8996,7 @@ export type ViewUpdateGroupsOnAppQuery = {
                     id: string;
                 } | {
                     __typename: 'SSOUser';
+                    username: string;
                     id: string;
                 } | {
                     __typename: 'User';
@@ -9436,6 +9445,7 @@ export type UpdateFragment = {
         id: string;
     } | {
         __typename: 'SSOUser';
+        username: string;
         id: string;
     } | {
         __typename: 'User';
@@ -9476,6 +9486,7 @@ export type UpdateBranchFragment = {
             id: string;
         } | {
             __typename: 'SSOUser';
+            username: string;
             id: string;
         } | {
             __typename: 'User';

package/build/graphql/types/Update.js

@@ -18,7 +18,7 @@ exports.UpdateFragmentNode = (0, graphql_tag_1.default) `
     actor {
       __typename
       id
-      ... on User {
+      ... on UserActor {
         username
       }
       ... on Robot {

package/build/project/ios/target.js

@@ -104,6 +104,9 @@ async function resolveBareProjectDependenciesAsync({ exp, projectDir, buildConfi
     const result = [];
     if (target.dependencies && target.dependencies.length > 0) {
         for (const dependency of target.dependencies) {
+            if (!dependency.signable) {
+                continue;
+            }
             const dependencyBundleIdentifier = await (0, bundleIdentifier_1.getBundleIdentifierAsync)(projectDir, exp, {
                 targetName: dependency.name,
                 buildConfiguration,

package/build/project/publish.d.ts

@@ -67,11 +67,12 @@ export declare function convertAssetToUpdateInfoGroupFormatAsync(asset: RawAsset
  * This will be sorted later based on the platform's runtime versions.
  */
 export declare function buildUnsortedUpdateInfoGroupAsync(assets: CollectedAssets, exp: ExpoConfig): Promise<UpdateInfoGroup>;
-export declare function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, }: {
+export declare function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, }: {
     projectDir: string;
     inputDir: string;
     exp: Pick<ExpoConfig, 'sdkVersion'>;
     platformFlag: ExpoCLIExportPlatformFlag;
+    clearCache?: boolean;
 }): Promise<void>;
 export declare function resolveInputDirectoryAsync(inputDir: string, { skipBundler }: {
     skipBundler?: boolean;

package/build/project/publish.js

@@ -118,7 +118,7 @@ async function buildUnsortedUpdateInfoGroupAsync(assets, exp) {
     return updateInfoGroup;
 }
 exports.buildUnsortedUpdateInfoGroupAsync = buildUnsortedUpdateInfoGroupAsync;
-async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, }) {
+async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, clearCache, }) {
     const packageJSON = json_file_1.default.read(path_1.default.resolve(projectDir, 'package.json'));
     if (!packageJSON) {
         throw new Error('Could not locate package.json');
@@ -132,6 +132,7 @@ async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, }) {
             '--dump-assetmap',
             '--platform',
             platformFlag,
+            ...(clearCache ? ['--clear'] : []),
         ]);
     }
     else {
@@ -146,6 +147,7 @@ async function buildBundlesAsync({ projectDir, inputDir, exp, platformFlag, }) {
             '--dump-assetmap',
             '--platform',
             platformFlag,
+            ...(clearCache ? ['--clear'] : []),
         ]);
     }
 }

package/build/prompts.d.ts

@@ -1,4 +1,5 @@
-import { Answers, Choice, Options, PromptType, PromptObject as Question } from 'prompts';
+import { Answers, Choice, Options, PromptType } from 'prompts';
+import { Question } from './easMultiselect';
 export { PromptType, Question, Choice };
 export interface ExpoChoice<T> extends Choice {
     value: T;

package/build/prompts.js

@@ -3,7 +3,11 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.pressAnyKeyToContinueAsync = exports.toggleConfirmAsync = exports.selectAsync = exports.confirmAsync = exports.promptAsync = void 0;
 const tslib_1 = require("tslib");
 const os_1 = require("os");
-const prompts_1 = tslib_1.__importDefault(require("prompts"));
+const prompts_1 = tslib_1.__importStar(require("prompts"));
+const easMultiselect_1 = require("./easMultiselect");
+if (prompts_1.prompts) {
+    prompts_1.prompts.multiselect = easMultiselect_1.easMultiselect;
+}
 async function promptAsync(questions, options = {}) {
     var _a;
     if (!process.stdin.isTTY && !global.test) {

package/build/submit/ios/AscApiKeySource.d.ts

@@ -3,11 +3,15 @@ import { AscApiKeyPath, MinimalAscApiKey } from '../../credentials/ios/credentia
 import { SubmissionContext } from '../context';
 export declare enum AscApiKeySourceType {
     path = 0,
-    prompt = 1
+    prompt = 1,
+    credentialsService = 2
 }
 interface AscApiKeySourceBase {
     sourceType: AscApiKeySourceType;
 }
+interface AscApiKeyCredentialsServiceSource extends AscApiKeySourceBase {
+    sourceType: AscApiKeySourceType.credentialsService;
+}
 interface AscApiKeyPromptSource extends AscApiKeySourceBase {
     sourceType: AscApiKeySourceType.prompt;
 }
@@ -15,7 +19,7 @@ interface AscApiKeyEnvVarSource extends AscApiKeySourceBase {
     sourceType: AscApiKeySourceType.path;
     path: AscApiKeyPath;
 }
-export type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource;
+export type AscApiKeySource = AscApiKeyEnvVarSource | AscApiKeyPromptSource | AscApiKeyCredentialsServiceSource;
 type AscApiKeySummary = {
     source: 'local' | 'EAS servers';
     path?: string;
@@ -29,6 +33,7 @@ export type AscApiKeyResult = {
     result: MinimalAscApiKey | AscApiKeyFromExpoServers;
     summary: AscApiKeySummary;
 };
+export declare function getAscApiKeyResultAsync(ctx: SubmissionContext<Platform.IOS>, source: AscApiKeySource): Promise<AscApiKeyResult>;
 export declare function getAscApiKeyLocallyAsync(ctx: SubmissionContext<Platform.IOS>, source: AscApiKeySource): Promise<AscApiKeyResult>;
 export declare function getAscApiKeyPathAsync(ctx: SubmissionContext<Platform.IOS>, source: AscApiKeySource): Promise<AscApiKeyPath>;
 export {};

package/build/submit/ios/AscApiKeySource.js

@@ -1,16 +1,76 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getAscApiKeyPathAsync = exports.getAscApiKeyLocallyAsync = exports.AscApiKeySourceType = void 0;
+exports.getAscApiKeyPathAsync = exports.getAscApiKeyLocallyAsync = exports.getAscApiKeyResultAsync = exports.AscApiKeySourceType = void 0;
 const tslib_1 = require("tslib");
 const fs_extra_1 = tslib_1.__importDefault(require("fs-extra"));
+const nullthrows_1 = tslib_1.__importDefault(require("nullthrows"));
 const AscApiKeyUtils_1 = require("../../credentials/ios/actions/AscApiKeyUtils");
+const SetUpAscApiKey_1 = require("../../credentials/ios/actions/SetUpAscApiKey");
 const log_1 = tslib_1.__importDefault(require("../../log"));
+const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
+const prompts_1 = require("../../prompts");
 const files_1 = require("../utils/files");
 var AscApiKeySourceType;
 (function (AscApiKeySourceType) {
     AscApiKeySourceType[AscApiKeySourceType["path"] = 0] = "path";
     AscApiKeySourceType[AscApiKeySourceType["prompt"] = 1] = "prompt";
+    AscApiKeySourceType[AscApiKeySourceType["credentialsService"] = 2] = "credentialsService";
 })(AscApiKeySourceType = exports.AscApiKeySourceType || (exports.AscApiKeySourceType = {}));
+async function getAscApiKeyResultAsync(ctx, source) {
+    if (source.sourceType === AscApiKeySourceType.credentialsService) {
+        return await getAscApiKeyFromCredentialsServiceAsync(ctx);
+    }
+    else {
+        return await getAscApiKeyLocallyAsync(ctx, source);
+    }
+}
+exports.getAscApiKeyResultAsync = getAscApiKeyResultAsync;
+async function maybeGetIosBundleIdentifierAsync(ctx) {
+    try {
+        return await (0, bundleIdentifier_1.getBundleIdentifierAsync)(ctx.projectDir, ctx.exp);
+    }
+    catch (error) {
+        if (error instanceof bundleIdentifier_1.AmbiguousBundleIdentifierError) {
+            log_1.default.warn('bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.');
+            return null;
+        }
+        throw new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`);
+    }
+}
+async function promptForBundleIdentifierAsync() {
+    const { bundleIdentifier } = await (0, prompts_1.promptAsync)({
+        name: 'bundleIdentifier',
+        message: 'Bundle identifier:',
+        type: 'text',
+        validate: value => ((0, bundleIdentifier_1.isBundleIdentifierValid)(value) ? true : bundleIdentifier_1.INVALID_BUNDLE_IDENTIFIER_MESSAGE),
+    });
+    return bundleIdentifier;
+}
+async function getAscApiKeyFromCredentialsServiceAsync(ctx) {
+    var _a, _b, _c;
+    const bundleIdentifier = (_c = (_b = (_a = ctx.applicationIdentifierOverride) !== null && _a !== void 0 ? _a : ctx.profile.bundleIdentifier) !== null && _b !== void 0 ? _b : (await maybeGetIosBundleIdentifierAsync(ctx))) !== null && _c !== void 0 ? _c : (await promptForBundleIdentifierAsync());
+    log_1.default.log(`Looking up credentials configuration for ${bundleIdentifier}...`);
+    const appLookupParams = {
+        account: (0, nullthrows_1.default)(ctx.user.accounts.find(a => a.name === ctx.accountName), `You do not have access to account: ${ctx.accountName}`),
+        projectName: ctx.projectName,
+        bundleIdentifier,
+    };
+    const setupAscApiKeyAction = new SetUpAscApiKey_1.SetUpAscApiKey(appLookupParams, AscApiKeyUtils_1.AppStoreApiKeyPurpose.SUBMISSION_SERVICE);
+    const iosAppCredentials = await setupAscApiKeyAction.runAsync(ctx.credentialsCtx);
+    const ascKeyForSubmissions = (0, nullthrows_1.default)(iosAppCredentials.appStoreConnectApiKeyForSubmissions, `An EAS Submit ASC Api Key could not be found for ${iosAppCredentials.appleAppIdentifier.bundleIdentifier}`);
+    const { id, keyIdentifier, name } = ascKeyForSubmissions;
+    log_1.default.log(`Using Api Key ID: ${keyIdentifier}${name ? ` (${name})` : ''}`);
+    return {
+        result: {
+            ascApiKeyId: id,
+        },
+        summary: {
+            source: 'EAS servers',
+            keyId: keyIdentifier,
+            name: name !== null && name !== void 0 ? name : undefined,
+        },
+    };
+}
 async function getAscApiKeyLocallyAsync(ctx, source) {
     const ascApiKeyPath = await getAscApiKeyPathAsync(ctx, source);
     const { keyP8Path, keyId, issuerId } = ascApiKeyPath;
@@ -31,6 +91,8 @@ async function getAscApiKeyPathAsync(ctx, source) {
             return await handlePathSourceAsync(ctx, source);
         case AscApiKeySourceType.prompt:
             return await handlePromptSourceAsync(ctx, source);
+        case AscApiKeySourceType.credentialsService:
+            throw new Error(`AscApiKeySourceType ${source} does not return a path.`);
     }
 }
 exports.getAscApiKeyPathAsync = getAscApiKeyPathAsync;

package/build/submit/ios/IosSubmitCommand.d.ts

@@ -6,7 +6,6 @@ export default class IosSubmitCommand {
     constructor(ctx: SubmissionContext<Platform.IOS>);
     runAsync(): Promise<SubmissionFragment>;
     private resolveSubmissionOptionsAsync;
-    private maybeGetIosBundleIdentifierAsync;
     private resolveCredentialSubmissionOptionsAsync;
     private resolveAppSpecificPasswordSource;
     private resolveAscApiKeySource;

package/build/submit/ios/IosSubmitCommand.js

@@ -7,12 +7,10 @@ const getenv_1 = tslib_1.__importDefault(require("getenv"));
 const wrap_ansi_1 = tslib_1.__importDefault(require("wrap-ansi"));
 const errors_1 = require("../../credentials/errors");
 const log_1 = tslib_1.__importStar(require("../../log"));
-const bundleIdentifier_1 = require("../../project/ios/bundleIdentifier");
 const commons_1 = require("../commons");
 const AppProduce_1 = require("./AppProduce");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
 const AscApiKeySource_1 = require("./AscApiKeySource");
-const CredentialsServiceSource_1 = require("./CredentialsServiceSource");
 const IosSubmitter_1 = tslib_1.__importDefault(require("./IosSubmitter"));
 class IosSubmitCommand {
     constructor(ctx) {
@@ -31,15 +29,11 @@ class IosSubmitCommand {
             ? credentialsSource.appSpecificPasswordSource
             : null;
         const maybeAscApiKeySource = 'ascApiKeySource' in credentialsSource ? credentialsSource.ascApiKeySource : null;
-        const maybeCredentialsServiceSource = 'credentialsServiceSource' in credentialsSource
-            ? credentialsSource.credentialsServiceSource
-            : null;
         const ascAppIdentifier = await this.resolveAscAppIdentifierAsync();
         const errored = [
             archiveSource,
             ...(maybeAppSpecificPasswordSource ? [maybeAppSpecificPasswordSource] : []),
             ...(maybeAscApiKeySource ? [maybeAscApiKeySource] : []),
-            ...(maybeCredentialsServiceSource ? [maybeCredentialsServiceSource] : []),
             ascAppIdentifier,
         ].filter(r => !r.ok);
         if (errored.length > 0) {
@@ -61,57 +55,18 @@ class IosSubmitCommand {
                     ascApiKeySource: maybeAscApiKeySource.enforceValue(),
                 }
                 : null),
-            ...(maybeCredentialsServiceSource
-                ? {
-                    credentialsServiceSource: maybeCredentialsServiceSource.enforceValue(),
-                }
-                : null),
         };
     }
-    async maybeGetIosBundleIdentifierAsync() {
-        try {
-            return (0, results_1.result)(await (0, bundleIdentifier_1.getBundleIdentifierAsync)(this.ctx.projectDir, this.ctx.exp));
-        }
-        catch (error) {
-            if (error instanceof bundleIdentifier_1.AmbiguousBundleIdentifierError) {
-                log_1.default.warn('bundleIdentifier in the Xcode project is ambiguous, specify it via "bundleIdentifier" field in the submit profile in the eas.json.');
-                return (0, results_1.result)(null);
-            }
-            return (0, results_1.result)(new Error(`Failed to resolve bundleIdentifier in the Xcode project: ${error.message}.`));
-        }
-    }
     async resolveCredentialSubmissionOptionsAsync() {
-        var _a;
-        const ascApiKeySource = this.resolveAscApiKeySource();
-        const shouldSkipAscApiKeySource = !ascApiKeySource.ok && ascApiKeySource.enforceError() instanceof errors_1.MissingCredentialsError;
-        if (!shouldSkipAscApiKeySource) {
-            return { ascApiKeySource };
-        }
+        // if an App Specific Password env var is not specified, use ASC Api Key
         const appSpecificPasswordSource = this.resolveAppSpecificPasswordSource();
         const shouldSkipAppSpecificPasswordSource = !appSpecificPasswordSource.ok &&
             appSpecificPasswordSource.enforceError() instanceof errors_1.MissingCredentialsError;
         if (!shouldSkipAppSpecificPasswordSource) {
             return { appSpecificPasswordSource: this.resolveAppSpecificPasswordSource() };
         }
-        let bundleIdentifier = (_a = this.ctx.applicationIdentifierOverride) !== null && _a !== void 0 ? _a : this.ctx.profile.bundleIdentifier;
-        if (!bundleIdentifier) {
-            const bundleIdentifierResult = await this.maybeGetIosBundleIdentifierAsync();
-            if (!bundleIdentifierResult.ok) {
-                return {
-                    credentialsServiceSource: (0, results_1.result)(bundleIdentifierResult.reason),
-                };
-            }
-            const bundleIdentifierValue = bundleIdentifierResult.enforceValue();
-            if (bundleIdentifierValue) {
-                bundleIdentifier = bundleIdentifierValue;
-            }
-        }
-        return {
-            credentialsServiceSource: (0, results_1.result)({
-                sourceType: CredentialsServiceSource_1.CREDENTIALS_SERVICE_SOURCE,
-                bundleIdentifier,
-            }),
-        };
+        const ascApiKeySource = this.resolveAscApiKeySource();
+        return { ascApiKeySource };
     }
     resolveAppSpecificPasswordSource() {
         const envAppSpecificPassword = getenv_1.default.string('EXPO_APPLE_APP_SPECIFIC_PASSWORD', '');
@@ -147,7 +102,7 @@ class IosSubmitCommand {
                 sourceType: AscApiKeySource_1.AscApiKeySourceType.prompt,
             });
         }
-        return (0, results_1.result)(new errors_1.MissingCredentialsError('Set the ascApiKeyPath, ascApiKeyIssuerId and ascApiKeyId fields in eas.json.'));
+        return (0, results_1.result)({ sourceType: AscApiKeySource_1.AscApiKeySourceType.credentialsService });
     }
     resolveArchiveSource() {
         try {

package/build/submit/ios/IosSubmitter.d.ts

@@ -5,13 +5,11 @@ import BaseSubmitter, { SubmissionInput } from '../BaseSubmitter';
 import { SubmissionContext } from '../context';
 import { AppSpecificPasswordCredentials, AppSpecificPasswordSource } from './AppSpecificPasswordSource';
 import { AscApiKeyResult, AscApiKeySource } from './AscApiKeySource';
-import { CredentialsServiceSource } from './CredentialsServiceSource';
 export interface IosSubmissionOptions extends Pick<IosSubmissionConfigInput, 'appleIdUsername' | 'ascAppIdentifier'> {
     projectId: string;
     archiveSource: ArchiveSource;
     appSpecificPasswordSource?: AppSpecificPasswordSource;
     ascApiKeySource?: AscApiKeySource;
-    credentialsServiceSource?: CredentialsServiceSource;
 }
 interface ResolvedSourceOptions {
     archive: ResolvedArchiveSource;

package/build/submit/ios/IosSubmitter.js

@@ -11,7 +11,6 @@ const BaseSubmitter_1 = tslib_1.__importDefault(require("../BaseSubmitter"));
 const summary_1 = require("../utils/summary");
 const AppSpecificPasswordSource_1 = require("./AppSpecificPasswordSource");
 const AscApiKeySource_1 = require("./AscApiKeySource");
-const CredentialsServiceSource_1 = require("./CredentialsServiceSource");
 class IosSubmitter extends BaseSubmitter_1.default {
     constructor(ctx, options) {
         const sourceOptionsResolver = {
@@ -28,15 +27,11 @@ class IosSubmitter extends BaseSubmitter_1.default {
                     ? await (0, AppSpecificPasswordSource_1.getAppSpecificPasswordLocallyAsync)(this.ctx, this.options.appSpecificPasswordSource)
                     : null;
                 const maybeAppStoreConnectApiKey = this.options.ascApiKeySource
-                    ? await (0, AscApiKeySource_1.getAscApiKeyLocallyAsync)(this.ctx, this.options.ascApiKeySource)
-                    : null;
-                const maybeAscOrAspFromCredentialsService = this.options.credentialsServiceSource
-                    ? await (0, CredentialsServiceSource_1.getFromCredentialsServiceAsync)(this.ctx, this.options.credentialsServiceSource)
+                    ? await (0, AscApiKeySource_1.getAscApiKeyResultAsync)(this.ctx, this.options.ascApiKeySource)
                     : null;
                 return {
                     ...(maybeAppSpecificPassword ? { appSpecificPassword: maybeAppSpecificPassword } : null),
                     ...(maybeAppStoreConnectApiKey ? { ascApiKeyResult: maybeAppStoreConnectApiKey } : null),
-                    ...(maybeAscOrAspFromCredentialsService ? maybeAscOrAspFromCredentialsService : null),
                 };
             },
         };

package/build/update/ios/UpdatesModule.js

@@ -41,7 +41,7 @@ async function readChannelSafelyAsync(projectDir) {
     try {
         const expoPlist = await readExpoPlistAsync(projectDir);
         const updatesRequestHeaders = expoPlist['EXUpdatesRequestHeaders'];
-        return (_a = updatesRequestHeaders['expo-channel-name']) !== null && _a !== void 0 ? _a : null;
+        return (_a = updatesRequestHeaders === null || updatesRequestHeaders === void 0 ? void 0 : updatesRequestHeaders['expo-channel-name']) !== null && _a !== void 0 ? _a : null;
     }
     catch {
         return null;

package/build/update/utils.d.ts

@@ -1,9 +1,9 @@
 import { ExpoConfig } from '@expo/config';
-import { Maybe, Robot, Update, UpdateBranchFragment, UpdateFragment, User } from '../graphql/generated';
+import { Robot, SsoUser, Update, UpdateBranchFragment, UpdateFragment, User } from '../graphql/generated';
 import { RequestedPlatform } from '../platform';
 import { ProfileData } from '../utils/profiles';
 export type FormatUpdateParameter = Pick<Update, 'id' | 'createdAt' | 'message'> & {
-    actor?: Maybe<Pick<User, 'username' | 'id'> | Pick<Robot, 'firstName' | 'id'>>;
+    actor?: Pick<Robot, '__typename' | 'firstName'> | Pick<User, '__typename' | 'username'> | Pick<SsoUser, '__typename' | 'username'> | null;
 };
 export type UpdateJsonInfo = {
     branch: string;

package/build/update/utils.js

@@ -94,7 +94,8 @@ function formatUpdateTitle(update) {
     const { message, createdAt, actor, runtimeVersion } = update;
     let actorName;
     switch (actor === null || actor === void 0 ? void 0 : actor.__typename) {
-        case 'User': {
+        case 'User':
+        case 'SSOUser': {
             actorName = actor.username;
             break;
         }
@@ -103,8 +104,9 @@ function formatUpdateTitle(update) {
             actorName = firstName !== null && firstName !== void 0 ? firstName : `robot: ${id.slice(0, 4)}...`;
             break;
         }
-        default:
+        case undefined: {
             actorName = 'unknown';
+        }
     }
     return `[${(0, dateformat_1.default)(createdAt, 'mmm dd HH:MM')} by ${actorName}, runtimeVersion: ${runtimeVersion}] ${message}`;
 }

package/build/user/User.d.ts

@@ -1,9 +1,9 @@
-import { CurrentUserQuery } from '../graphql/generated';
+import { CurrentUserQuery, Robot, SsoUser, User } from '../graphql/generated';
 export type Actor = NonNullable<CurrentUserQuery['meActor']>;
 /**
  * Resolve the name of the actor, either normal user or robot user.
  * This should be used whenever the "current user" needs to be displayed.
  * The display name CANNOT be used as project owner.
  */
-export declare function getActorDisplayName(actor?: Actor): string;
+export declare function getActorDisplayName(actor?: Pick<Robot, '__typename' | 'firstName'> | Pick<User, '__typename' | 'username'> | Pick<SsoUser, '__typename' | 'username'> | null): string;
 export declare function getActorUsername(actor?: Actor): string | null;

package/build/user/User.js

@@ -13,9 +13,9 @@ function getActorDisplayName(actor) {
         case 'Robot':
             return actor.firstName ? `${actor.firstName} (robot)` : 'robot';
         case 'SSOUser':
-            return actor.username ? `${actor.username} (sso user)` : 'sso user';
-        default:
-            return 'anonymous';
+            return actor.username;
+        case undefined:
+            return 'unknown';
     }
 }
 exports.getActorDisplayName = getActorDisplayName;
@@ -24,7 +24,8 @@ function getActorUsername(actor) {
         case 'User':
         case 'SSOUser':
             return actor.username;
-        default:
+        case 'Robot':
+        case undefined:
             return null;
     }
 }