@sanity/cli 6.1.3 → 6.1.4

package/dist/actions/auth/ensureAuthenticated.js

@@ -0,0 +1,61 @@
+import { getCliToken } from '@sanity/cli-core';
+import { isHttpError } from '@sanity/client';
+import { LoginError } from '../../errors/LoginError.js';
+import { getCliUser } from '../../services/user.js';
+import { getErrorMessage } from '../../util/getErrorMessage.js';
+import { login } from './login/login.js';
+/**
+ * Ensure the user is authenticated. Validates the current token via /users/me
+ * and triggers interactive login if the token is missing or invalid.
+ *
+ * @returns The authenticated user.
+ * @throws LoginError if interactive login fails or is cancelled.
+ * @throws Error if a network/server error occurs during validation.
+ * @internal
+ */ export async function ensureAuthenticated(options) {
+    const user = await validateSession();
+    if (user) return user;
+    try {
+        await login({
+            output: options.output,
+            telemetry: options.telemetry
+        });
+    } catch (cause) {
+        throw new LoginError(getErrorMessage(cause), {
+            cause
+        });
+    }
+    try {
+        return await getCliUser();
+    } catch (cause) {
+        if (isHttpError(cause) && (cause.statusCode === 401 || cause.statusCode === 403)) {
+            throw new LoginError(`Login succeeded but failed to verify session: ${getErrorMessage(cause)}`, {
+                cause
+            });
+        }
+        throw cause;
+    }
+}
+/**
+ * Validate the current CLI auth token by calling /users/me.
+ *
+ * Returns null only for auth failures (401/403). Re-throws network errors,
+ * timeouts, and server errors so callers can handle them appropriately
+ * instead of triggering an unnecessary re-login prompt.
+ *
+ * @returns The authenticated user if valid, null if invalid/missing.
+ * @internal
+ */ export async function validateSession() {
+    const token = await getCliToken();
+    if (!token) return null;
+    try {
+        return await getCliUser();
+    } catch (error) {
+        if (isHttpError(error) && (error.statusCode === 401 || error.statusCode === 403)) {
+            return null;
+        }
+        throw error;
+    }
+}
+
+//# sourceMappingURL=ensureAuthenticated.js.map

package/dist/actions/auth/ensureAuthenticated.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/auth/ensureAuthenticated.ts"],"sourcesContent":["import {\n  type CLITelemetryStore,\n  getCliToken,\n  type Output,\n  type SanityOrgUser,\n} from '@sanity/cli-core'\nimport {isHttpError} from '@sanity/client'\n\nimport {LoginError} from '../../errors/LoginError.js'\nimport {getCliUser} from '../../services/user.js'\nimport {getErrorMessage} from '../../util/getErrorMessage.js'\nimport {login} from './login/login.js'\n\n/**\n * Ensure the user is authenticated. Validates the current token via /users/me\n * and triggers interactive login if the token is missing or invalid.\n *\n * @returns The authenticated user.\n * @throws LoginError if interactive login fails or is cancelled.\n * @throws Error if a network/server error occurs during validation.\n * @internal\n */\nexport async function ensureAuthenticated(options: {\n  output: Output\n  telemetry: CLITelemetryStore\n}): Promise<SanityOrgUser> {\n  const user = await validateSession()\n  if (user) return user\n\n  try {\n    await login({output: options.output, telemetry: options.telemetry})\n  } catch (cause) {\n    throw new LoginError(getErrorMessage(cause), {cause})\n  }\n\n  try {\n    return await getCliUser()\n  } catch (cause) {\n    if (isHttpError(cause) && (cause.statusCode === 401 || cause.statusCode === 403)) {\n      throw new LoginError(\n        `Login succeeded but failed to verify session: ${getErrorMessage(cause)}`,\n        {cause},\n      )\n    }\n    throw cause\n  }\n}\n\n/**\n * Validate the current CLI auth token by calling /users/me.\n *\n * Returns null only for auth failures (401/403). Re-throws network errors,\n * timeouts, and server errors so callers can handle them appropriately\n * instead of triggering an unnecessary re-login prompt.\n *\n * @returns The authenticated user if valid, null if invalid/missing.\n * @internal\n */\nexport async function validateSession(): Promise<SanityOrgUser | null> {\n  const token = await getCliToken()\n  if (!token) return null\n\n  try {\n    return await getCliUser()\n  } catch (error) {\n    if (isHttpError(error) && (error.statusCode === 401 || error.statusCode === 403)) {\n      return null\n    }\n    throw error\n  }\n}\n"],"names":["getCliToken","isHttpError","LoginError","getCliUser","getErrorMessage","login","ensureAuthenticated","options","user","validateSession","output","telemetry","cause","statusCode","token","error"],"mappings":"AAAA,SAEEA,WAAW,QAGN,mBAAkB;AACzB,SAAQC,WAAW,QAAO,iBAAgB;AAE1C,SAAQC,UAAU,QAAO,6BAA4B;AACrD,SAAQC,UAAU,QAAO,yBAAwB;AACjD,SAAQC,eAAe,QAAO,gCAA+B;AAC7D,SAAQC,KAAK,QAAO,mBAAkB;AAEtC;;;;;;;;CAQC,GACD,OAAO,eAAeC,oBAAoBC,OAGzC;IACC,MAAMC,OAAO,MAAMC;IACnB,IAAID,MAAM,OAAOA;IAEjB,IAAI;QACF,MAAMH,MAAM;YAACK,QAAQH,QAAQG,MAAM;YAAEC,WAAWJ,QAAQI,SAAS;QAAA;IACnE,EAAE,OAAOC,OAAO;QACd,MAAM,IAAIV,WAAWE,gBAAgBQ,QAAQ;YAACA;QAAK;IACrD;IAEA,IAAI;QACF,OAAO,MAAMT;IACf,EAAE,OAAOS,OAAO;QACd,IAAIX,YAAYW,UAAWA,CAAAA,MAAMC,UAAU,KAAK,OAAOD,MAAMC,UAAU,KAAK,GAAE,GAAI;YAChF,MAAM,IAAIX,WACR,CAAC,8CAA8C,EAAEE,gBAAgBQ,QAAQ,EACzE;gBAACA;YAAK;QAEV;QACA,MAAMA;IACR;AACF;AAEA;;;;;;;;;CASC,GACD,OAAO,eAAeH;IACpB,MAAMK,QAAQ,MAAMd;IACpB,IAAI,CAACc,OAAO,OAAO;IAEnB,IAAI;QACF,OAAO,MAAMX;IACf,EAAE,OAAOY,OAAO;QACd,IAAId,YAAYc,UAAWA,CAAAA,MAAMF,UAAU,KAAK,OAAOE,MAAMF,UAAU,KAAK,GAAE,GAAI;YAChF,OAAO;QACT;QACA,MAAME;IACR;AACF"}

package/dist/commands/init.js

@@ -10,6 +10,7 @@ import { isHttpError } from '@sanity/client';
 import { frameworks } from '@vercel/frameworks';
 import { execa } from 'execa';
 import deburr from 'lodash-es/deburr.js';
+import { validateSession } from '../actions/auth/ensureAuthenticated.js';
 import { getProviderName } from '../actions/auth/getProviderName.js';
 import { login } from '../actions/auth/login/login.js';
 import { createDataset } from '../actions/dataset/create.js';
@@ -681,49 +682,40 @@ export class InitCommand extends SanityCommand {
     }
     // @todo do we actually need to be authenticated for init? check flags and determine.
     async ensureAuthenticated() {
-        let isAuthenticated = await getCliToken() !== undefined;
-        debug(isAuthenticated ? 'User already has a token' : 'User has no token');
-        let user;
-        if (isAuthenticated) {
-            // It _appears_ we are authenticated, but the token might be invalid/expired,
-            // so we need to verify that we can actually make an authenticated request.
-            try {
-                user = await getCliUser();
-            } catch  {
-                // assume that any error means that the token is invalid
-                isAuthenticated = false;
-            }
-        }
-        if (isAuthenticated) {
+        const user = await validateSession();
+        if (user) {
             this._trace.log({
                 alreadyLoggedIn: true,
                 step: 'login'
             });
-        } else {
-            if (this.isUnattended()) {
-                this.error('Must be logged in to run this command in unattended mode, run `sanity login`', {
-                    exit: 1
-                });
-            }
-            this._trace.log({
-                step: 'login'
+            this.log(`${logSymbols.success} You are logged in as ${user.email} using ${getProviderName(user.provider)}`);
+            return {
+                user
+            };
+        }
+        if (this.isUnattended()) {
+            this.error('Must be logged in to run this command in unattended mode, run `sanity login`', {
+                exit: 1
             });
-            try {
-                await login({
-                    output: this.output,
-                    telemetry: this._trace.newContext('login')
-                });
-            } catch (error) {
-                const message = error instanceof Error ? error.message : String(error);
-                this.error(`Login failed: ${message}`, {
-                    exit: 1
-                });
-            }
         }
-        user = await getCliUser();
-        this.log(`${logSymbols.success} You are logged in as ${user.email} using ${getProviderName(user.provider)}`);
+        this._trace.log({
+            step: 'login'
+        });
+        try {
+            await login({
+                output: this.output,
+                telemetry: this._trace.newContext('login')
+            });
+        } catch (error) {
+            const message = error instanceof Error ? error.message : String(error);
+            this.error(`Login failed: ${message}`, {
+                exit: 1
+            });
+        }
+        const loggedInUser = await getCliUser();
+        this.log(`${logSymbols.success} You are logged in as ${loggedInUser.email} using ${getProviderName(loggedInUser.provider)}`);
         return {
-            user
+            user: loggedInUser
         };
     }
     flagOrDefault(flag, defaultValue) {