eas-cli 2.3.0 → 2.4.1

package/build/commandUtils/EasCommand.d.ts

@@ -1,10 +1,12 @@
 import { Command } from '@oclif/core';
-import ActorContextField from './context/ActorContextField';
 import ContextField from './context/ContextField';
 import { DynamicProjectConfigContextField } from './context/DynamicProjectConfigContextField';
+import LoggedInContextField from './context/LoggedInContextField';
+import MaybeLoggedInContextField from './context/MaybeLoggedInContextField';
 import { OptionalProjectConfigContextField } from './context/OptionalProjectConfigContextField';
 import ProjectConfigContextField from './context/ProjectConfigContextField';
 import ProjectDirContextField from './context/ProjectDirContextField';
+import SessionManagementContextField from './context/SessionManagementContextField';
 declare type ContextInput<T extends {
     [name: string]: any;
 } = object> = {
@@ -18,10 +20,24 @@ declare type ContextOutput<T extends {
 export default abstract class EasCommand extends Command {
     protected static readonly ContextOptions: {
         /**
-         * Require this command to be run when logged-in. Returns the logged-in actor in the context.
+         * Require this command to be run when logged-in. Returns the logged-in actor and a logged-in
+         * graphql client in the context.
          */
         LoggedIn: {
-            actor: ActorContextField;
+            loggedIn: LoggedInContextField;
+        };
+        /**
+         * Do not require this command to be run when logged-in, but if it is get the logged-in actor and a
+         * maybe-logged-in graphql client.
+         */
+        MaybeLoggedIn: {
+            maybeLoggedIn: MaybeLoggedInContextField;
+        };
+        /**
+         * Specify this context requirement if the command needs to mutate the user session.
+         */
+        SessionManagment: {
+            sessionManager: SessionManagementContextField;
         };
         /**
          * Require the project to be identified and registered on server if this command is being
@@ -69,6 +85,11 @@ export default abstract class EasCommand extends Command {
     }, { nonInteractive }: {
         nonInteractive: boolean;
     }): Promise<ContextOutput<C>>;
+    /**
+     * The user session manager. Responsible for coordinating all user session related state.
+     * If needed in a subclass, SessionManager ContextOption.
+     */
+    private readonly sessionManager;
     protected abstract runAsync(): Promise<any>;
     run(): Promise<any>;
     finally(err: Error): Promise<any>;

package/build/commandUtils/EasCommand.js

@@ -3,20 +3,36 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const core_1 = require("@oclif/core");
 const rudderstackClient_1 = require("../analytics/rudderstackClient");
-const User_1 = require("../user/User");
-const ActorContextField_1 = tslib_1.__importDefault(require("./context/ActorContextField"));
+const SessionManager_1 = tslib_1.__importDefault(require("../user/SessionManager"));
 const DynamicProjectConfigContextField_1 = require("./context/DynamicProjectConfigContextField");
+const LoggedInContextField_1 = tslib_1.__importDefault(require("./context/LoggedInContextField"));
+const MaybeLoggedInContextField_1 = tslib_1.__importDefault(require("./context/MaybeLoggedInContextField"));
 const OptionalProjectConfigContextField_1 = require("./context/OptionalProjectConfigContextField");
 const ProjectConfigContextField_1 = tslib_1.__importDefault(require("./context/ProjectConfigContextField"));
 const ProjectDirContextField_1 = tslib_1.__importDefault(require("./context/ProjectDirContextField"));
+const SessionManagementContextField_1 = tslib_1.__importDefault(require("./context/SessionManagementContextField"));
 class EasCommand extends core_1.Command {
+    constructor() {
+        super(...arguments);
+        /**
+         * The user session manager. Responsible for coordinating all user session related state.
+         * If needed in a subclass, SessionManager ContextOption.
+         */
+        this.sessionManager = new SessionManager_1.default();
+    }
     /**
      * Execute the context in the contextDefinition to satisfy command prerequisites.
      */
     async getContextAsync(commandClass, { nonInteractive }) {
         const contextDefinition = commandClass.contextDefinition;
         const contextValuePairs = await Promise.all(Object.keys(contextDefinition).map(async (contextKey) => {
-            return [contextKey, await contextDefinition[contextKey].getValueAsync({ nonInteractive })];
+            return [
+                contextKey,
+                await contextDefinition[contextKey].getValueAsync({
+                    nonInteractive,
+                    sessionManager: this.sessionManager,
+                }),
+            ];
         }));
         return Object.fromEntries(contextValuePairs);
     }
@@ -24,7 +40,7 @@ class EasCommand extends core_1.Command {
     async run() {
         await (0, rudderstackClient_1.initAsync)();
         // this is needed for logEvent call below as it identifies the user in the analytics system
-        await (0, User_1.getUserAsync)();
+        await this.sessionManager.getUserAsync();
         (0, rudderstackClient_1.logEvent)(rudderstackClient_1.AnalyticsEvent.ACTION, {
             // id is assigned by oclif in constructor based on the filepath:
             // commands/submit === submit, commands/build/list === build:list
@@ -41,10 +57,24 @@ class EasCommand extends core_1.Command {
 exports.default = EasCommand;
 EasCommand.ContextOptions = {
     /**
-     * Require this command to be run when logged-in. Returns the logged-in actor in the context.
+     * Require this command to be run when logged-in. Returns the logged-in actor and a logged-in
+     * graphql client in the context.
      */
     LoggedIn: {
-        actor: new ActorContextField_1.default(),
+        loggedIn: new LoggedInContextField_1.default(),
+    },
+    /**
+     * Do not require this command to be run when logged-in, but if it is get the logged-in actor and a
+     * maybe-logged-in graphql client.
+     */
+    MaybeLoggedIn: {
+        maybeLoggedIn: new MaybeLoggedInContextField_1.default(),
+    },
+    /**
+     * Specify this context requirement if the command needs to mutate the user session.
+     */
+    SessionManagment: {
+        sessionManager: new SessionManagementContextField_1.default(),
     },
     /**
      * Require the project to be identified and registered on server if this command is being

package/build/commandUtils/context/ContextField.d.ts

@@ -1,4 +1,6 @@
+import SessionManager from '../../user/SessionManager';
 export interface ContextOptions {
+    sessionManager: SessionManager;
     nonInteractive: boolean;
 }
 export default abstract class ContextField<T> {

package/build/commandUtils/context/DynamicProjectConfigContextField.d.ts

@@ -7,5 +7,5 @@ export declare type DynamicConfigContextFn = (options?: ExpoConfigOptions) => Pr
     projectDir: string;
 }>;
 export declare class DynamicProjectConfigContextField extends ContextField<DynamicConfigContextFn> {
-    getValueAsync({ nonInteractive }: ContextOptions): Promise<DynamicConfigContextFn>;
+    getValueAsync({ nonInteractive, sessionManager, }: ContextOptions): Promise<DynamicConfigContextFn>;
 }

package/build/commandUtils/context/DynamicProjectConfigContextField.js

@@ -7,11 +7,11 @@ const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
 class DynamicProjectConfigContextField extends ContextField_1.default {
-    async getValueAsync({ nonInteractive }) {
+    async getValueAsync({ nonInteractive, sessionManager, }) {
         return async (options) => {
             const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
             const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir, options);
-            const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(expBefore, {
+            const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
                 nonInteractive,
                 env: options === null || options === void 0 ? void 0 : options.env,
             });

package/build/commandUtils/context/LoggedInContextField.d.ts

@@ -0,0 +1,12 @@
+import { Actor } from '../../user/User';
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient } from './contextUtils/createGraphqlClient';
+export default class LoggedInContextField extends ContextField<{
+    actor: Actor;
+    graphqlClient: ExpoGraphqlClient;
+}> {
+    getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
+        actor: Actor;
+        graphqlClient: ExpoGraphqlClient;
+    }>;
+}

package/build/commandUtils/context/LoggedInContextField.js

@@ -0,0 +1,15 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
+const createGraphqlClient_1 = require("./contextUtils/createGraphqlClient");
+class LoggedInContextField extends ContextField_1.default {
+    async getValueAsync({ nonInteractive, sessionManager }) {
+        const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
+            nonInteractive,
+        });
+        const graphqlClient = (0, createGraphqlClient_1.createGraphqlClient)(authenticationInfo);
+        return { actor, graphqlClient };
+    }
+}
+exports.default = LoggedInContextField;

package/build/commandUtils/context/MaybeLoggedInContextField.d.ts

@@ -0,0 +1,12 @@
+import { Actor } from '../../user/User';
+import ContextField, { ContextOptions } from './ContextField';
+import { ExpoGraphqlClient } from './contextUtils/createGraphqlClient';
+export default class MaybeLoggedInContextField extends ContextField<{
+    actor: Actor | null;
+    graphqlClient: ExpoGraphqlClient;
+}> {
+    getValueAsync({ sessionManager }: ContextOptions): Promise<{
+        actor: Actor | null;
+        graphqlClient: ExpoGraphqlClient;
+    }>;
+}

package/build/commandUtils/context/MaybeLoggedInContextField.js

@@ -0,0 +1,17 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
+const createGraphqlClient_1 = require("./contextUtils/createGraphqlClient");
+class MaybeLoggedInContextField extends ContextField_1.default {
+    async getValueAsync({ sessionManager }) {
+        const authenticationInfo = {
+            accessToken: sessionManager.getAccessToken(),
+            sessionSecret: sessionManager.getSessionSecret(),
+        };
+        const graphqlClient = (0, createGraphqlClient_1.createGraphqlClient)(authenticationInfo);
+        const actor = await sessionManager.getUserAsync();
+        return { actor: actor !== null && actor !== void 0 ? actor : null, graphqlClient };
+    }
+}
+exports.default = MaybeLoggedInContextField;

package/build/commandUtils/context/OptionalProjectConfigContextField.d.ts

@@ -5,7 +5,7 @@ export declare class OptionalProjectConfigContextField extends ContextField<{
     exp: ExpoConfig;
     projectDir: string;
 } | undefined> {
-    getValueAsync({ nonInteractive }: ContextOptions): Promise<{
+    getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
         projectId: string;
         exp: ExpoConfig;
         projectDir: string;

package/build/commandUtils/context/OptionalProjectConfigContextField.js

@@ -8,7 +8,7 @@ const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
 class OptionalProjectConfigContextField extends ContextField_1.default {
-    async getValueAsync({ nonInteractive }) {
+    async getValueAsync({ nonInteractive, sessionManager }) {
         let projectDir;
         try {
             projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
@@ -23,7 +23,7 @@ class OptionalProjectConfigContextField extends ContextField_1.default {
             return undefined;
         }
         const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(expBefore, {
+        const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
             nonInteractive,
         });
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);

package/build/commandUtils/context/ProjectConfigContextField.d.ts

@@ -5,7 +5,7 @@ export default class ProjectConfigContextField extends ContextField<{
     exp: ExpoConfig;
     projectDir: string;
 }> {
-    getValueAsync({ nonInteractive }: ContextOptions): Promise<{
+    getValueAsync({ nonInteractive, sessionManager }: ContextOptions): Promise<{
         projectId: string;
         exp: ExpoConfig;
         projectDir: string;

package/build/commandUtils/context/ProjectConfigContextField.js

@@ -6,10 +6,10 @@ const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./contextUtils/findProjectDirAndVerifyProjectSetupAsync");
 const getProjectIdAsync_1 = require("./contextUtils/getProjectIdAsync");
 class ProjectConfigContextField extends ContextField_1.default {
-    async getValueAsync({ nonInteractive }) {
+    async getValueAsync({ nonInteractive, sessionManager }) {
         const projectDir = await (0, findProjectDirAndVerifyProjectSetupAsync_1.findProjectDirAndVerifyProjectSetupAsync)();
         const expBefore = (0, expoConfig_1.getExpoConfig)(projectDir);
-        const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(expBefore, {
+        const projectId = await (0, getProjectIdAsync_1.getProjectIdAsync)(sessionManager, expBefore, {
             nonInteractive,
         });
         const exp = (0, expoConfig_1.getExpoConfig)(projectDir);

package/build/commandUtils/context/SessionManagementContextField.d.ts

@@ -0,0 +1,5 @@
+import SessionManager from '../../user/SessionManager';
+import ContextField, { ContextOptions } from './ContextField';
+export default class SessionManagementContextField extends ContextField<SessionManager> {
+    getValueAsync({ sessionManager }: ContextOptions): Promise<SessionManager>;
+}

package/build/commandUtils/context/SessionManagementContextField.js

@@ -0,0 +1,10 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const tslib_1 = require("tslib");
+const ContextField_1 = tslib_1.__importDefault(require("./ContextField"));
+class SessionManagementContextField extends ContextField_1.default {
+    async getValueAsync({ sessionManager }) {
+        return sessionManager;
+    }
+}
+exports.default = SessionManagementContextField;

package/build/commandUtils/context/contextUtils/createGraphqlClient.d.ts

@@ -0,0 +1,11 @@
+import { Client, OperationContext, OperationResult, PromisifiedSource, TypedDocumentNode } from '@urql/core';
+import { DocumentNode } from 'graphql';
+export interface ExpoGraphqlClient extends Client {
+    query<Data = any, Variables extends object = object>(query: DocumentNode | TypedDocumentNode<Data, Variables> | string, variables: Variables | undefined, context: Partial<OperationContext> & {
+        additionalTypenames: string[];
+    }): PromisifiedSource<OperationResult<Data, Variables>>;
+}
+export declare function createGraphqlClient(authInfo: {
+    accessToken: string | null;
+    sessionSecret: string | null;
+}): ExpoGraphqlClient;

package/build/commandUtils/context/contextUtils/createGraphqlClient.js

@@ -0,0 +1,43 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.createGraphqlClient = void 0;
+const tslib_1 = require("tslib");
+const core_1 = require("@urql/core");
+const exchange_retry_1 = require("@urql/exchange-retry");
+const node_fetch_1 = tslib_1.__importDefault(require("node-fetch"));
+const api_1 = require("../../../api");
+const fetch_1 = require("../../../fetch");
+function createGraphqlClient(authInfo) {
+    return (0, core_1.createClient)({
+        url: (0, api_1.getExpoApiBaseUrl)() + '/graphql',
+        exchanges: [
+            core_1.dedupExchange,
+            core_1.cacheExchange,
+            (0, exchange_retry_1.retryExchange)({
+                maxDelayMs: 4000,
+                retryIf: (err, operation) => {
+                    return !!(err &&
+                        !operation.context.noRetry &&
+                        (err.networkError || err.graphQLErrors.some(e => { var _a; return (_a = e === null || e === void 0 ? void 0 : e.extensions) === null || _a === void 0 ? void 0 : _a.isTransient; })));
+                },
+            }),
+            core_1.fetchExchange,
+        ],
+        // @ts-expect-error Type 'typeof fetch' is not assignable to type '(input: RequestInfo, init?: RequestInit | undefined) => Promise<Response>'.
+        fetch: node_fetch_1.default,
+        fetchOptions: () => {
+            const headers = {};
+            if (authInfo.accessToken) {
+                headers.authorization = `Bearer ${authInfo.accessToken}`;
+            }
+            else if (authInfo.sessionSecret) {
+                headers['expo-session'] = authInfo.sessionSecret;
+            }
+            return {
+                ...(fetch_1.httpsProxyAgent ? { agent: fetch_1.httpsProxyAgent } : {}),
+                headers,
+            };
+        },
+    });
+}
+exports.createGraphqlClient = createGraphqlClient;

package/build/commandUtils/context/contextUtils/getProjectIdAsync.d.ts

@@ -1,5 +1,6 @@
 import { ExpoConfig } from '@expo/config-types';
 import { Env } from '@expo/eas-build-job';
+import SessionManager from '../../../user/SessionManager';
 /**
  * Save an EAS project ID to the appropriate field in the app config.
  *
@@ -18,7 +19,7 @@ export declare function saveProjectIdToAppConfigAsync(projectDir: string, projec
  *
  * @deprecated Should not be used outside of context functions.
  */
-export declare function getProjectIdAsync(exp: ExpoConfig, options: {
+export declare function getProjectIdAsync(sessionManager: SessionManager, exp: ExpoConfig, options: {
     env?: Env;
     nonInteractive: boolean;
 }): Promise<string>;

package/build/commandUtils/context/contextUtils/getProjectIdAsync.js

@@ -10,7 +10,7 @@ const ora_1 = require("../../../ora");
 const expoConfig_1 = require("../../../project/expoConfig");
 const fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1 = require("../../../project/fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync");
 const projectUtils_1 = require("../../../project/projectUtils");
-const ensureLoggedInAsync_1 = require("./ensureLoggedInAsync");
+const createGraphqlClient_1 = require("./createGraphqlClient");
 const findProjectDirAndVerifyProjectSetupAsync_1 = require("./findProjectDirAndVerifyProjectSetupAsync");
 /**
  * Save an EAS project ID to the appropriate field in the app config.
@@ -54,12 +54,19 @@ exports.saveProjectIdToAppConfigAsync = saveProjectIdToAppConfigAsync;
  *
  * @deprecated Should not be used outside of context functions.
  */
-async function getProjectIdAsync(exp, options) {
+async function getProjectIdAsync(sessionManager, exp, options) {
     var _a, _b;
+    // all codepaths in this function require a logged-in user with access to the owning account
+    // since they either query the app via graphql or create it, which includes getting info about
+    // the owner
+    const { actor, authenticationInfo } = await sessionManager.ensureLoggedInAsync({
+        nonInteractive: options.nonInteractive,
+    });
+    const graphqlClient = (0, createGraphqlClient_1.createGraphqlClient)(authenticationInfo);
     const localProjectId = (_b = (_a = exp.extra) === null || _a === void 0 ? void 0 : _a.eas) === null || _b === void 0 ? void 0 : _b.projectId;
     if (localProjectId) {
         // check that the local project ID matches account and slug
-        const appForProjectId = await AppQuery_1.AppQuery.byIdAsync(localProjectId);
+        const appForProjectId = await AppQuery_1.AppQuery.byIdAsync(graphqlClient, localProjectId);
         if (exp.owner && exp.owner !== appForProjectId.ownerAccount.name) {
             throw new Error(`Project config: Project identified by "extra.eas.projectId" (${appForProjectId.ownerAccount.name}) is not owned by owner specified in the "owner" field (${exp.owner}). ${(0, log_1.learnMore)('https://expo.fyi/eas-project-id')}`);
         }
@@ -84,10 +91,7 @@ async function getProjectIdAsync(exp, options) {
                 throw new Error('The "owner" manifest property is required when using robot users. See: https://docs.expo.dev/versions/latest/config/app/#owner');
         }
     };
-    const actor = await (0, ensureLoggedInAsync_1.ensureLoggedInAsync)({
-        nonInteractive: options.nonInteractive,
-    });
-    const projectId = await (0, fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)({
+    const projectId = await (0, fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync_1.fetchOrCreateProjectIDForWriteToConfigWithConfirmationAsync)(graphqlClient, {
         accountName: getAccountNameForEASProjectSync(exp, actor),
         projectName: exp.slug,
         privacy: (0, projectUtils_1.toAppPrivacy)(exp.privacy),

package/build/commands/account/login.d.ts

@@ -2,5 +2,8 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class AccountLogin extends EasCommand {
     static description: string;
     static aliases: string[];
+    static contextDefinition: {
+        sessionManager: import("../../commandUtils/context/SessionManagementContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/account/login.js

@@ -1,15 +1,20 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
-const ensureLoggedInAsync_1 = require("../../commandUtils/context/contextUtils/ensureLoggedInAsync");
 const log_1 = tslib_1.__importDefault(require("../../log"));
 class AccountLogin extends EasCommand_1.default {
     async runAsync() {
-        await (0, ensureLoggedInAsync_1.showLoginPromptAsync)();
+        const { sessionManager } = await this.getContextAsync(AccountLogin, { nonInteractive: false });
+        await sessionManager.showLoginPromptAsync();
         log_1.default.log('Logged in');
     }
 }
 exports.default = AccountLogin;
+_a = AccountLogin;
 AccountLogin.description = 'log in with your Expo account';
 AccountLogin.aliases = ['login'];
+AccountLogin.contextDefinition = {
+    ..._a.ContextOptions.SessionManagment,
+};

package/build/commands/account/logout.d.ts

@@ -2,5 +2,8 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class AccountLogout extends EasCommand {
     static description: string;
     static aliases: string[];
+    static contextDefinition: {
+        sessionManager: import("../../commandUtils/context/SessionManagementContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/account/logout.js

@@ -1,15 +1,20 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const EasCommand_1 = tslib_1.__importDefault(require("../../commandUtils/EasCommand"));
 const log_1 = tslib_1.__importDefault(require("../../log"));
-const User_1 = require("../../user/User");
 class AccountLogout extends EasCommand_1.default {
     async runAsync() {
-        await (0, User_1.logoutAsync)();
+        const { sessionManager } = await this.getContextAsync(AccountLogout, { nonInteractive: false });
+        await sessionManager.logoutAsync();
         log_1.default.log('Logged out');
     }
 }
 exports.default = AccountLogout;
+_a = AccountLogout;
 AccountLogout.description = 'log out';
 AccountLogout.aliases = ['logout'];
+AccountLogout.contextDefinition = {
+    ..._a.ContextOptions.SessionManagment,
+};

package/build/commands/account/view.d.ts

@@ -2,5 +2,8 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class AccountView extends EasCommand {
     static description: string;
     static aliases: string[];
+    static contextDefinition: {
+        maybeLoggedIn: import("../../commandUtils/context/MaybeLoggedInContextField").default;
+    };
     runAsync(): Promise<void>;
 }

package/build/commands/account/view.js

@@ -1,4 +1,5 @@
 "use strict";
+var _a;
 Object.defineProperty(exports, "__esModule", { value: true });
 const tslib_1 = require("tslib");
 const chalk_1 = tslib_1.__importDefault(require("chalk"));
@@ -7,9 +8,9 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const User_1 = require("../../user/User");
 class AccountView extends EasCommand_1.default {
     async runAsync() {
-        const user = await (0, User_1.getUserAsync)();
-        if (user) {
-            log_1.default.log(chalk_1.default.green((0, User_1.getActorDisplayName)(user)));
+        const { maybeLoggedIn: { actor }, } = await this.getContextAsync(AccountView, { nonInteractive: true });
+        if (actor) {
+            log_1.default.log(chalk_1.default.green((0, User_1.getActorDisplayName)(actor)));
         }
         else {
             log_1.default.warn('Not logged in');
@@ -18,5 +19,9 @@ class AccountView extends EasCommand_1.default {
     }
 }
 exports.default = AccountView;
+_a = AccountView;
 AccountView.description = 'show the username you are logged in as';
 AccountView.aliases = ['whoami'];
+AccountView.contextDefinition = {
+    ..._a.ContextOptions.MaybeLoggedIn,
+};

package/build/commands/branch/create.d.ts

@@ -1,6 +1,7 @@
 import EasCommand from '../../commandUtils/EasCommand';
+import { ExpoGraphqlClient } from '../../commandUtils/context/contextUtils/createGraphqlClient';
 import { CreateUpdateBranchForAppMutationVariables, UpdateBranch } from '../../graphql/generated';
-export declare function createUpdateBranchOnAppAsync({ appId, name, }: CreateUpdateBranchForAppMutationVariables): Promise<Pick<UpdateBranch, 'id' | 'name'>>;
+export declare function createUpdateBranchOnAppAsync(graphqlClient: ExpoGraphqlClient, { appId, name }: CreateUpdateBranchForAppMutationVariables): Promise<Pick<UpdateBranch, 'id' | 'name'>>;
 export default class BranchCreate extends EasCommand {
     static description: string;
     static args: {
@@ -13,6 +14,7 @@ export default class BranchCreate extends EasCommand {
         'non-interactive': import("@oclif/core/lib/interfaces").BooleanFlag<boolean>;
     };
     static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     runAsync(): Promise<void>;

package/build/commands/branch/create.js

@@ -13,8 +13,8 @@ const log_1 = tslib_1.__importDefault(require("../../log"));
 const projectUtils_1 = require("../../project/projectUtils");
 const prompts_1 = require("../../prompts");
 const json_1 = require("../../utils/json");
-async function createUpdateBranchOnAppAsync({ appId, name, }) {
-    const result = await (0, client_1.withErrorHandlingAsync)(client_1.graphqlClient
+async function createUpdateBranchOnAppAsync(graphqlClient, { appId, name }) {
+    const result = await (0, client_1.withErrorHandlingAsync)(graphqlClient
         .mutation((0, graphql_tag_1.default) `
           mutation createUpdateBranchForApp($appId: ID!, $name: String!) {
             updateBranch {
@@ -39,13 +39,13 @@ exports.createUpdateBranchOnAppAsync = createUpdateBranchOnAppAsync;
 class BranchCreate extends EasCommand_1.default {
     async runAsync() {
         let { args: { name }, flags: { json: jsonFlag, 'non-interactive': nonInteractive }, } = await this.parse(BranchCreate);
-        const { projectConfig: { projectId }, } = await this.getContextAsync(BranchCreate, {
+        const { projectConfig: { projectId }, loggedIn: { graphqlClient }, } = await this.getContextAsync(BranchCreate, {
             nonInteractive,
         });
         if (jsonFlag) {
             (0, json_1.enableJsonOutput)();
         }
-        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(projectId);
+        const projectDisplayName = await (0, projectUtils_1.getDisplayNameForProjectIdAsync)(graphqlClient, projectId);
         if (!name) {
             const validationMessage = 'Branch name may not be empty.';
             if (nonInteractive) {
@@ -59,7 +59,7 @@ class BranchCreate extends EasCommand_1.default {
                 validate: value => (value ? true : validationMessage),
             }));
         }
-        const newBranch = await createUpdateBranchOnAppAsync({ appId: projectId, name });
+        const newBranch = await createUpdateBranchOnAppAsync(graphqlClient, { appId: projectId, name });
         if (jsonFlag) {
             (0, json_1.printJsonOnlyOutput)(newBranch);
         }
@@ -83,4 +83,5 @@ BranchCreate.flags = {
 };
 BranchCreate.contextDefinition = {
     ..._a.ContextOptions.ProjectConfig,
+    ..._a.ContextOptions.LoggedIn,
 };

package/build/commands/branch/delete.d.ts

@@ -2,6 +2,7 @@ import EasCommand from '../../commandUtils/EasCommand';
 export default class BranchDelete extends EasCommand {
     static description: string;
     static contextDefinition: {
+        loggedIn: import("../../commandUtils/context/LoggedInContextField").default;
         projectConfig: import("../../commandUtils/context/ProjectConfigContextField").default;
     };
     static args: {