eas-cli 18.3.0 → 18.5.0

package/build/metadata/download.d.ts

@@ -1,15 +1,19 @@
 import { ExpoConfig } from '@expo/config';
 import { SubmitProfile } from '@expo/eas-json';
 import { Analytics } from '../analytics/AnalyticsManager';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 /**
  * Generate a local store configuration from the stores.
  * Note, only App Store is supported at this time.
  */
-export declare function downloadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, }: {
+export declare function downloadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, nonInteractive, graphqlClient, projectId, }: {
     projectDir: string;
     profile: SubmitProfile;
     exp: ExpoConfig;
     analytics: Analytics;
     credentialsCtx: CredentialsContext;
+    nonInteractive: boolean;
+    graphqlClient: ExpoGraphqlClient;
+    projectId: string;
 }): Promise<string>;

package/build/metadata/download.js

@@ -16,16 +16,21 @@ const prompts_1 = require("../prompts");
  * Generate a local store configuration from the stores.
  * Note, only App Store is supported at this time.
  */
-async function downloadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, }) {
+async function downloadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, nonInteractive, graphqlClient, projectId, }) {
     const filePath = (0, resolve_1.getStaticConfigFilePath)({ projectDir, profile });
     const fileExists = await fs_extra_1.default.pathExists(filePath);
     if (fileExists) {
-        const filePathRelative = path_1.default.relative(projectDir, filePath);
-        const overwrite = await (0, prompts_1.confirmAsync)({
-            message: `Do you want to overwrite the existing "${filePathRelative}"?`,
-        });
-        if (!overwrite) {
-            throw new errors_1.MetadataValidationError(`Store config already exists at "${filePath}"`);
+        if (nonInteractive) {
+            log_1.default.log(`Overwriting existing store config at "${path_1.default.relative(projectDir, filePath)}".`);
+        }
+        else {
+            const filePathRelative = path_1.default.relative(projectDir, filePath);
+            const overwrite = await (0, prompts_1.confirmAsync)({
+                message: `Do you want to overwrite the existing "${filePathRelative}"?`,
+            });
+            if (!overwrite) {
+                throw new errors_1.MetadataValidationError(`Store config already exists at "${filePath}"`);
+            }
         }
     }
     const { app, auth } = await (0, auth_1.getAppStoreAuthAsync)({
@@ -33,6 +38,9 @@ async function downloadMetadataAsync({ projectDir, profile, exp, analytics, cred
         credentialsCtx,
         projectDir,
         profile,
+        nonInteractive,
+        graphqlClient,
+        projectId,
     });
     const { unsubscribeTelemetry, executionId } = await (0, telemetry_1.subscribeTelemetryAsync)(analytics, AnalyticsManager_1.MetadataEvent.APPLE_METADATA_DOWNLOAD, { app, auth });
     log_1.default.addNewLineIfNone();
@@ -40,7 +48,7 @@ async function downloadMetadataAsync({ projectDir, profile, exp, analytics, cred
     const errors = [];
     const config = (0, resolve_1.createAppleWriter)();
     const tasks = (0, tasks_1.createAppleTasks)();
-    const taskCtx = { app };
+    const taskCtx = { app, projectDir };
     for (const task of tasks) {
         try {
             await task.prepareAsync({ context: taskCtx });

package/build/metadata/upload.d.ts

@@ -1,17 +1,21 @@
 import { ExpoConfig } from '@expo/config';
 import { SubmitProfile } from '@expo/eas-json';
 import { Analytics } from '../analytics/AnalyticsManager';
+import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { CredentialsContext } from '../credentials/context';
 /**
  * Sync a local store configuration with the stores.
  * Note, only App Store is supported at this time.
  */
-export declare function uploadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, }: {
+export declare function uploadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, nonInteractive, graphqlClient, projectId, }: {
     projectDir: string;
     profile: SubmitProfile;
     exp: ExpoConfig;
     analytics: Analytics;
     credentialsCtx: CredentialsContext;
+    nonInteractive: boolean;
+    graphqlClient: ExpoGraphqlClient;
+    projectId: string;
 }): Promise<{
     appleLink: string;
 }>;

package/build/metadata/upload.js

@@ -14,13 +14,16 @@ const prompts_1 = require("../prompts");
  * Sync a local store configuration with the stores.
  * Note, only App Store is supported at this time.
  */
-async function uploadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, }) {
-    const storeConfig = await loadConfigWithValidationPromptAsync(projectDir, profile);
+async function uploadMetadataAsync({ projectDir, profile, exp, analytics, credentialsCtx, nonInteractive, graphqlClient, projectId, }) {
+    const storeConfig = await loadConfigWithValidationPromptAsync(projectDir, profile, nonInteractive);
     const { app, auth } = await (0, auth_1.getAppStoreAuthAsync)({
         exp,
         credentialsCtx,
         projectDir,
         profile,
+        nonInteractive,
+        graphqlClient,
+        projectId,
     });
     const { unsubscribeTelemetry, executionId } = await (0, telemetry_1.subscribeTelemetryAsync)(analytics, AnalyticsManager_1.MetadataEvent.APPLE_METADATA_UPLOAD, { app, auth });
     log_1.default.addNewLineIfNone();
@@ -32,7 +35,7 @@ async function uploadMetadataAsync({ projectDir, profile, exp, analytics, creden
         // This version is the parent model of all changes we are going to push.
         version: config.getVersion()?.versionString,
     });
-    const taskCtx = { app };
+    const taskCtx = { app, projectDir };
     for (const task of tasks) {
         try {
             await task.prepareAsync({ context: taskCtx });
@@ -55,12 +58,16 @@ async function uploadMetadataAsync({ projectDir, profile, exp, analytics, creden
     }
     return { appleLink: `https://appstoreconnect.apple.com/apps/${app.id}/appstore` };
 }
-async function loadConfigWithValidationPromptAsync(projectDir, profile) {
+async function loadConfigWithValidationPromptAsync(projectDir, profile, nonInteractive) {
     try {
         return await (0, resolve_1.loadConfigAsync)({ projectDir, profile });
     }
     catch (error) {
         if (error instanceof errors_1.MetadataValidationError) {
+            if (nonInteractive) {
+                (0, errors_1.logMetadataValidationError)(error);
+                throw error;
+            }
             (0, errors_1.logMetadataValidationError)(error);
             log_1.default.newLine();
             log_1.default.warn('Without further updates, the current store configuration can fail to be synchronized with the App Store or pass App Store review.');

package/build/project/projectUtils.d.ts

@@ -1,8 +1,6 @@
 import { ExpoConfig } from '@expo/config';
 import { ExpoGraphqlClient } from '../commandUtils/context/contextUtils/createGraphqlClient';
 import { AccountFragment } from '../graphql/generated';
-import { Actor } from '../user/User';
-export declare function getUsernameForBuildMetadataAndBuildJob(user: Actor): string | undefined;
 /**
  * Return a useful name describing the project config.
  * - dynamic: app.config.js

package/build/project/projectUtils.js

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.getUsernameForBuildMetadataAndBuildJob = getUsernameForBuildMetadataAndBuildJob;
 exports.getProjectConfigDescription = getProjectConfigDescription;
 exports.isExpoUpdatesInstalled = isExpoUpdatesInstalled;
 exports.isExpoNotificationsInstalled = isExpoNotificationsInstalled;
@@ -26,17 +25,6 @@ const api_1 = require("../api");
 const AppQuery_1 = require("../graphql/queries/AppQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const expoCli_1 = require("../utils/expoCli");
-function getUsernameForBuildMetadataAndBuildJob(user) {
-    switch (user.__typename) {
-        case 'User':
-            return user.username;
-        case 'SSOUser':
-            return user.username;
-        case 'Robot':
-            // robot users don't have usernames
-            return undefined;
-    }
-}
 /**
  * Return a useful name describing the project config.
  * - dynamic: app.config.js

package/build/project/workflow.js

@@ -44,7 +44,7 @@ async function hasIgnoredIosProjectAsync(projectDir, vcsClient) {
         const pbxProjectPath = config_plugins_1.IOSConfig.Paths.getPBXProjectPath(projectDir);
         return await vcsClient.isFileIgnoredAsync(path_1.default.relative(vcsRootPath, pbxProjectPath));
     }
-    finally {
+    catch {
         return false;
     }
 }

package/build/sentry.d.ts

@@ -0,0 +1,2 @@
+import * as Sentry from '@sentry/node';
+export default Sentry;

package/build/sentry.js

@@ -0,0 +1,22 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const Sentry = tslib_1.__importStar(require("@sentry/node"));
+const easCli_1 = require("./utils/easCli");
+Sentry.init({
+    dsn: process.env.EAS_CLI_SENTRY_DSN,
+    enabled: !!process.env.EAS_CLI_SENTRY_DSN,
+    environment: getSentryEnvironment(),
+    release: easCli_1.easCliVersion ? `eas-cli@${easCli_1.easCliVersion}` : undefined,
+});
+Sentry.setTag('source', 'eas-cli');
+function getSentryEnvironment() {
+    if (process.env.EXPO_LOCAL) {
+        return 'local';
+    }
+    else if (process.env.EXPO_STAGING) {
+        return 'staging';
+    }
+    return 'production';
+}
+exports.default = Sentry;

package/build/update/utils.d.ts

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

package/build/update/utils.js

@@ -110,6 +110,7 @@ function formatUpdateTitle(update) {
     let actorName;
     switch (actor?.__typename) {
         case 'User':
+        case 'PartnerActor':
         case 'SSOUser': {
             actorName = actor.username;
             break;

package/build/user/User.d.ts

@@ -1,9 +1,9 @@
-import { CurrentUserQuery, Robot, SsoUser, User } from '../graphql/generated';
+import { CurrentUserQuery, PartnerActor, Robot, SsoUser, User } from '../graphql/generated';
 export type Actor = NonNullable<CurrentUserQuery['meActor']>;
 /**
  * Resolve the name of the actor, either normal user, sso 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?: Pick<Robot, '__typename' | 'firstName'> | Pick<User, '__typename' | 'username'> | Pick<SsoUser, '__typename' | 'username'> | null): string;
+export declare function getActorDisplayName(actor?: Pick<Robot, '__typename' | 'firstName'> | Pick<User, '__typename' | 'username'> | Pick<SsoUser, '__typename' | 'username'> | Pick<PartnerActor, '__typename' | 'username'> | null): string;
 export declare function getActorUsername(actor?: Actor): string | null;

package/build/user/User.js

@@ -15,6 +15,8 @@ function getActorDisplayName(actor) {
             return actor.firstName ? `${actor.firstName} (robot)` : 'robot';
         case 'SSOUser':
             return actor.username;
+        case 'PartnerActor':
+            return actor.username;
         case undefined:
             return 'unknown';
     }
@@ -23,6 +25,7 @@ function getActorUsername(actor) {
     switch (actor?.__typename) {
         case 'User':
         case 'SSOUser':
+        case 'PartnerActor':
             return actor.username;
         case 'Robot':
         case undefined:

package/build/user/expoBrowserAuthFlowLauncher.js

@@ -4,20 +4,65 @@ exports.getSessionUsingBrowserAuthFlowAsync = getSessionUsingBrowserAuthFlowAsyn
 const tslib_1 = require("tslib");
 const assert_1 = tslib_1.__importDefault(require("assert"));
 const better_opn_1 = tslib_1.__importDefault(require("better-opn"));
+const crypto_1 = tslib_1.__importDefault(require("crypto"));
 const http_1 = tslib_1.__importDefault(require("http"));
-const querystring_1 = tslib_1.__importDefault(require("querystring"));
 const api_1 = require("../api");
+const fetch_1 = tslib_1.__importDefault(require("../fetch"));
 const log_1 = tslib_1.__importDefault(require("../log"));
+const CLIENT_ID = 'eas-cli';
+function generateCodeVerifier() {
+    return crypto_1.default.randomBytes(32).toString('base64url');
+}
+function generateCodeChallenge(codeVerifier) {
+    return crypto_1.default.createHash('sha256').update(codeVerifier).digest('base64url');
+}
+function generateState() {
+    return crypto_1.default.randomBytes(32).toString('base64url');
+}
+async function exchangeCodeForSessionSecretAsync({ code, codeVerifier, redirectUri, }) {
+    const tokenUrl = `${(0, api_1.getExpoApiBaseUrl)()}/v2/auth/token`;
+    const response = await (0, fetch_1.default)(tokenUrl, {
+        method: 'POST',
+        headers: {
+            'Content-Type': 'application/json',
+        },
+        body: JSON.stringify({
+            grant_type: 'authorization_code',
+            code,
+            redirect_uri: redirectUri,
+            code_verifier: codeVerifier,
+            client_id: CLIENT_ID,
+        }),
+    });
+    const result = await response.json();
+    const sessionSecret = result?.data?.session_secret;
+    if (!sessionSecret) {
+        throw new Error('Failed to obtain session secret from token exchange.');
+    }
+    return sessionSecret;
+}
 async function getSessionUsingBrowserAuthFlowAsync({ sso = false }) {
     const scheme = 'http';
     const hostname = 'localhost';
-    const path = '/auth/callback';
+    const callbackPath = '/auth/callback';
     const expoWebsiteUrl = (0, api_1.getExpoWebsiteBaseUrl)();
+    const codeVerifier = generateCodeVerifier();
+    const codeChallenge = generateCodeChallenge(codeVerifier);
+    const state = generateState();
+    const buildRedirectUri = (port) => `${scheme}://${hostname}:${port}${callbackPath}`;
     const buildExpoLoginUrl = (port, sso) => {
-        const params = querystring_1.default.stringify({
-            confirm_account: true,
-            app_redirect_uri: `${scheme}://${hostname}:${port}${path}`,
-        });
+        // Note: we avoid URLSearchParams here because better-opn calls encodeURI()
+        // on the URL before passing it to AppleScript, which would double-encode
+        // the percent-encoded values from URLSearchParams.toString().
+        const params = [
+            `client_id=${CLIENT_ID}`,
+            `redirect_uri=${buildRedirectUri(port)}`,
+            `response_type=code`,
+            `code_challenge=${codeChallenge}`,
+            `code_challenge_method=S256`,
+            `state=${state}`,
+            `confirm_account=true`,
+        ].join('&');
         return `${expoWebsiteUrl}${sso ? '/sso-login' : '/login'}?${params}`;
     };
     // Start server and begin auth flow
@@ -34,22 +79,34 @@ async function getSessionUsingBrowserAuthFlowAsync({ sso = false }) {
                         connection.destroy();
                     }
                 };
-                try {
+                const handleRequestAsync = async () => {
                     if (!(request.method === 'GET' && request.url?.includes('/auth/callback'))) {
                         throw new Error('Unexpected login response.');
                     }
                     const url = new URL(request.url, `http:${request.headers.host}`);
-                    const sessionSecret = url.searchParams.get('session_secret');
-                    if (!sessionSecret) {
-                        throw new Error('Request missing session_secret search parameter.');
+                    const code = url.searchParams.get('code');
+                    const returnedState = url.searchParams.get('state');
+                    if (!code) {
+                        throw new Error('Request missing code search parameter.');
+                    }
+                    if (returnedState !== state) {
+                        throw new Error('State mismatch. Possible CSRF attack.');
                     }
+                    const address = server.address();
+                    (0, assert_1.default)(address !== null && typeof address === 'object');
+                    const redirectUri = buildRedirectUri(address.port);
+                    const sessionSecret = await exchangeCodeForSessionSecretAsync({
+                        code,
+                        codeVerifier,
+                        redirectUri,
+                    });
                     resolve(sessionSecret);
                     redirectAndCleanup('success');
-                }
-                catch (error) {
+                };
+                handleRequestAsync().catch(error => {
                     redirectAndCleanup('error');
                     reject(error);
-                }
+                });
             });
             server.listen(0, hostname, () => {
                 log_1.default.log('Waiting for browser login...');