[eas-cli] Add changelog entry for non-interactive git fix

Add an optional nonInteractive parameter to Client.ensureRepoExistsAsync and implement it in GitClient. When nonInteractive is true, GitClient will auto-init the repo (git init), create an initial commit, and surface a single error with suggested git config commands if user.name/email are missing. Update callers across build/update/inspect/configure commands to pass the appropriate nonInteractive flag and adjust ensureRepoIsCleanAsync calls. Also resolve the workspace root for init operations and improve related log messages.

.github/actions/setup-mise/action.yml

@@ -0,0 +1,11 @@
+name: setup-mise
+description: Install tools via mise
+
+runs:
+  using: "composite"
+  steps:
+    - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      with:
+        install: true
+        cache: true
+        experimental: true

.github/workflows/build-and-deploy-worker.yml

@@ -25,7 +25,7 @@ jobs:
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
 
-      - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      - uses: ./.github/actions/setup-mise
 
       - uses: ./.github/internal-actions/setup-gcloud
 

.github/workflows/release.yml

@@ -30,9 +30,7 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn build
       - name: Ensure GraphQL schema and generated code is up-to-date
@@ -77,9 +75,7 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - run: brew install python-setuptools
         env:
           HOMEBREW_NO_AUTO_UPDATE: 1
@@ -122,9 +118,7 @@ jobs:
       contents: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - run: yarn install --frozen-lockfile --check-files
       - run: sudo apt-get install nsis
       - run: yarn build
@@ -164,11 +158,7 @@ jobs:
       id-token: write
     steps:
       - uses: actions/checkout@v4
-      - uses: actions/setup-node@v4
-        with:
-          registry-url: 'https://registry.npmjs.org/'
-          scope: 'expo'
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - name: Install dependencies
         run: yarn install --frozen-lockfile --check-files
       - name: Build
@@ -199,9 +189,7 @@ jobs:
       - uses: actions/checkout@v4
         with:
           token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - name: Install dependencies
         working-directory: ./scripts
         run: yarn install --frozen-lockfile --check-files

.github/workflows/size.yml

@@ -10,9 +10,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - uses: actions/setup-node@v2
-        with:
-          node-version: 20
+      - uses: ./.github/actions/setup-mise
       - uses: preactjs/compressed-size-action@v2
         with:
           build-script: 'build:tarballs:linux'

.github/workflows/test-graphql.yml

@@ -18,10 +18,8 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 22
+      - name: Setup tools
+        uses: ./.github/actions/setup-mise
       - run: yarn install --frozen-lockfile
       - run: yarn verify-graphql-code
         working-directory: packages/eas-cli

.github/workflows/test-scripts.yml

@@ -22,9 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v2
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 20
+      - name: Setup tools
+        uses: ./.github/actions/setup-mise
       - run: yarn install --frozen-lockfile --check-files
       - run: yarn typecheck

.github/workflows/trigger-release.yml

@@ -27,9 +27,7 @@ jobs:
           ref: main
           fetch-depth: 0
           token: ${{ secrets.EXPO_BOT_PAT }}
-      - uses: actions/setup-node@v4
-        with:
-          node-version: 22
+      - uses: ./.github/actions/setup-mise
       - run: |
           # Lerna will not detect changes correctly without having all tags
           git fetch --depth=1 origin +refs/tags/*:refs/tags/*

.github/workflows/upgrade-eas-build-modules.yml

@@ -1,81 +0,0 @@
-name: Open a PR bumping eas-build modules
-
-on: workflow_dispatch
-
-jobs:
-  open-pr:
-    name: Open a PR bumping eas-build modules
-    runs-on: ubuntu-latest
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          ref: main
-          token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - name: Setup node
-        uses: actions/setup-node@v2
-        with:
-          node-version: 20
-
-      - run: yarn install --frozen-lockfile
-
-      - name: Configure git
-        run: |
-          git config --global user.email "[email protected]"
-          git config --global user.name "Expo Bot"
-
-      - name: Upgrade eas-build modules
-        run: |
-          for DIR in packages/eas-cli packages/eas-json; do
-            pushd $DIR >/dev/null 2>&1
-              # packages are ordered according to output of `lerna list --toposort`
-              # https://github.com/expo/turtle-v2/pull/568
-              for PACKAGE in "@expo/downloader" "@expo/eas-build-job" "@expo/logger" "@expo/template-file" "@expo/steps" "@expo/turtle-spawn" "@expo/build-tools"; do
-                if grep -q $PACKAGE package.json; then
-                  echo "[$DIR] yarn --exact add $PACKAGE"
-                  yarn add --exact $PACKAGE
-                fi
-              done
-            popd >/dev/null 2>&1
-          done
-
-      - name: Set a branch name
-        id: bump-branch-name
-        run: |
-          HASH="$(echo $RANDOM | md5sum | head -c 10)"
-          BRANCH_NAME="@expo-bot/eas-build-bump-$HASH"
-
-          echo "BRANCH_NAME=$BRANCH_NAME" >> $GITHUB_OUTPUT
-
-      - name: Create a branch, commit, and push
-        run: |
-          BRANCH_NAME="${{ steps.bump-branch-name.outputs.BRANCH_NAME }}"
-
-          git checkout -b $BRANCH_NAME
-          git add .
-          git commit -m "Upgrade eas-build dependencies"
-          git push origin $BRANCH_NAME
-
-      - name: Open a PR to main
-        uses: repo-sync/pull-request@v2
-        id: open-pr
-        with:
-          source_branch: '${{ steps.bump-branch-name.outputs.BRANCH_NAME }}'
-          destination_branch: 'main'
-          pr_title: 'Upgrade eas-build dependencies'
-          pr_body: ':arrow_up: Upgrades [`eas-build`](https://github.com/expo/eas-build) dependencies.'
-          pr_reviewer: 'sjchmiela'
-          github_token: ${{ secrets.EXPO_BOT_PAT }}
-
-      - uses: actions/github-script@v3
-        with:
-          github-token: ${{ secrets.EXPO_BOT_PAT }}
-          script: |
-            github.issues.createComment({
-              issue_number: ${{ steps.open-pr.outputs.pr_number }},
-              owner: context.repo.owner,
-              repo: context.repo.repo,
-              body: "/changelog-entry chore Upgrade [`eas-build`](https://github.com/expo/eas-build) dependencies."
-            })

.github/workflows/worker-system-tests.yml

@@ -13,7 +13,7 @@ jobs:
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
 
-      - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      - uses: ./.github/actions/setup-mise
 
       - name: Create test app
         run: npx -y create-expo-app@latest ${{ runner.temp }}/test-app --template tabs

.github/workflows/worker.yml

@@ -26,7 +26,7 @@ jobs:
     steps:
       - uses: actions/checkout@08eba0b27e820071cde6df949e0beb9ba4906955 # v4
 
-      - uses: jdx/mise-action@146a28175021df8ca24f8ee1828cc2a60f980bd5 # v3.5.1
+      - uses: ./.github/actions/setup-mise
 
       - run: yarn install --frozen-lockfile --check-files
 

CHANGELOG.md

@@ -10,10 +10,13 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
-### 🐛 Bug fixes
 
 - Hide progress bar in build credits warning when usage reaches 100%. ([#3371](https://github.com/expo/eas-cli/pull/3371) by [@mackenco](https://github.com/mackenco))
 
+### 🐛 Bug fixes
+
+- Fix `--non-interactive` mode prompting for git initialization. Now auto-initializes git with an initial commit when needed. Set `EAS_NO_VCS=1` to skip. ([#3387](https://github.com/expo/eas-cli/pull/3387) by [@evanbacon](https://github.com/evanbacon))
+
 ### 🧹 Chores
 
 - Upgrade `tar` to v7. ([#3327](https://github.com/expo/eas-cli/pull/3327) by [@KarolRzeminski](https://github.com/KarolRzeminski))
@@ -22,6 +25,7 @@ This is the log of notable changes to EAS CLI and related packages.
 
 ### 🎉 New features
 
+- Add `--browser` flag to `eas login` for browser-based authentication. ([#3312](https://github.com/expo/eas-cli/pull/3312) by [@byronkarlen](https://github.com/byronkarlen))
 - List available options in non-interactive mode errors instead of generic "unable to select" messages, making CLI usable by agents and scripts. ([#3359](https://github.com/expo/eas-cli/pull/3359) by [@EvanBacon](https://github.com/EvanBacon))
 - Hidden beta version of new `eas account:usage` command for viewing account usage and billing estimates. ([#3334](https://github.com/expo/eas-cli/pull/3334) by [@douglowder](https://github.com/douglowder), [@EvanBacon](https://github.com/EvanBacon))
 - Add `--no-bytecode` and `--source-maps [mode]` flags to `eas update`. ([#3339](https://github.com/expo/eas-cli/pull/3339) by [@brentvatne](https://github.com/brentvatne))

packages/build-tools/package.json

@@ -55,6 +55,7 @@
     "fs-extra": "^11.2.0",
     "gql.tada": "^1.8.13",
     "joi": "^17.13.1",
+    "jose": "5.10.0",
     "lodash": "^4.17.21",
     "node-fetch": "^2.7.0",
     "node-forge": "^1.3.1",
@@ -86,6 +87,7 @@
     "bunyan": "^1.8.15",
     "jest": "^29.7.0",
     "memfs": "^4.17.1",
+    "nock": "13.4.0",
     "ts-jest": "^29.1.4",
     "ts-mockito": "^2.6.1",
     "tslib": "^2.6.3",

packages/build-tools/src/steps/easFunctions.ts

@@ -36,6 +36,7 @@ import { createStartAndroidEmulatorBuildFunction } from './functions/startAndroi
 import { createStartCuttlefishDeviceBuildFunction } from './functions/startCuttlefishDevice';
 import { createStartIosSimulatorBuildFunction } from './functions/startIosSimulator';
 import { createUploadArtifactBuildFunction } from './functions/uploadArtifact';
+import { createUploadToAscBuildFunction } from './functions/uploadToAsc';
 import { createSetUpNpmrcBuildFunction } from './functions/useNpmToken';
 import { CustomBuildContext } from '../customBuildContext';
 
@@ -75,6 +76,7 @@ export function getEasFunctions(ctx: CustomBuildContext): BuildFunction[] {
     calculateEASUpdateRuntimeVersionFunction(),
 
     createSubmissionEntityFunction(),
+    createUploadToAscBuildFunction(),
 
     createInternalEasMaestroTestFunction(ctx),
   ];

packages/build-tools/src/steps/functions/uploadToAsc.ts

@@ -0,0 +1,330 @@
+import {
+  BuildFunction,
+  BuildStepInput,
+  BuildStepInputValueTypeName,
+  BuildStepOutput,
+} from '@expo/steps';
+import fs from 'fs-extra';
+import * as jose from 'jose';
+import fetch from 'node-fetch';
+import path from 'node:path';
+import { setTimeout } from 'node:timers/promises';
+import { z } from 'zod';
+
+import { AscApiClient, AscApiClientPostApi } from '../utils/ios/AscApiClient';
+
+export function createUploadToAscBuildFunction(): BuildFunction {
+  return new BuildFunction({
+    namespace: 'eas',
+    id: 'upload_to_asc',
+    name: 'Upload to App Store Connect',
+    __metricsId: 'eas/upload_to_asc',
+    inputProviders: [
+      BuildStepInput.createProvider({
+        id: 'ipa_path',
+        required: true,
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+      }),
+      BuildStepInput.createProvider({
+        id: 'asc_api_key_path',
+        required: true,
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+      }),
+      BuildStepInput.createProvider({
+        id: 'apple_app_identifier',
+        required: true,
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+      }),
+      BuildStepInput.createProvider({
+        id: 'bundle_version',
+        required: true,
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+      }),
+      BuildStepInput.createProvider({
+        id: 'bundle_short_version',
+        required: true,
+        allowedValueTypeName: BuildStepInputValueTypeName.STRING,
+      }),
+      BuildStepInput.createProvider({
+        id: 'wait_for_processing',
+        required: false,
+        defaultValue: false,
+        allowedValueTypeName: BuildStepInputValueTypeName.BOOLEAN,
+      }),
+    ],
+    outputProviders: [
+      BuildStepOutput.createProvider({
+        id: 'build_upload_id',
+        required: false,
+      }),
+      BuildStepOutput.createProvider({
+        id: 'build_upload_url',
+        required: false,
+      }),
+    ],
+    fn: async (stepsCtx, { inputs, outputs }) => {
+      const ipaPathInput = z.string().parse(inputs.ipa_path.value);
+      const ascApiKeyPathInput = z.string().parse(inputs.asc_api_key_path.value);
+      const appleAppIdentifier = z.string().parse(inputs.apple_app_identifier.value);
+      const bundleVersion = z.string().parse(inputs.bundle_version.value);
+      const bundleShortVersion = z.string().parse(inputs.bundle_short_version.value);
+      const waitForProcessing = Boolean(inputs.wait_for_processing.value);
+
+      const ipaPath = path.resolve(stepsCtx.workingDirectory, ipaPathInput);
+      if (!(await fs.pathExists(ipaPath))) {
+        throw new Error(`IPA file not found: ${ipaPath}`);
+      }
+      const fileSize = (await fs.stat(ipaPath)).size;
+      const fileName = path.basename(ipaPath);
+
+      const ascApiKeyPath = path.resolve(stepsCtx.workingDirectory, ascApiKeyPathInput);
+      if (!(await fs.pathExists(ascApiKeyPath))) {
+        throw new Error(`ASC API Key file not found: ${ascApiKeyPath}`);
+      }
+
+      const ascApiKeyJson = await fs.readJson(ascApiKeyPath);
+      const ascApiKey = z
+        .object({
+          issuer_id: z.string(),
+          key_id: z.string(),
+          key: z.string(),
+        })
+        .parse(ascApiKeyJson);
+
+      const privateKey = await jose.importPKCS8(ascApiKey.key, 'ES256');
+      const token = await new jose.SignJWT({})
+        .setProtectedHeader({ alg: 'ES256', kid: ascApiKey.key_id })
+        .setIssuer(ascApiKey.issuer_id)
+        .setAudience('appstoreconnect-v1')
+        .setExpirationTime('20m')
+        .sign(privateKey);
+
+      const client = new AscApiClient({ token, logger: stepsCtx.logger });
+
+      stepsCtx.logger.info('Reading App information...');
+      const appResponse = await client.getAsync(
+        '/v1/apps/:id',
+        { 'fields[apps]': ['bundleId', 'name'] },
+        { id: appleAppIdentifier }
+      );
+      stepsCtx.logger.info(
+        `Uploading Build to "${appResponse.data.attributes.name}" (${appResponse.data.attributes.bundleId})...`
+      );
+
+      stepsCtx.logger.info('Creating Build Upload...');
+      const buildUploadResponse = await client.postAsync('/v1/buildUploads', {
+        data: {
+          type: 'buildUploads',
+          attributes: {
+            platform: 'IOS',
+            cfBundleShortVersionString: bundleShortVersion,
+            cfBundleVersion: bundleVersion,
+          },
+          relationships: {
+            app: {
+              data: {
+                type: 'apps',
+                id: appleAppIdentifier,
+              },
+            },
+          },
+        },
+      });
+
+      const buildUploadId = buildUploadResponse.data.id;
+      const buildUploadUrl = `https://appstoreconnect.apple.com/apps/${appleAppIdentifier}/testflight/ios/${buildUploadId}`;
+      outputs.build_upload_id.set(buildUploadId);
+      outputs.build_upload_url.set(buildUploadUrl);
+
+      stepsCtx.logger.info(
+        `Build Upload initialized (ID: ${buildUploadId}). Preparing IPA upload...`
+      );
+      const buildFileResponse = await client.postAsync('/v1/buildUploadFiles', {
+        data: {
+          type: 'buildUploadFiles',
+          attributes: {
+            assetType: 'ASSET',
+            fileName,
+            fileSize,
+            uti: 'com.apple.ipa',
+          },
+          relationships: {
+            buildUpload: {
+              data: {
+                type: 'buildUploads',
+                id: buildUploadId,
+              },
+            },
+          },
+        },
+      });
+
+      stepsCtx.logger.info(
+        `IPA Upload initialized (ID: ${buildFileResponse.data.id}). Uploading IPA...`
+      );
+      await uploadChunksAsync({
+        uploadOperations: buildFileResponse.data.attributes.uploadOperations,
+        ipaPath,
+        logger: stepsCtx.logger,
+      });
+
+      stepsCtx.logger.info('Committing upload...');
+      await client.patchAsync(
+        `/v1/buildUploadFiles/:id`,
+        {
+          data: {
+            type: 'buildUploadFiles',
+            id: buildFileResponse.data.id,
+            attributes: {
+              uploaded: true,
+            },
+          },
+        },
+        {
+          id: buildFileResponse.data.id,
+        }
+      );
+
+      stepsCtx.logger.info('Checking upload file status...');
+      const waitingForFileStartedAt = Date.now();
+      while (Date.now() - waitingForFileStartedAt < 60 * 1000 /* 60 seconds */) {
+        const {
+          data: {
+            attributes: { assetDeliveryState },
+          },
+        } = await client.getAsync(
+          `/v1/buildUploadFiles/:id`,
+          { 'fields[buildUploadFiles]': ['assetDeliveryState'] },
+          { id: buildFileResponse.data.id }
+        );
+
+        if (assetDeliveryState.state === 'AWAITING_UPLOAD') {
+          stepsCtx.logger.info(
+            `Waiting for file upload to complete processing... (state = ${assetDeliveryState.state})`
+          );
+          await setTimeout(2000);
+          continue;
+        }
+
+        const { errors = [], warnings = [] } = assetDeliveryState;
+        if (warnings.length > 0) {
+          stepsCtx.logger.warn(`Warnings:\n${itemizeMessages(warnings)}\n`);
+        }
+        if (errors.length > 0) {
+          stepsCtx.logger.error(`Errors:\n${itemizeMessages(errors)}\n`);
+        }
+
+        if (assetDeliveryState.state === 'FAILED') {
+          throw new Error(`File upload (ID: ${buildFileResponse.data.id}) failed.`);
+        } else if (
+          assetDeliveryState.state === 'COMPLETE' ||
+          assetDeliveryState.state === 'UPLOAD_COMPLETE'
+        ) {
+          stepsCtx.logger.info(`File upload (ID: ${buildFileResponse.data.id}) completed!`);
+        }
+        break;
+      }
+
+      stepsCtx.logger.info(`See your build in App Store Connect: ${buildUploadUrl}`);
+
+      if (!waitForProcessing) {
+        stepsCtx.logger.info('Skipping waiting for processing.');
+        return;
+      }
+
+      stepsCtx.logger.info('Checking build upload status...');
+      const waitingForBuildStartedAt = Date.now();
+      while (Date.now() - waitingForBuildStartedAt < 10 * 60 * 1000 /* 10 minutes */) {
+        const {
+          data: {
+            attributes: { state },
+          },
+        } = await client.getAsync(
+          `/v1/buildUploads/:id`,
+          { 'fields[buildUploads]': ['state', 'build'], include: ['build'] },
+          { id: buildUploadId }
+        );
+
+        if (state.state === 'AWAITING_UPLOAD' || state.state === 'PROCESSING') {
+          stepsCtx.logger.info(`Waiting for build upload to complete... (status = ${state.state})`);
+          await setTimeout(2000);
+          continue;
+        }
+
+        stepsCtx.logger.info('\n');
+
+        const { errors = [], warnings = [], infos = [] } = state;
+        if (infos.length > 0) {
+          stepsCtx.logger.info(`Infos:\n${itemizeMessages(infos)}\n`);
+        }
+        if (warnings.length > 0) {
+          stepsCtx.logger.warn(`Warnings:\n${itemizeMessages(warnings)}\n`);
+        }
+        if (errors.length > 0) {
+          stepsCtx.logger.error(`Errors:\n${itemizeMessages(errors)}\n`);
+        }
+
+        if (state.state === 'FAILED') {
+          throw new Error(`Build upload (ID: ${buildUploadId}) failed.`);
+        } else if (state.state === 'COMPLETE') {
+          stepsCtx.logger.info(`Build upload (ID: ${buildUploadId}) complete!`);
+        }
+        break;
+      }
+    },
+  });
+}
+
+function itemizeMessages(messages: { description: string; code: string }[]): string {
+  return `- ${messages.map(m => `${m.description} (${m.code})`).join('\n- ')}`;
+}
+
+async function uploadChunksAsync({
+  uploadOperations,
+  ipaPath,
+  logger,
+}: {
+  uploadOperations: AscApiClientPostApi['/v1/buildUploadFiles']['response']['data']['attributes']['uploadOperations'];
+  ipaPath: string;
+  logger: { info: (message: string) => void };
+}): Promise<void> {
+  const fd = await fs.open(ipaPath, 'r');
+  try {
+    const promises = uploadOperations.map(async (op, index) => {
+      logger.info(
+        `  Uploading chunk ${index + 1}/${uploadOperations.length} (offset: ${op.offset}, length: ${
+          op.length
+        })...`
+      );
+
+      const buffer = new Uint8Array(op.length);
+      await fs.read(fd, buffer, 0, op.length, op.offset);
+
+      const headers: Record<string, string> = {
+        'Content-Type': 'application/octet-stream',
+      };
+
+      for (const { name, value } of op.requestHeaders) {
+        headers[name] = value;
+      }
+
+      const response = await fetch(op.url, {
+        method: op.method,
+        headers,
+        body: buffer,
+      });
+
+      if (!response.ok) {
+        const text = await response.text();
+        throw new Error(
+          `Failed to upload chunk ${index + 1}: ${response.status} ${response.statusText}\n${text}`
+        );
+      }
+      logger.info(`  Chunk ${index + 1}/${uploadOperations.length} uploaded.`);
+    });
+
+    await Promise.all(promises);
+  } finally {
+    await fs.close(fd);
+  }
+}

packages/build-tools/src/steps/utils/ios/AscApiClient.ts

@@ -1,9 +1,8 @@
+import { bunyan } from '@expo/logger';
 import { asyncResult } from '@expo/results';
 import fetch from 'node-fetch';
 import { ZodError, z } from 'zod';
 
-import Log from '../../log';
-
 type ApiSchema = {
   [Path in string]: {
     path?: z.ZodType<Record<string, string>>;
@@ -240,9 +239,11 @@ export type AscApiClientPatchApi = {
 export class AscApiClient {
   private readonly baseUrl = 'https://api.appstoreconnect.apple.com';
   private readonly token: string;
+  private readonly logger?: bunyan;
 
-  constructor({ token }: { token: string }) {
+  constructor({ token, logger }: { token: string; logger?: bunyan }) {
     this.token = token;
+    this.logger = logger;
   }
 
   public async getAsync<TPath extends keyof typeof GetApi>(
@@ -257,9 +258,18 @@ export class AscApiClient {
       effectivePath = effectivePath.replace(`:${key}`, String(value));
     }
 
+    const searchParams = new URLSearchParams();
+    for (const [key, value] of Object.entries(body)) {
+      if (Array.isArray(value)) {
+        searchParams.set(key, value.join(','));
+      } else {
+        searchParams.set(key, String(value));
+      }
+    }
+
     return await this.sendRequestAsync({
       method: 'GET',
-      path: `${effectivePath}?${new URLSearchParams(body).toString()}`,
+      path: `${effectivePath}?${searchParams.toString()}`,
       body,
       requestSchema: schema.request,
       responseSchema: schema.response,
@@ -343,7 +353,7 @@ export class AscApiClient {
 
     const json = await response.json();
 
-    Log.debug(`Response from App Store Connect: ${JSON.stringify(json, null, 2)}`);
+    this.logger?.debug(`Response from App Store Connect: ${JSON.stringify(json, null, 2)}`);
 
     const parsedResponse = await asyncResult((async () => responseSchema.parse(json))());
     if (!parsedResponse.ok) {

packages/build-tools/src/steps/utils/ios/__tests__/AscApiClient.test.ts

@@ -2,6 +2,9 @@ import nock from 'nock';
 
 import { AscApiClient } from '../AscApiClient';
 
+// nock needs real fetch implementation
+jest.unmock('node-fetch');
+
 describe(AscApiClient, () => {
   const token = 'test-token';
   const client = new AscApiClient({ token });

packages/eas-cli/package.json

@@ -61,7 +61,6 @@
     "invariant": "^2.2.2",
     "jks-js": "1.1.0",
     "joi": "17.11.0",
-    "jsonwebtoken": "9.0.0",
     "keychain": "1.5.0",
     "log-symbols": "4.1.0",
     "mime": "3.0.0",
@@ -109,7 +108,6 @@
     "@types/fs-extra": "11.0.4",
     "@types/getenv": "^1.0.0",
     "@types/invariant": "^2.2.37",
-    "@types/jsonwebtoken": "8.5.1",
     "@types/mime": "3.0.1",
     "@types/node-fetch": "2.6.12",
     "@types/node-forge": "1.3.1",

packages/eas-cli/scripts/pretarball-ci.sh

@@ -5,8 +5,57 @@ set -eo pipefail
 EAS_CLI_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )"/.. && pwd )"
 PACKAGE_JSON_PATH="$EAS_CLI_DIR/package.json"
 
-if [[ "$OSTYPE" == "darwin"* ]]; then
-  sed -i '' "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-else
-  sed -i  "s/\\\"@expo\/eas-json\\\": \\\".*\\\"/\\\"@expo\/eas-json\\\": \\\"file:..\/..\/..\/eas-json\\\"/g" $PACKAGE_JSON_PATH
-fi
+# Define local packages and their directory names
+# Only include packages that both exist in packages/ and are dependencies of the packages we care about
+# We start with direct dependencies of eas-cli and their own local dependencies
+PACKAGES=(
+  "@expo/eas-json:eas-json"
+  "@expo/eas-build-job:eas-build-job"
+  "@expo/logger:logger"
+  "@expo/steps:steps"
+)
+
+# Function to rewrite dependencies in a package.json file
+rewrite_deps() {
+  local PKG_JSON=$1
+  local IS_EAS_CLI=$2
+
+  for package in "${PACKAGES[@]}" ; do
+    KEY="${package%%:*}"
+    DIR="${package##*:}"
+
+    # Determine the relative path. If IS_EAS_CLI we go one level deeper because oclif builds in `tmp` in current directory.
+    if [[ "$IS_EAS_CLI" == "true" ]]; then
+      REL_PATH="file:../../../$DIR"
+    else
+      REL_PATH="file:../$DIR"
+    fi
+
+    # Replace version with relative path
+    # Using # delimiter for sed to handle slashes
+    if [[ "$OSTYPE" == "darwin"* ]]; then
+      sed -i '' "s#\"$KEY\": \".*\"#\"$KEY\": \"$REL_PATH\"#g" "$PKG_JSON"
+    else
+      sed -i "s#\"$KEY\": \".*\"#\"$KEY\": \"$REL_PATH\"#g" "$PKG_JSON"
+    fi
+  done
+}
+
+# Update eas-cli/package.json
+echo "Updating eas-cli/package.json"
+rewrite_deps "$PACKAGE_JSON_PATH" "true"
+
+# Update other relevant local packages
+# We iterate the PACKAGES list itself to find their locations and update them
+# This ensures we only touch packages that are part of the dependency graph we care about
+WORKSPACE_ROOT="$(cd "$EAS_CLI_DIR/.." && pwd)"
+
+for package in "${PACKAGES[@]}" ; do
+  DIR="${package##*:}"
+  PKG_JSON="$WORKSPACE_ROOT/$DIR/package.json"
+
+  if [[ -f "$PKG_JSON" ]]; then
+    echo "Updating $DIR/package.json"
+    rewrite_deps "$PKG_JSON" "false"
+  fi
+done

packages/eas-cli/src/build/runBuildAndSubmit.ts

@@ -128,7 +128,7 @@ export async function runBuildAndSubmitAsync({
   buildIds: string[];
   buildProfiles?: ProfileData<'build'>[];
 }> {
-  await vcsClient.ensureRepoExistsAsync();
+  await vcsClient.ensureRepoExistsAsync({ nonInteractive: flags.nonInteractive });
   await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
 
   await ensureProjectConfiguredAsync({

packages/eas-cli/src/commands/account/login.ts

@@ -17,6 +17,11 @@ export default class AccountLogin extends EasCommand {
       char: 's',
       default: false,
     }),
+    browser: Flags.boolean({
+      description: 'Login with your browser',
+      char: 'b',
+      default: false,
+    }),
   };
 
   static override contextDefinition = {
@@ -26,7 +31,7 @@ export default class AccountLogin extends EasCommand {
 
   async runAsync(): Promise<void> {
     const {
-      flags: { sso },
+      flags: { sso, browser },
     } = await this.parse(AccountLogin);
 
     const {
@@ -51,7 +56,7 @@ export default class AccountLogin extends EasCommand {
       }
     }
 
-    await sessionManager.showLoginPromptAsync({ sso });
+    await sessionManager.showLoginPromptAsync({ sso, browser });
     Log.log('Logged in');
   }
 }

packages/eas-cli/src/commands/build/configure.ts

@@ -46,9 +46,7 @@ export default class BuildConfigure extends EasCommand {
       '💡 The following process will configure your iOS and/or Android project to be compatible with EAS Build. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    // BuildConfigure.ContextOptions.Vcs.client.getValueAsync()
-
-    await vcsClient.ensureRepoExistsAsync();
+    await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
 
     const expoUpdatesIsInstalled = isExpoUpdatesInstalled(projectDir);
 

packages/eas-cli/src/commands/build/dev.ts

@@ -74,8 +74,8 @@ export default class BuildDev extends EasCommand {
       Errors.error('Running iOS builds in simulator is only supported on macOS.', { exit: 1 });
     }
 
-    await vcsClient.ensureRepoExistsAsync();
-    await ensureRepoIsCleanAsync(vcsClient, flags.nonInteractive);
+    await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
+    await ensureRepoIsCleanAsync(vcsClient, false);
     await ensureProjectConfiguredAsync({
       projectDir,
       nonInteractive: false,

packages/eas-cli/src/commands/build/inspect.ts

@@ -94,7 +94,7 @@ export default class BuildInspect extends EasCommand {
     await this.prepareOutputDirAsync(outputDirectory, flags.force);
 
     if (flags.stage === InspectStage.ARCHIVE) {
-      await vcsClient.ensureRepoExistsAsync();
+      await vcsClient.ensureRepoExistsAsync({ nonInteractive: false });
       await vcsClient.makeShallowCopyAsync(tmpWorkingdir);
       await this.copyToOutputDirAsync(tmpWorkingdir, outputDirectory);
     } else {

packages/eas-cli/src/commands/submit/upload-to-asc.ts

@@ -1,297 +0,0 @@
-import { Flags } from '@oclif/core';
-import fs from 'fs-extra';
-import jwt from 'jsonwebtoken';
-import fetch from 'node-fetch';
-import path from 'path';
-import { setTimeout } from 'timers/promises';
-import { z } from 'zod';
-
-import EasCommand from '../../commandUtils/EasCommand';
-import Log from '../../log';
-import { AscApiClient, AscApiClientPostApi } from '../../submit/ios/AscApiClient';
-
-export default class SubmitUploadToAsc extends EasCommand {
-  static override hidden = true;
-
-  static override flags = {
-    'ipa-path': Flags.string({
-      description: 'Path to the IPA file',
-      required: true,
-    }),
-    'asc-api-key-path': Flags.string({
-      description: 'Path to the App Store Connect API Key JSON file',
-      required: true,
-    }),
-    'apple-app-identifier': Flags.string({
-      description: 'App Store Connect App ID (e.g. 1491144534)',
-      required: true,
-    }),
-    'bundle-version': Flags.string({
-      description: 'CFBundleVersion (Build Version, e.g. 13)',
-      required: true,
-    }),
-    'bundle-short-version': Flags.string({
-      description: 'CFBundleShortVersionString (Marketing Version, e.g. 1.0.0)',
-      required: true,
-    }),
-    'wait-for-processing': Flags.boolean({
-      description: 'Wait for the upload to complete processing',
-      default: false,
-    }),
-  };
-
-  async runAsync(): Promise<void> {
-    const { flags } = await this.parse(SubmitUploadToAsc);
-
-    const ipaPath = path.resolve(flags['ipa-path']);
-    if (!(await fs.pathExists(ipaPath))) {
-      throw new Error(`IPA file not found: ${ipaPath}`);
-    }
-    const fileSize = (await fs.stat(ipaPath)).size;
-    const fileName = path.basename(ipaPath);
-
-    const ascApiKeyPath = path.resolve(flags['asc-api-key-path']);
-    if (!(await fs.pathExists(ascApiKeyPath))) {
-      throw new Error(`ASC API Key file not found: ${ascApiKeyPath}`);
-    }
-
-    const ascApiKeyJson = await fs.readJson(ascApiKeyPath);
-    const ascApiKey = z
-      .object({
-        issuer_id: z.string(),
-        key_id: z.string(),
-        key: z.string(),
-      })
-      .parse(ascApiKeyJson);
-
-    const token = jwt.sign({}, ascApiKey.key, {
-      algorithm: 'ES256',
-      issuer: ascApiKey.issuer_id,
-      expiresIn: '20m',
-      audience: 'appstoreconnect-v1',
-      header: {
-        kid: ascApiKey.key_id,
-      },
-    });
-
-    const client = new AscApiClient({ token });
-
-    Log.log('Reading App information...');
-    const appleAppIdentifier = flags['apple-app-identifier'];
-    const appResponse = await client.getAsync(
-      '/v1/apps/:id',
-      { 'fields[apps]': ['bundleId', 'name'] },
-      { id: appleAppIdentifier }
-    );
-    Log.log(
-      `Uploading Build to "${appResponse.data.attributes.name}" (${appResponse.data.attributes.bundleId})...`
-    );
-
-    Log.log('Creating Build Upload...');
-    const buildUploadResponse = await client.postAsync('/v1/buildUploads', {
-      data: {
-        type: 'buildUploads',
-        attributes: {
-          platform: 'IOS',
-          cfBundleShortVersionString: flags['bundle-short-version'],
-          cfBundleVersion: flags['bundle-version'],
-        },
-        relationships: {
-          app: {
-            data: {
-              type: 'apps',
-              id: appleAppIdentifier,
-            },
-          },
-        },
-      },
-    });
-
-    const buildUploadId = buildUploadResponse.data.id;
-
-    Log.log(`Build Upload initialized (ID: ${buildUploadId}). Preparing IPA upload...`);
-    const buildFileResponse = await client.postAsync('/v1/buildUploadFiles', {
-      data: {
-        type: 'buildUploadFiles',
-        attributes: {
-          assetType: 'ASSET',
-          fileName,
-          fileSize,
-          uti: 'com.apple.ipa',
-        },
-        relationships: {
-          buildUpload: {
-            data: {
-              type: 'buildUploads',
-              id: buildUploadId,
-            },
-          },
-        },
-      },
-    });
-
-    Log.log(`IPA Upload initialized (ID: ${buildFileResponse.data.id}). Uploading IPA...`);
-    await uploadChunksAsync({
-      uploadOperations: buildFileResponse.data.attributes.uploadOperations,
-      ipaPath,
-    });
-
-    Log.log('Committing upload...');
-    await client.patchAsync(
-      `/v1/buildUploadFiles/:id`,
-      {
-        data: {
-          type: 'buildUploadFiles',
-          id: buildFileResponse.data.id,
-          attributes: {
-            uploaded: true,
-          },
-        },
-      },
-      {
-        id: buildFileResponse.data.id,
-      }
-    );
-
-    Log.log('Checking upload file status...');
-    const waitingForFileStartedAt = performance.now();
-    while (performance.now() - waitingForFileStartedAt < 60 * 1000 /* 60 seconds */) {
-      const {
-        data: {
-          attributes: { assetDeliveryState },
-        },
-      } = await client.getAsync(
-        `/v1/buildUploadFiles/:id`,
-        { 'fields[buildUploadFiles]': ['assetDeliveryState'] },
-        { id: buildFileResponse.data.id }
-      );
-
-      if (assetDeliveryState.state === 'AWAITING_UPLOAD') {
-        Log.log(
-          `Waiting for file upload to complete processing... (state = ${assetDeliveryState.state})`
-        );
-        await setTimeout(2000);
-        continue;
-      }
-
-      const { errors = [], warnings = [] } = assetDeliveryState;
-      if (warnings.length > 0) {
-        Log.warn(`Warnings:\n${itemizeMessages(warnings)}\n`);
-      }
-      if (errors.length > 0) {
-        Log.error(`Errors:\n${itemizeMessages(errors)}\n`);
-      }
-
-      if (assetDeliveryState.state === 'FAILED') {
-        throw new Error(`File upload (ID: ${buildFileResponse.data.id}) failed.`);
-      } else if (
-        assetDeliveryState.state === 'COMPLETE' ||
-        assetDeliveryState.state === 'UPLOAD_COMPLETE'
-      ) {
-        Log.log(`File upload (ID: ${buildFileResponse.data.id}) completed!`);
-      }
-      break;
-    }
-
-    Log.log(
-      `See your build in App Store Connect: https://appstoreconnect.apple.com/apps/${appleAppIdentifier}/testflight/ios/${buildUploadId}`
-    );
-
-    if (!flags['wait-for-processing']) {
-      Log.log('Skipping waiting for processing.');
-      return;
-    }
-
-    Log.log('Checking build upload status...');
-    const waitingForBuildStartedAt = performance.now();
-    while (performance.now() - waitingForBuildStartedAt < 10 * 60 * 1000 /* 10 minutes */) {
-      const {
-        data: {
-          attributes: { state },
-        },
-      } = await client.getAsync(
-        `/v1/buildUploads/:id`,
-        { 'fields[buildUploads]': ['state', 'build'], include: ['build'] },
-        { id: buildUploadId }
-      );
-
-      if (state.state === 'AWAITING_UPLOAD' || state.state === 'PROCESSING') {
-        Log.log(`Waiting for build upload to complete... (status = ${state.state})`);
-        await setTimeout(2000);
-        continue;
-      }
-
-      Log.log('\n');
-
-      const { errors = [], warnings = [], infos = [] } = state;
-      if (infos.length > 0) {
-        Log.log(`Infos:\n${itemizeMessages(infos)}\n`);
-      }
-      if (warnings.length > 0) {
-        Log.warn(`Warnings:\n${itemizeMessages(warnings)}\n`);
-      }
-      if (errors.length > 0) {
-        Log.error(`Errors:\n${itemizeMessages(errors)}\n`);
-      }
-
-      if (state.state === 'FAILED') {
-        throw new Error(`Build upload (ID: ${buildUploadId}) failed.`);
-      } else if (state.state === 'COMPLETE') {
-        Log.log(`Build upload (ID: ${buildUploadId}) complete!`);
-      }
-      break;
-    }
-  }
-}
-
-function itemizeMessages(messages: { description: string; code: string }[]): string {
-  return `- ${messages.map(m => `${m.description} (${m.code})`).join('\n- ')}`;
-}
-
-async function uploadChunksAsync({
-  uploadOperations,
-  ipaPath,
-}: {
-  uploadOperations: AscApiClientPostApi['/v1/buildUploadFiles']['response']['data']['attributes']['uploadOperations'];
-  ipaPath: string;
-}): Promise<void> {
-  const fd = await fs.open(ipaPath, 'r');
-  try {
-    const promises = uploadOperations.map(async (op, index) => {
-      Log.log(
-        `  Uploading chunk ${index + 1}/${uploadOperations.length} (offset: ${op.offset}, length: ${
-          op.length
-        })...`
-      );
-
-      const buffer = new Uint8Array(op.length);
-      await fs.read(fd, buffer, 0, op.length, op.offset);
-
-      const headers: Record<string, string> = {
-        'Content-Type': 'application/octet-stream',
-      };
-
-      for (const { name, value } of op.requestHeaders) {
-        headers[name] = value;
-      }
-
-      const response = await fetch(op.url, {
-        method: op.method,
-        headers,
-        body: buffer,
-      });
-
-      if (!response.ok) {
-        const text = await response.text();
-        throw new Error(
-          `Failed to upload chunk ${index + 1}: ${response.status} ${response.statusText}\n${text}`
-        );
-      }
-      Log.log(`  Chunk ${index + 1}/${uploadOperations.length} uploaded.`);
-    });
-
-    await Promise.all(promises);
-  } finally {
-    await fs.close(fd);
-  }
-}

packages/eas-cli/src/commands/update/configure.ts

@@ -46,7 +46,7 @@ export default class UpdateConfigure extends EasCommand {
       '💡 The following process will configure your project to use EAS Update. These changes only apply to your local project files and you can safely revert them at any time.'
     );
 
-    await vcsClient.ensureRepoExistsAsync();
+    await vcsClient.ensureRepoExistsAsync({ nonInteractive: flags['non-interactive'] });
 
     const easJsonAccessor = EasJsonAccessor.fromProjectPath(projectDir);
     const easJsonCliConfig: EasJson['cli'] =

packages/eas-cli/src/commands/update/index.ts

@@ -240,7 +240,7 @@ export default class UpdatePublish extends EasCommand {
       enableJsonOutput();
     }
 
-    await vcsClient.ensureRepoExistsAsync();
+    await vcsClient.ensureRepoExistsAsync({ nonInteractive });
     await ensureRepoIsCleanAsync(vcsClient, nonInteractive);
 
     const {

packages/eas-cli/src/user/SessionManager.ts

@@ -4,8 +4,8 @@ import assert from 'assert';
 import chalk from 'chalk';
 import nullthrows from 'nullthrows';
 
-import { fetchSessionSecretAndSsoUserAsync } from './fetchSessionSecretAndSsoUser';
 import { fetchSessionSecretAndUserAsync } from './fetchSessionSecretAndUser';
+import { fetchSessionSecretAndUserFromBrowserAuthFlowAsync } from './fetchSessionSecretAndUserFromBrowserAuthFlow';
 import { ApiV2Error } from '../ApiV2Error';
 import { AnalyticsWithOrchestration } from '../analytics/AnalyticsManager';
 import { ApiV2Client } from '../api';
@@ -149,6 +149,7 @@ export default class SessionManager {
     nonInteractive = false,
     printNewLine = false,
     sso = false,
+    browser = false,
   } = {}): Promise<void> {
     if (nonInteractive) {
       Errors.error(
@@ -164,8 +165,8 @@ export default class SessionManager {
       Log.newLine();
     }
 
-    if (sso) {
-      await this.ssoLoginAsync();
+    if (sso || browser) {
+      await this.browserLoginAsync({ sso });
       return;
     }
 
@@ -205,8 +206,10 @@ export default class SessionManager {
     }
   }
 
-  private async ssoLoginAsync(): Promise<void> {
-    const { sessionSecret, id, username } = await fetchSessionSecretAndSsoUserAsync();
+  private async browserLoginAsync({ sso = false }): Promise<void> {
+    const { sessionSecret, id, username } = await fetchSessionSecretAndUserFromBrowserAuthFlowAsync(
+      { sso }
+    );
     await this.setSessionAsync({
       sessionSecret,
       userId: id,

packages/eas-cli/src/user/__tests__/SessionManager-test.ts

@@ -9,8 +9,8 @@ import Log from '../../log';
 import { promptAsync, selectAsync } from '../../prompts';
 import { getStateJsonPath } from '../../utils/paths';
 import SessionManager, { UserSecondFactorDeviceMethod } from '../SessionManager';
-import { fetchSessionSecretAndSsoUserAsync } from '../fetchSessionSecretAndSsoUser';
 import { fetchSessionSecretAndUserAsync } from '../fetchSessionSecretAndUser';
+import { fetchSessionSecretAndUserFromBrowserAuthFlowAsync } from '../fetchSessionSecretAndUserFromBrowserAuthFlow';
 
 jest.mock('../../prompts');
 jest.mock('../../log');
@@ -25,7 +25,7 @@ jest.mock('../../graphql/queries/UserQuery', () => ({
   },
 }));
 jest.mock('../fetchSessionSecretAndUser');
-jest.mock('../fetchSessionSecretAndSsoUser');
+jest.mock('../fetchSessionSecretAndUserFromBrowserAuthFlow');
 jest.mock('../../api');
 
 const authStub: any = {
@@ -156,15 +156,15 @@ describe(SessionManager, () => {
     });
   });
 
-  describe('ssoLoginAsync', () => {
-    it('saves user data to ~/.expo/state.json', async () => {
-      jest.mocked(fetchSessionSecretAndSsoUserAsync).mockResolvedValue({
+  describe('browserLoginAsync', () => {
+    it('saves user data to ~/.expo/state.json with sso', async () => {
+      jest.mocked(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).mockResolvedValue({
         sessionSecret: 'SESSION_SECRET',
         id: 'USER_ID',
         username: 'USERNAME',
       });
       const sessionManager = new SessionManager(analytics);
-      await sessionManager['ssoLoginAsync']();
+      await sessionManager['browserLoginAsync']({ sso: true });
       expect(await fs.readFile(getStateJsonPath(), 'utf8')).toMatchInlineSnapshot(`
         "{
           "auth": {
@@ -176,6 +176,31 @@ describe(SessionManager, () => {
         }
         "
       `);
+      expect(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).toHaveBeenCalledWith({ sso: true });
+    });
+
+    it('saves user data to ~/.expo/state.json without sso', async () => {
+      jest.mocked(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).mockResolvedValue({
+        sessionSecret: 'SESSION_SECRET',
+        id: 'USER_ID',
+        username: 'USERNAME',
+      });
+      const sessionManager = new SessionManager(analytics);
+      await sessionManager['browserLoginAsync']({ sso: false });
+      expect(await fs.readFile(getStateJsonPath(), 'utf8')).toMatchInlineSnapshot(`
+        "{
+          "auth": {
+            "sessionSecret": "SESSION_SECRET",
+            "userId": "USER_ID",
+            "username": "USERNAME",
+            "currentConnection": "Browser-Flow-Authentication"
+          }
+        }
+        "
+      `);
+      expect(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).toHaveBeenCalledWith({
+        sso: false,
+      });
     });
   });
 
@@ -292,7 +317,18 @@ describe(SessionManager, () => {
       // SSO login
       await sessionManager.showLoginPromptAsync({ sso: true });
       expect(promptAsync).not.toHaveBeenCalled();
-      expect(fetchSessionSecretAndSsoUserAsync).toHaveBeenCalled();
+      expect(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).toHaveBeenCalledWith({ sso: true });
+    });
+
+    it('calls browser login if the browser flag is true', async () => {
+      const sessionManager = new SessionManager(analytics);
+
+      // Browser login (not SSO)
+      await sessionManager.showLoginPromptAsync({ browser: true });
+      expect(promptAsync).not.toHaveBeenCalled();
+      expect(fetchSessionSecretAndUserFromBrowserAuthFlowAsync).toHaveBeenCalledWith({
+        sso: false,
+      });
     });
   });
 

packages/eas-cli/src/user/expoBrowserAuthFlowLauncher.ts

@@ -4,53 +4,22 @@ import http from 'http';
 import { Socket } from 'node:net';
 import querystring from 'querystring';
 
+import { getExpoWebsiteBaseUrl } from '../api';
 import Log from '../log';
 
-const successBody = `
-<!DOCTYPE html>
-<html lang="en">
-<head>
-  <title>Expo SSO Login</title>
-  <meta charset="utf-8">
-  <style type="text/css">
-    html {
-      margin: 0;
-      padding: 0
-    }
-
-    body {
-      background-color: #fff;
-      font-family: Tahoma,Verdana;
-      font-size: 16px;
-      color: #000;
-      max-width: 100%;
-      box-sizing: border-box;
-      padding: .5rem;
-      margin: 1em;
-      overflow-wrap: break-word
-    }
-  </style>
-</head>
-<body>
-  SSO login complete. You may now close this tab and return to the command prompt.
-</body>
-</html>`;
-
-export async function getSessionUsingBrowserAuthFlowAsync({
-  expoWebsiteUrl,
-}: {
-  expoWebsiteUrl: string;
-}): Promise<string> {
+export async function getSessionUsingBrowserAuthFlowAsync({ sso = false }): Promise<string> {
   const scheme = 'http';
   const hostname = 'localhost';
   const path = '/auth/callback';
 
-  const buildExpoSsoLoginUrl = (port: number): string => {
-    const data = {
+  const expoWebsiteUrl = getExpoWebsiteBaseUrl();
+
+  const buildExpoLoginUrl = (port: number, sso: boolean): string => {
+    const params = querystring.stringify({
+      confirm_account: true,
       app_redirect_uri: `${scheme}://${hostname}:${port}${path}`,
-    };
-    const params = querystring.stringify(data);
-    return `${expoWebsiteUrl}/sso-login?${params}`;
+    });
+    return `${expoWebsiteUrl}${sso ? '/sso-login' : '/login'}?${params}`;
   };
 
   // Start server and begin auth flow
@@ -60,9 +29,19 @@ export async function getSessionUsingBrowserAuthFlowAsync({
 
       const server = http.createServer(
         (request: http.IncomingMessage, response: http.ServerResponse) => {
+          const redirectAndCleanup = (result: 'success' | 'error'): void => {
+            const redirectUrl = `${expoWebsiteUrl}/oauth/expo-cli?result=${result}`;
+            response.writeHead(302, { Location: redirectUrl });
+            response.end();
+            server.close();
+            for (const connection of connections) {
+              connection.destroy();
+            }
+          };
+
           try {
             if (!(request.method === 'GET' && request.url?.includes('/auth/callback'))) {
-              throw new Error('Unexpected SSO login response.');
+              throw new Error('Unexpected login response.');
             }
             const url = new URL(request.url, `http:${request.headers.host}`);
             const sessionSecret = url.searchParams.get('session_secret');
@@ -71,17 +50,10 @@ export async function getSessionUsingBrowserAuthFlowAsync({
               throw new Error('Request missing session_secret search parameter.');
             }
             resolve(sessionSecret);
-            response.writeHead(200, { 'Content-Type': 'text/html' });
-            response.write(successBody);
-            response.end();
+            redirectAndCleanup('success');
           } catch (error) {
+            redirectAndCleanup('error');
             reject(error);
-          } finally {
-            server.close();
-            // Ensure that the server shuts down
-            for (const connection of connections) {
-              connection.destroy();
-            }
           }
         }
       );
@@ -95,7 +67,7 @@ export async function getSessionUsingBrowserAuthFlowAsync({
           'Server address and port should be set after listening has begun'
         );
         const port = address.port;
-        const authorizeUrl = buildExpoSsoLoginUrl(port);
+        const authorizeUrl = buildExpoLoginUrl(port, sso);
         Log.log(
           `If your browser doesn't automatically open, visit this link to log in: ${authorizeUrl}`
         );

packages/eas-cli/src/user/fetchSessionSecretAndUserFromBrowserAuthFlow.ts

@@ -1,15 +1,12 @@
-import { getSessionUsingBrowserAuthFlowAsync } from './expoSsoLauncher';
+import { getSessionUsingBrowserAuthFlowAsync } from './expoBrowserAuthFlowLauncher';
 import { fetchUserAsync } from './fetchUser';
-import { getExpoWebsiteBaseUrl } from '../api';
 
-export async function fetchSessionSecretAndSsoUserAsync(): Promise<{
+export async function fetchSessionSecretAndUserFromBrowserAuthFlowAsync({ sso = false }): Promise<{
   sessionSecret: string;
   id: string;
   username: string;
 }> {
-  const sessionSecret = await getSessionUsingBrowserAuthFlowAsync({
-    expoWebsiteUrl: getExpoWebsiteBaseUrl(),
-  });
+  const sessionSecret = await getSessionUsingBrowserAuthFlowAsync({ sso });
 
   const userData = await fetchUserAsync({ sessionSecret });
 

packages/eas-cli/src/vcs/clients/git.ts

@@ -31,7 +31,11 @@ export default class GitClient extends Client {
     this.requireCommit = options.requireCommit;
   }
 
-  public override async ensureRepoExistsAsync(): Promise<void> {
+  public override async ensureRepoExistsAsync(options?: {
+    nonInteractive?: boolean;
+  }): Promise<void> {
+    const nonInteractive = options?.nonInteractive ?? false;
+
     try {
       if (!(await isGitInstalledAsync())) {
         Log.error(
@@ -66,11 +70,26 @@ export default class GitClient extends Client {
       return;
     }
 
+    const cwd = process.cwd();
+    const repoRoot = PackageManagerUtils.resolveWorkspaceRoot(cwd) ?? cwd;
+
+    if (nonInteractive) {
+      Log.log(
+        `No git repository found. Auto initializing in ${this.maybeCwdOverride ?? repoRoot}. ` +
+          `Set ${chalk.bold('EAS_NO_VCS=1')} to skip.`
+      );
+      await spawnAsync('git', ['init'], { cwd: this.maybeCwdOverride ?? repoRoot });
+      await this.commitAsync({
+        commitAllFiles: true,
+        commitMessage: 'Initial commit',
+        nonInteractive: true,
+      });
+      return;
+    }
+
     Log.warn("It looks like you haven't initialized the git repository yet.");
     Log.warn('EAS requires you to use a git repository for your project.');
 
-    const cwd = process.cwd();
-    const repoRoot = PackageManagerUtils.resolveWorkspaceRoot(cwd) ?? cwd;
     const confirmInit = await confirmAsync({
       message: `Would you like us to run 'git init' in ${
         this.maybeCwdOverride ?? repoRoot
@@ -419,16 +438,22 @@ export default class GitClient extends Client {
       return;
     }
 
-    Log.warn(
-      `You need to configure Git with your ${[
-        !usernameConfigured && 'username (user.name)',
-        !emailConfigured && 'email address (user.email)',
+    const missingConfig = [
+      !usernameConfigured && 'username (user.name)',
+      !emailConfigured && 'email address (user.email)',
+    ].filter(i => i);
+
+    Log.warn(`You need to configure Git with your ${missingConfig.join(' and ')}`);
+    if (nonInteractive) {
+      const configCommands = [
+        !usernameConfigured && 'git config --global user.name "Your Name"',
+        !emailConfigured && 'git config --global user.email "[email protected]"',
       ]
         .filter(i => i)
-        .join(' and ')}`
-    );
-    if (nonInteractive) {
-      throw new Error('Git cannot be configured automatically in non-interactive mode');
+        .join(' && ');
+      throw new Error(
+        `Git ${missingConfig.join(' and ')} must be configured. Run: ${configCommands}`
+      );
     }
     if (!usernameConfigured) {
       const { username } = await promptAsync({

packages/eas-cli/src/vcs/vcs.ts

@@ -14,7 +14,7 @@ export abstract class Client {
 
   // (optional) ensureRepoExistsAsync should verify whether repository exists and tooling is installed
   // it's not required for minimal support, but lack of validation might cause the failure at a later stage.
-  public async ensureRepoExistsAsync(): Promise<void> {}
+  public async ensureRepoExistsAsync(_options?: { nonInteractive?: boolean }): Promise<void> {}
 
   // (optional) checks whether commit is necessary before calling makeShallowCopyAsync
   //

yarn.lock

@@ -4843,13 +4843,6 @@
   dependencies:
     "@types/node" "*"
 
-"@types/[email protected]":
-  version "8.5.1"
-  resolved "https://registry.yarnpkg.com/@types/jsonwebtoken/-/jsonwebtoken-8.5.1.tgz#56958cb2d80f6d74352bd2e501a018e2506a8a84"
-  integrity sha512-rNAPdomlIUX0i0cg2+I+Q1wOUr531zHBQ+cV/28PJ39bSPKjahatZZ2LMuhiguETkCgLVzfruw/ZvNMNkKoSzw==
-  dependencies:
-    "@types/node" "*"
-
 "@types/keygrip@*":
   version "1.0.6"
   resolved "https://registry.yarnpkg.com/@types/keygrip/-/keygrip-1.0.6.tgz#1749535181a2a9b02ac04a797550a8787345b740"
@@ -6323,7 +6316,7 @@ [email protected]:
   dependencies:
     node-int64 "^0.4.0"
 
-[email protected], buffer-equal-constant-time@^1.0.1:
+buffer-equal-constant-time@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/buffer-equal-constant-time/-/buffer-equal-constant-time-1.0.1.tgz#f8e71132f7ffe6e01a5c9697a4c6f3e48d5cc819"
   integrity sha512-zRpUiDwd/xk6ADqPMATG8vc9VPrkck7T07OIx0gnjmJAnHnTVXNQG3vfvWNuiZIkwu9KrKdA1iJKfsfTVxE6NA==
@@ -11505,6 +11498,11 @@ join-component@^1.1.0:
   resolved "https://registry.yarnpkg.com/join-component/-/join-component-1.1.0.tgz#b8417b750661a392bee2c2537c68b2a9d4977cd5"
   integrity sha1-uEF7dQZho5K+4sJTfGiyqdSXfNU=
 
+[email protected]:
+  version "5.10.0"
+  resolved "https://registry.yarnpkg.com/jose/-/jose-5.10.0.tgz#c37346a099d6467c401351a9a0c2161e0f52c4be"
+  integrity sha512-s+3Al/p9g32Iq+oqXxkW//7jk2Vig6FF1CFqzVXoTUXt2qz89YWbL+OwS17NFYEvxC35n0FKeGO2LGYSxeM2Gg==
+
 jose@^5.0.0:
   version "5.2.0"
   resolved "https://registry.yarnpkg.com/jose/-/jose-5.2.0.tgz#d0ffd7f7e31253f633eefb190a930cd14a916995"
@@ -11690,16 +11688,6 @@ jsonparse@^1.2.0, jsonparse@^1.3.1:
   resolved "https://registry.yarnpkg.com/jsonparse/-/jsonparse-1.3.1.tgz#3f4dae4a91fac315f71062f8521cc239f1366280"
   integrity sha1-P02uSpH6wxX3EGL4UhzCOfE2YoA=
 
-[email protected]:
-  version "9.0.0"
-  resolved "https://registry.yarnpkg.com/jsonwebtoken/-/jsonwebtoken-9.0.0.tgz#d0faf9ba1cc3a56255fe49c0961a67e520c1926d"
-  integrity sha512-tuGfYXxkQGDPnLJ7SibiQgVgeDgfbPq2k2ICcbgqW8WxWLBAxKQM/ZCu/IT8SOSwmaYl4dpTFCW5xZv7YbbWUw==
-  dependencies:
-    jws "^3.2.2"
-    lodash "^4.17.21"
-    ms "^2.1.1"
-    semver "^7.3.8"
-
 "jsx-ast-utils@^2.4.1 || ^3.0.0":
   version "3.2.0"
   resolved "https://registry.yarnpkg.com/jsx-ast-utils/-/jsx-ast-utils-3.2.0.tgz#41108d2cec408c3453c1bbe8a4aae9e1e2bd8f82"
@@ -11728,15 +11716,6 @@ just-diff@^6.0.0:
   resolved "https://registry.yarnpkg.com/just-diff/-/just-diff-6.0.2.tgz#03b65908543ac0521caf6d8eb85035f7d27ea285"
   integrity sha512-S59eriX5u3/QhMNq3v/gm8Kd0w8OS6Tz2FS1NG4blv+z0MuQcBRJyFWjdovM0Rad4/P4aUPFtnkNjMjyMlMSYA==
 
-jwa@^1.4.1:
-  version "1.4.1"
-  resolved "https://registry.yarnpkg.com/jwa/-/jwa-1.4.1.tgz#743c32985cb9e98655530d53641b66c8645b039a"
-  integrity sha512-qiLX/xhEEFKUAJ6FiBMbes3w9ATzyk5W7Hvzpa/SLYdxNtng+gcurvrI7TbACjIXlsJyr05/S1oUhZrc63evQA==
-  dependencies:
-    buffer-equal-constant-time "1.0.1"
-    ecdsa-sig-formatter "1.0.11"
-    safe-buffer "^5.0.1"
-
 jwa@^2.0.0:
   version "2.0.1"
   resolved "https://registry.yarnpkg.com/jwa/-/jwa-2.0.1.tgz#bf8176d1ad0cd72e0f3f58338595a13e110bc804"
@@ -11746,14 +11725,6 @@ jwa@^2.0.0:
     ecdsa-sig-formatter "1.0.11"
     safe-buffer "^5.0.1"
 
-jws@^3.2.2:
-  version "3.2.2"
-  resolved "https://registry.yarnpkg.com/jws/-/jws-3.2.2.tgz#001099f3639468c9414000e99995fa52fb478304"
-  integrity sha512-YHlZCB6lMTllWDtSPHz/ZXTsi8S00usEV6v1tjq8tOUZzw7DpSDWVXjXDre6ed1w/pd495ODpHZYSdkRTsa0HA==
-  dependencies:
-    jwa "^1.4.1"
-    safe-buffer "^5.0.1"
-
 jws@^4.0.0:
   version "4.0.0"
   resolved "https://registry.yarnpkg.com/jws/-/jws-4.0.0.tgz#2d4e8cf6a318ffaa12615e9dec7e86e6c97310f4"