eas-cli 3.13.2 → 3.14.0

package/build/user/SessionManager.d.ts

@@ -39,10 +39,12 @@ export default class SessionManager {
      *
      * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
      */
-    showLoginPromptAsync({ nonInteractive, printNewLine, }?: {
+    showLoginPromptAsync({ nonInteractive, printNewLine, sso, }?: {
         nonInteractive?: boolean | undefined;
         printNewLine?: boolean | undefined;
+        sso?: boolean | undefined;
     }): Promise<void>;
+    private ssoLoginAsync;
     private loginAsync;
     /**
      * Prompt for an OTP with the option to cancel the question by answering empty (pressing return key).

package/build/user/SessionManager.js

@@ -14,6 +14,7 @@ const UserQuery_1 = require("../graphql/queries/UserQuery");
 const log_1 = tslib_1.__importStar(require("../log"));
 const prompts_1 = require("../prompts");
 const paths_1 = require("../utils/paths");
+const fetchSessionSecretAndSsoUser_1 = require("./fetchSessionSecretAndSsoUser");
 const fetchSessionSecretAndUser_1 = require("./fetchSessionSecretAndUser");
 var UserSecondFactorDeviceMethod;
 (function (UserSecondFactorDeviceMethod) {
@@ -102,14 +103,18 @@ class SessionManager {
      *
      * @deprecated Should not be used outside of context functions, except in the AccountLogin command.
      */
-    async showLoginPromptAsync({ nonInteractive = false, printNewLine = false, } = {}) {
+    async showLoginPromptAsync({ nonInteractive = false, printNewLine = false, sso = false, } = {}) {
         if (nonInteractive) {
             core_1.Errors.error(`Either log in with ${chalk_1.default.bold('eas login')} or set the ${chalk_1.default.bold('EXPO_TOKEN')} environment variable if you're using EAS CLI on CI (${(0, log_1.learnMore)('https://docs.expo.dev/accounts/programmatic-access/', { dim: false })})`);
         }
         if (printNewLine) {
             log_1.default.newLine();
         }
-        log_1.default.log('Log in to EAS');
+        if (sso) {
+            await this.ssoLoginAsync();
+            return;
+        }
+        log_1.default.log(`Log in to EAS with email or username (exit and run ${chalk_1.default.bold('eas login')} for other options)`);
         const { username, password } = await (0, prompts_1.promptAsync)([
             {
                 type: 'text',
@@ -137,6 +142,15 @@ class SessionManager {
             }
         }
     }
+    async ssoLoginAsync() {
+        const { sessionSecret, id, username } = await (0, fetchSessionSecretAndSsoUser_1.fetchSessionSecretAndSsoUserAsync)();
+        await this.setSessionAsync({
+            sessionSecret,
+            userId: id,
+            username,
+            currentConnection: 'Browser-Flow-Authentication',
+        });
+    }
     async loginAsync(input) {
         const { sessionSecret, id, username } = await (0, fetchSessionSecretAndUser_1.fetchSessionSecretAndUserAsync)(input);
         await this.setSessionAsync({

package/build/user/User.d.ts

@@ -1,7 +1,7 @@
 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.
+ * 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.
  */

package/build/user/User.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.getActorUsername = exports.getActorDisplayName = void 0;
 /**
- * Resolve the name of the actor, either normal user or robot user.
+ * 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.
  */

package/build/user/actions.js

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.ensureActorHasPrimaryAccount = void 0;
 function ensureActorHasPrimaryAccount(user) {
-    if (user.__typename === 'User') {
+    if (user.__typename === 'User' || user.__typename === 'SSOUser') {
         return user.primaryAccount;
     }
     throw new Error('This action is not supported for robot users.');

package/build/user/expoSsoLauncher.d.ts

@@ -0,0 +1,4 @@
+export declare function getSessionUsingBrowserAuthFlowAsync(options: {
+    expoWebsiteUrl: string;
+    serverPort: number;
+}): Promise<string>;

package/build/user/expoSsoLauncher.js

@@ -0,0 +1,71 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getSessionUsingBrowserAuthFlowAsync = void 0;
+const tslib_1 = require("tslib");
+const better_opn_1 = tslib_1.__importDefault(require("better-opn"));
+const http_1 = tslib_1.__importDefault(require("http"));
+const querystring_1 = tslib_1.__importDefault(require("querystring"));
+const log_1 = tslib_1.__importDefault(require("../log"));
+async function getSessionUsingBrowserAuthFlowAsync(options) {
+    const { expoWebsiteUrl, serverPort } = options;
+    if (!expoWebsiteUrl || !serverPort) {
+        throw new Error('Expo website URL and local server port are required.');
+    }
+    const scheme = 'http';
+    const hostname = 'localhost';
+    const path = '/auth/callback';
+    const redirectUri = `${scheme}://${hostname}:${serverPort}${path}`;
+    const buildExpoSsoLoginUrl = () => {
+        const data = {
+            app_redirect_uri: redirectUri,
+        };
+        const params = querystring_1.default.stringify(data);
+        return `${expoWebsiteUrl}/sso-login?${params}`;
+    };
+    // Start server and begin auth flow
+    const executeAuthFlow = () => {
+        return new Promise(async (resolve, reject) => {
+            const connections = new Set();
+            const server = http_1.default.createServer((request, response) => {
+                var _a;
+                try {
+                    if (!(request.method === 'GET' && ((_a = request.url) === null || _a === void 0 ? void 0 : _a.includes('/auth/callback')))) {
+                        throw new Error('Unexpected SSO 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.');
+                    }
+                    resolve(sessionSecret);
+                    response.writeHead(200, { 'Content-Type': 'text/plain' });
+                    response.write(`Website login has completed. You can now close this tab.`);
+                    response.end();
+                }
+                catch (error) {
+                    reject(error);
+                }
+                finally {
+                    server.close();
+                    // Ensure that the server shuts down
+                    for (const connection of connections) {
+                        connection.destroy();
+                    }
+                }
+            });
+            server.listen(serverPort, hostname, () => {
+                log_1.default.log('Waiting for browser login...');
+            });
+            server.on('connection', connection => {
+                connections.add(connection);
+                connection.on('close', () => {
+                    connections.delete(connection);
+                });
+            });
+            const authorizeUrl = buildExpoSsoLoginUrl();
+            (0, better_opn_1.default)(authorizeUrl);
+        });
+    };
+    return await executeAuthFlow();
+}
+exports.getSessionUsingBrowserAuthFlowAsync = getSessionUsingBrowserAuthFlowAsync;

package/build/user/fetchSessionSecretAndSsoUser.d.ts

@@ -0,0 +1,5 @@
+export declare function fetchSessionSecretAndSsoUserAsync(): Promise<{
+    sessionSecret: string;
+    id: string;
+    username: string;
+}>;

package/build/user/fetchSessionSecretAndSsoUser.js

@@ -0,0 +1,20 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchSessionSecretAndSsoUserAsync = void 0;
+const api_1 = require("../api");
+const expoSsoLauncher_1 = require("./expoSsoLauncher");
+const fetchUser_1 = require("./fetchUser");
+async function fetchSessionSecretAndSsoUserAsync() {
+    const config = {
+        expoWebsiteUrl: (0, api_1.getExpoWebsiteBaseUrl)(),
+        serverPort: await (0, api_1.getSsoLocalServerPortAsync)(),
+    };
+    const sessionSecret = await (0, expoSsoLauncher_1.getSessionUsingBrowserAuthFlowAsync)(config);
+    const userData = await (0, fetchUser_1.fetchUserAsync)({ sessionSecret });
+    return {
+        sessionSecret,
+        id: userData.id,
+        username: userData.username,
+    };
+}
+exports.fetchSessionSecretAndSsoUserAsync = fetchSessionSecretAndSsoUserAsync;

package/build/user/fetchSessionSecretAndUser.js

@@ -1,10 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.fetchSessionSecretAndUserAsync = void 0;
-const tslib_1 = require("tslib");
-const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
 const api_1 = require("../api");
-const createGraphqlClient_1 = require("../commandUtils/context/contextUtils/createGraphqlClient");
+const fetchUser_1 = require("./fetchUser");
 async function fetchSessionSecretAndUserAsync({ username, password, otp, }) {
     // this is a logged-out endpoint
     const apiV2Client = new api_1.ApiV2Client({
@@ -15,29 +13,11 @@ async function fetchSessionSecretAndUserAsync({ username, password, otp, }) {
         body: { username, password, otp },
     });
     const { sessionSecret } = body.data;
-    const graphqlClient = (0, createGraphqlClient_1.createGraphqlClient)({ accessToken: null, sessionSecret: null });
-    const result = await graphqlClient
-        .query((0, graphql_tag_1.default) `
-        query UserQuery {
-          viewer {
-            id
-            username
-          }
-        }
-      `, {}, {
-        fetchOptions: {
-            headers: {
-                'expo-session': sessionSecret,
-            },
-        },
-        additionalTypenames: [] /* UserQuery has immutable fields */,
-    })
-        .toPromise();
-    const { data } = result;
+    const userData = await (0, fetchUser_1.fetchUserAsync)({ sessionSecret });
     return {
         sessionSecret,
-        id: data.viewer.id,
-        username: data.viewer.username,
+        id: userData.id,
+        username: userData.username,
     };
 }
 exports.fetchSessionSecretAndUserAsync = fetchSessionSecretAndUserAsync;

package/build/user/fetchUser.d.ts

@@ -0,0 +1,6 @@
+export declare function fetchUserAsync({ sessionSecret, }: {
+    sessionSecret: string;
+}): Promise<{
+    id: string;
+    username: string;
+}>;

package/build/user/fetchUser.js

@@ -0,0 +1,27 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.fetchUserAsync = void 0;
+const tslib_1 = require("tslib");
+const graphql_tag_1 = tslib_1.__importDefault(require("graphql-tag"));
+const createGraphqlClient_1 = require("../commandUtils/context/contextUtils/createGraphqlClient");
+async function fetchUserAsync({ sessionSecret, }) {
+    const graphqlClient = (0, createGraphqlClient_1.createGraphqlClient)({ accessToken: null, sessionSecret });
+    const result = await graphqlClient
+        .query((0, graphql_tag_1.default) `
+        query UserQuery {
+          meUserActor {
+            id
+            username
+          }
+        }
+      `, {}, {
+        additionalTypenames: [] /* UserQuery has immutable fields */,
+    })
+        .toPromise();
+    const { data } = result;
+    return {
+        id: data.meUserActor.id,
+        username: data.meUserActor.username,
+    };
+}
+exports.fetchUserAsync = fetchUserAsync;

package/build/utils/expoCli.js

@@ -7,7 +7,7 @@ const chalk_1 = tslib_1.__importDefault(require("chalk"));
 const getenv_1 = require("getenv");
 const resolve_from_1 = tslib_1.__importStar(require("resolve-from"));
 const semver_1 = tslib_1.__importDefault(require("semver"));
-const log_1 = tslib_1.__importDefault(require("../log"));
+const log_1 = tslib_1.__importStar(require("../log"));
 const memoize_1 = require("./expodash/memoize");
 // Aggressively returns `true` (UNVERSIONED, invalid SDK version format) to push users towards the versioned CLI.
 function gteSdkVersion(fromSdkVersion, sdkVersion) {
@@ -53,7 +53,17 @@ exports.shouldUseVersionedExpoCLIExpensive = shouldUseVersionedExpoCLIExpensive;
 exports.shouldUseVersionedExpoCLI = (0, memoize_1.memoize)(shouldUseVersionedExpoCLIExpensive);
 async function expoCommandAsync(projectDir, args, { silent = false } = {}) {
     var _a;
-    const expoCliPath = (_a = (0, resolve_from_1.silent)(projectDir, 'expo/bin/cli')) !== null && _a !== void 0 ? _a : (0, resolve_from_1.default)(projectDir, 'expo/bin/cli.js');
+    let expoCliPath;
+    try {
+        expoCliPath =
+            (_a = (0, resolve_from_1.silent)(projectDir, 'expo/bin/cli')) !== null && _a !== void 0 ? _a : (0, resolve_from_1.default)(projectDir, 'expo/bin/cli.js');
+    }
+    catch (e) {
+        if (e.code === 'MODULE_NOT_FOUND') {
+            throw new Error(`The \`expo\` package was not found. Follow the installation directions at ${(0, log_1.link)('https://docs.expo.dev/bare/installing-expo-modules/')}`);
+        }
+        throw e;
+    }
     const spawnPromise = (0, spawn_async_1.default)(expoCliPath, args, {
         stdio: ['inherit', 'pipe', 'pipe'], // inherit stdin so user can install a missing expo-cli from inside this command
     });

package/build/utils/port.d.ts

@@ -0,0 +1,2 @@
+/** Get a free port or throw an error. */
+export declare function getFreePortAsync(rangeStart: number): Promise<number>;

package/build/utils/port.js

@@ -0,0 +1,14 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.getFreePortAsync = void 0;
+const tslib_1 = require("tslib");
+const freeport_async_1 = tslib_1.__importDefault(require("freeport-async"));
+/** Get a free port or throw an error. */
+async function getFreePortAsync(rangeStart) {
+    const port = await (0, freeport_async_1.default)(rangeStart, { hostnames: [null, 'localhost'] });
+    if (!port) {
+        throw new Error('No available port found');
+    }
+    return port;
+}
+exports.getFreePortAsync = getFreePortAsync;

package/build/vcs/clients/git.js

@@ -35,7 +35,7 @@ class GitClient extends vcs_1.Client {
             return;
         }
         log_1.default.warn("It looks like you haven't initialized the git repository yet.");
-        log_1.default.warn('EAS Build requires you to use a git repository for your project.');
+        log_1.default.warn('EAS requires you to use a git repository for your project.');
         const cwd = process.cwd();
         const repoRoot = (_a = PackageManagerUtils.findWorkspaceRoot(cwd)) !== null && _a !== void 0 ? _a : cwd;
         const confirmInit = await (0, prompts_1.confirmAsync)({