@sanity/cli 6.0.0-alpha.20 → 6.0.0-alpha.21

package/dist/actions/auth/authServer.js

@@ -1,6 +1,7 @@
 import { createServer } from 'node:http';
 import os from 'node:os';
-import { subdebug } from '@sanity/cli-core';
+import { getSanityUrl, subdebug } from '@sanity/cli-core';
+import { getTokenDetails } from '../../services/auth.js';
 const debug = subdebug('auth');
 const callbackPorts = [
     4321,
@@ -30,13 +31,11 @@ const platformNames = {
  *
  * If we fail to bind to the first port, we retry with the next port in the list.
  *
- * @param options - Options for the server
+ * @param providerUrl - The URL of the login provider
  * @returns Resolves with HTTP server instance, a login URL to send user to, and a `token` promise
  * @internal
- */ export function startServerForTokenCallback(options) {
-    const { client, providerUrl } = options;
-    const { apiHost } = client.config();
-    const domain = apiHost.includes('.sanity.work') ? 'www.sanity.work' : 'www.sanity.io';
+ */ export function startServerForTokenCallback(providerUrl) {
+    const sanityUrl = getSanityUrl();
     const attemptPorts = [
         ...callbackPorts
     ];
@@ -52,7 +51,8 @@ const platformNames = {
         const server = createServer(async function onCallbackServerRequest(req, res) {
             function failLoginRequest(code = '') {
                 res.writeHead(303, 'See Other', {
-                    Location: `https://${domain}/login/error${code ? `?error=${code}` : ''}`
+                    Connection: 'close',
+                    Location: `${sanityUrl}/login/error${code ? `?error=${code}` : ''}`
                 });
                 res.end();
                 server.close();
@@ -60,6 +60,7 @@ const platformNames = {
             const url = new URL(req.url || '/', `http://localhost:${callbackPort}`);
             if (url.pathname !== callbackEndpoint) {
                 res.writeHead(404, 'Not Found', {
+                    Connection: 'close',
                     'Content-Type': 'text/plain'
                 });
                 res.write('404 Not Found');
@@ -69,25 +70,26 @@ const platformNames = {
             const absoluteTokenUrl = url.searchParams.get('url');
             if (!absoluteTokenUrl) {
                 failLoginRequest();
+                rejectToken(new Error('Missing callback URL'));
                 return;
             }
             const tokenUrl = new URL(absoluteTokenUrl);
             if (!tokenUrl.searchParams.has('sid')) {
                 failLoginRequest('NO_SESSION_ID');
+                rejectToken(new Error('Missing session ID in callback'));
                 return;
             }
             let token;
             try {
-                token = await client.request({
-                    uri: `/auth/fetch${tokenUrl.search}`
-                });
+                token = await getTokenDetails(tokenUrl.search);
             } catch (err) {
                 failLoginRequest('UNRESOLVED_SESSION');
                 rejectToken(err instanceof Error ? err : new Error(`Unknown error: ${err}`));
                 return;
             }
             res.writeHead(303, 'See Other', {
-                Location: `https://${domain}/login/success`
+                Connection: 'close',
+                Location: `${sanityUrl}/login/success`
             });
             res.end();
             server.close();

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/auth/authServer.ts"],"sourcesContent":["import {createServer, type Server} from 'node:http'\nimport os from 'node:os'\n\nimport {subdebug} from '@sanity/cli-core'\nimport {type SanityClient} from '@sanity/client'\n\nconst debug = subdebug('auth')\nconst callbackPorts = [4321, 4000, 3003, 1234, 8080, 13_333]\nconst callbackEndpoint = '/callback'\n\nconst platformNames: Record<string, string | undefined> = {\n  aix: 'AIX',\n  android: 'Android',\n  darwin: 'MacOS',\n  freebsd: 'FreeBSD',\n  linux: 'Linux',\n  openbsd: 'OpenBSD',\n  sunos: 'SunOS',\n  win32: 'Windows',\n}\n\n/**\n * The response shape from /auth/fetch\n *\n * @internal\n */\ninterface TokenDetails {\n  label: string\n  token: string\n}\n\n/**\n * Start a local HTTP server and wait for a request to the auth callback endpoint.\n * This happens by the user being sent to a login page with a callback URL that points to\n * this local server. This request includes a short-lived \"SID\" (session ID) that we then\n * do a request to the `/auth/fetch` endpoint with to get the actual auth token,\n * invalidating the SID in the process.\n *\n * If we fail to bind to the first port, we retry with the next port in the list.\n *\n * @param options - Options for the server\n * @returns Resolves with HTTP server instance, a login URL to send user to, and a `token` promise\n * @internal\n */\nexport function startServerForTokenCallback(options: {\n  client: SanityClient\n  providerUrl: string\n}): Promise<{loginUrl: URL; server: Server; token: Promise<TokenDetails>}> {\n  const {client, providerUrl} = options\n  const {apiHost} = client.config()\n  const domain = apiHost.includes('.sanity.work') ? 'www.sanity.work' : 'www.sanity.io'\n\n  const attemptPorts = [...callbackPorts]\n  let callbackPort = attemptPorts.shift()\n\n  // note: replace with `Promise.withResolvers()` when minimum Node.js is 22+\n  let resolveToken: (resolvedToken: PromiseLike<TokenDetails> | TokenDetails) => void\n  let rejectToken: (reason: Error) => void\n  const tokenPromise = new Promise<TokenDetails>((resolve, reject) => {\n    resolveToken = resolve\n    rejectToken = reject\n  })\n\n  return new Promise((resolve, reject) => {\n    const server = createServer(async function onCallbackServerRequest(req, res) {\n      function failLoginRequest(code = '') {\n        res.writeHead(303, 'See Other', {\n          Location: `https://${domain}/login/error${code ? `?error=${code}` : ''}`,\n        })\n        res.end()\n        server.close()\n      }\n\n      const url = new URL(req.url || '/', `http://localhost:${callbackPort}`)\n      if (url.pathname !== callbackEndpoint) {\n        res.writeHead(404, 'Not Found', {'Content-Type': 'text/plain'})\n        res.write('404 Not Found')\n        res.end()\n        return\n      }\n\n      const absoluteTokenUrl = url.searchParams.get('url')\n      if (!absoluteTokenUrl) {\n        failLoginRequest()\n        return\n      }\n\n      const tokenUrl = new URL(absoluteTokenUrl)\n      if (!tokenUrl.searchParams.has('sid')) {\n        failLoginRequest('NO_SESSION_ID')\n        return\n      }\n\n      let token: TokenDetails\n      try {\n        token = await client.request({uri: `/auth/fetch${tokenUrl.search}`})\n      } catch (err) {\n        failLoginRequest('UNRESOLVED_SESSION')\n        rejectToken(err instanceof Error ? err : new Error(`Unknown error: ${err}`))\n        return\n      }\n\n      res.writeHead(303, 'See Other', {Location: `https://${domain}/login/success`})\n      res.end()\n      server.close()\n      resolveToken(token)\n    })\n\n    server.on('listening', function onCallbackListen() {\n      // Once the server is successfully listening on a port, we can return the promise.\n      // We'll then await the _token promise_, while the server is running in the background.\n      const loginUrl = getLoginUrl(server, providerUrl)\n      resolve({loginUrl, server, token: tokenPromise})\n    })\n\n    server.on('error', function onCallbackServerError(err) {\n      if ('code' in err && err.code === 'EADDRINUSE') {\n        callbackPort = attemptPorts.shift()\n        if (!callbackPort) {\n          reject(new Error('Failed to find port number to bind auth callback server to'))\n          return\n        }\n\n        debug('Port busy, trying %d', callbackPort)\n        server.listen(callbackPort)\n      } else {\n        reject(err)\n      }\n    })\n\n    debug('Starting callback server on port %d', callbackPort)\n    server.listen(callbackPort)\n  })\n}\n\n/**\n * Get the login URL to send the user to for the given local auth token server.\n *\n * The generated URL will include a label for the session that includes the\n * hostname and platform of the current computer, to help identify the session.\n *\n * @param server - The local auth token server\n * @param providerUrl - The URL of the login provider\n * @returns The login URL\n * @internal\n */\nfunction getLoginUrl(server: Server, providerUrl: string): URL {\n  const serverUrl = server.address()\n  if (!serverUrl || typeof serverUrl === 'string') {\n    // Note: `serverUrl` is string only when binding to unix sockets,\n    // thus we can safely assume Something Is Wrong™ if it's a string\n    throw new Error('Failed to start auth callback server')\n  }\n\n  // Build a login URL that redirects back back to OAuth flow on success\n  const loginUrl = new URL(providerUrl)\n\n  // Prefer `MacOS` over `darwin` etc\n  const platformName = os.platform()\n  const platform = platformName in platformNames ? platformNames[platformName] : platformName\n\n  // Prefer `espens-macbook` over `espens-macbook.local`\n  const hostname = os.hostname().replaceAll(/\\.(local|lan)$/g, '')\n\n  loginUrl.searchParams.set('type', 'token')\n  loginUrl.searchParams.set('label', `${hostname} / ${platform}`)\n  loginUrl.searchParams.set('origin', `http://localhost:${serverUrl.port}${callbackEndpoint}`)\n\n  return loginUrl\n}\n"],"names":["createServer","os","subdebug","debug","callbackPorts","callbackEndpoint","platformNames","aix","android","darwin","freebsd","linux","openbsd","sunos","win32","startServerForTokenCallback","options","client","providerUrl","apiHost","config","domain","includes","attemptPorts","callbackPort","shift","resolveToken","rejectToken","tokenPromise","Promise","resolve","reject","server","onCallbackServerRequest","req","res","failLoginRequest","code","writeHead","Location","end","close","url","URL","pathname","write","absoluteTokenUrl","searchParams","get","tokenUrl","has","token","request","uri","search","err","Error","on","onCallbackListen","loginUrl","getLoginUrl","onCallbackServerError","listen","serverUrl","address","platformName","platform","hostname","replaceAll","set","port"],"mappings":"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"}
+{"version":3,"sources":["../../../src/actions/auth/authServer.ts"],"sourcesContent":["import {createServer, type Server} from 'node:http'\nimport os from 'node:os'\n\nimport {getSanityUrl, subdebug} from '@sanity/cli-core'\n\nimport {getTokenDetails} from '../../services/auth.js'\nimport {type TokenDetails} from './types.js'\n\nconst debug = subdebug('auth')\nconst callbackPorts = [4321, 4000, 3003, 1234, 8080, 13_333]\nconst callbackEndpoint = '/callback'\n\nconst platformNames: Record<string, string | undefined> = {\n  aix: 'AIX',\n  android: 'Android',\n  darwin: 'MacOS',\n  freebsd: 'FreeBSD',\n  linux: 'Linux',\n  openbsd: 'OpenBSD',\n  sunos: 'SunOS',\n  win32: 'Windows',\n}\n\n/**\n * Start a local HTTP server and wait for a request to the auth callback endpoint.\n * This happens by the user being sent to a login page with a callback URL that points to\n * this local server. This request includes a short-lived \"SID\" (session ID) that we then\n * do a request to the `/auth/fetch` endpoint with to get the actual auth token,\n * invalidating the SID in the process.\n *\n * If we fail to bind to the first port, we retry with the next port in the list.\n *\n * @param providerUrl - The URL of the login provider\n * @returns Resolves with HTTP server instance, a login URL to send user to, and a `token` promise\n * @internal\n */\nexport function startServerForTokenCallback(\n  providerUrl: string,\n): Promise<{loginUrl: URL; server: Server; token: Promise<TokenDetails>}> {\n  const sanityUrl = getSanityUrl()\n\n  const attemptPorts = [...callbackPorts]\n  let callbackPort = attemptPorts.shift()\n\n  // note: replace with `Promise.withResolvers()` when minimum Node.js is 22+\n  let resolveToken: (resolvedToken: PromiseLike<TokenDetails> | TokenDetails) => void\n  let rejectToken: (reason: Error) => void\n  const tokenPromise = new Promise<TokenDetails>((resolve, reject) => {\n    resolveToken = resolve\n    rejectToken = reject\n  })\n\n  return new Promise((resolve, reject) => {\n    const server = createServer(async function onCallbackServerRequest(req, res) {\n      function failLoginRequest(code = '') {\n        res.writeHead(303, 'See Other', {\n          Connection: 'close',\n          Location: `${sanityUrl}/login/error${code ? `?error=${code}` : ''}`,\n        })\n        res.end()\n        server.close()\n      }\n\n      const url = new URL(req.url || '/', `http://localhost:${callbackPort}`)\n      if (url.pathname !== callbackEndpoint) {\n        res.writeHead(404, 'Not Found', {Connection: 'close', 'Content-Type': 'text/plain'})\n        res.write('404 Not Found')\n        res.end()\n        return\n      }\n\n      const absoluteTokenUrl = url.searchParams.get('url')\n      if (!absoluteTokenUrl) {\n        failLoginRequest()\n        rejectToken(new Error('Missing callback URL'))\n        return\n      }\n\n      const tokenUrl = new URL(absoluteTokenUrl)\n      if (!tokenUrl.searchParams.has('sid')) {\n        failLoginRequest('NO_SESSION_ID')\n        rejectToken(new Error('Missing session ID in callback'))\n        return\n      }\n\n      let token: TokenDetails\n      try {\n        token = await getTokenDetails(tokenUrl.search)\n      } catch (err) {\n        failLoginRequest('UNRESOLVED_SESSION')\n        rejectToken(err instanceof Error ? err : new Error(`Unknown error: ${err}`))\n        return\n      }\n\n      res.writeHead(303, 'See Other', {\n        Connection: 'close',\n        Location: `${sanityUrl}/login/success`,\n      })\n      res.end()\n      server.close()\n      resolveToken(token)\n    })\n\n    server.on('listening', function onCallbackListen() {\n      // Once the server is successfully listening on a port, we can return the promise.\n      // We'll then await the _token promise_, while the server is running in the background.\n      const loginUrl = getLoginUrl(server, providerUrl)\n      resolve({loginUrl, server, token: tokenPromise})\n    })\n\n    server.on('error', function onCallbackServerError(err) {\n      if ('code' in err && err.code === 'EADDRINUSE') {\n        callbackPort = attemptPorts.shift()\n        if (!callbackPort) {\n          reject(new Error('Failed to find port number to bind auth callback server to'))\n          return\n        }\n\n        debug('Port busy, trying %d', callbackPort)\n        server.listen(callbackPort)\n      } else {\n        reject(err)\n      }\n    })\n\n    debug('Starting callback server on port %d', callbackPort)\n    server.listen(callbackPort)\n  })\n}\n\n/**\n * Get the login URL to send the user to for the given local auth token server.\n *\n * The generated URL will include a label for the session that includes the\n * hostname and platform of the current computer, to help identify the session.\n *\n * @param server - The local auth token server\n * @param providerUrl - The URL of the login provider\n * @returns The login URL\n * @internal\n */\nfunction getLoginUrl(server: Server, providerUrl: string): URL {\n  const serverUrl = server.address()\n  if (!serverUrl || typeof serverUrl === 'string') {\n    // Note: `serverUrl` is string only when binding to unix sockets,\n    // thus we can safely assume Something Is Wrong™ if it's a string\n    throw new Error('Failed to start auth callback server')\n  }\n\n  // Build a login URL that redirects back back to OAuth flow on success\n  const loginUrl = new URL(providerUrl)\n\n  // Prefer `MacOS` over `darwin` etc\n  const platformName = os.platform()\n  const platform = platformName in platformNames ? platformNames[platformName] : platformName\n\n  // Prefer `espens-macbook` over `espens-macbook.local`\n  const hostname = os.hostname().replaceAll(/\\.(local|lan)$/g, '')\n\n  loginUrl.searchParams.set('type', 'token')\n  loginUrl.searchParams.set('label', `${hostname} / ${platform}`)\n  loginUrl.searchParams.set('origin', `http://localhost:${serverUrl.port}${callbackEndpoint}`)\n\n  return loginUrl\n}\n"],"names":["createServer","os","getSanityUrl","subdebug","getTokenDetails","debug","callbackPorts","callbackEndpoint","platformNames","aix","android","darwin","freebsd","linux","openbsd","sunos","win32","startServerForTokenCallback","providerUrl","sanityUrl","attemptPorts","callbackPort","shift","resolveToken","rejectToken","tokenPromise","Promise","resolve","reject","server","onCallbackServerRequest","req","res","failLoginRequest","code","writeHead","Connection","Location","end","close","url","URL","pathname","write","absoluteTokenUrl","searchParams","get","Error","tokenUrl","has","token","search","err","on","onCallbackListen","loginUrl","getLoginUrl","onCallbackServerError","listen","serverUrl","address","platformName","platform","hostname","replaceAll","set","port"],"mappings":"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"}

package/dist/actions/auth/login/getProvider.js

@@ -1,54 +1,58 @@
+import { subdebug } from '@sanity/cli-core';
 import { input, spinner } from '@sanity/cli-core/ux';
+import { promptForProviders } from '../../../prompts/promptForProviders.js';
+import { getProviders } from '../../../services/auth.js';
 import { getSSOProvider } from './getSSOProvider.js';
-import { promptProviders } from './promptProviders.js';
+const debug = subdebug('login:getProvider');
 /**
  * Prompt the user to select a login provider, or use the specified provider if given.
  *
  * @param options - Options for the provider resolve operation
  * @returns Promise that resolves to the selected login provider
  * @internal
- */ export async function getProvider({ client, experimental, orgSlug, specifiedProvider }) {
-    if (orgSlug) {
-        return getSSOProvider({
-            client,
-            orgSlug
-        });
-    }
-    // Fetch and prompt for login provider to use
-    const spin = spinner('Fetching providers...').start();
-    let { providers } = await client.request({
-        uri: '/auth/providers'
-    });
-    if (experimental) {
-        providers = [
-            ...providers,
-            {
-                name: 'sso',
-                title: 'SSO',
-                url: '_not_used_'
+ */ export async function getProvider({ experimental, orgSlug, specifiedProvider }) {
+    let spin;
+    try {
+        if (orgSlug) {
+            return getSSOProvider(orgSlug);
+        }
+        spin = spinner('Fetching providers...').start();
+        // Fetch and prompt for login provider to use
+        let { providers } = await getProviders();
+        if (experimental) {
+            providers = [
+                ...providers,
+                {
+                    name: 'sso',
+                    title: 'SSO',
+                    url: '_not_used_'
+                }
+            ];
+        }
+        spin.stop();
+        if (specifiedProvider) {
+            const provider = providers.find((prov)=>prov.name === specifiedProvider);
+            if (!provider) {
+                throw new Error(`Cannot find login provider with name "${specifiedProvider}"`);
             }
-        ];
-    }
-    spin.stop();
-    const providerNames = providers.map((prov)=>prov.name);
-    if (specifiedProvider && providerNames.includes(specifiedProvider)) {
-        const provider = providers.find((prov)=>prov.name === specifiedProvider);
-        if (!provider) {
-            throw new Error(`Cannot find login provider with name "${specifiedProvider}"`);
+            return provider;
+        }
+        if (providers.length === 0) {
+            return undefined;
+        }
+        const provider = await promptForProviders(providers);
+        if (provider.name === 'sso') {
+            const orgSlug = await input({
+                message: 'Organization slug:'
+            });
+            return getSSOProvider(orgSlug);
         }
         return provider;
+    } catch (err) {
+        spin?.stop();
+        debug('Error retrieving providers', err);
+        throw err;
     }
-    const provider = await promptProviders(providers);
-    if (provider.name === 'sso') {
-        const orgSlug = await input({
-            message: 'Organization slug:'
-        });
-        return getSSOProvider({
-            client,
-            orgSlug
-        });
-    }
-    return provider;
 }
 
 //# sourceMappingURL=getProvider.js.map

package/dist/actions/auth/login/getProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/auth/login/getProvider.ts"],"sourcesContent":["import {input, spinner} from '@sanity/cli-core/ux'\nimport {type SanityClient} from '@sanity/client'\n\nimport {type LoginProvider, type ProvidersResponse} from '../types.js'\nimport {getSSOProvider} from './getSSOProvider.js'\nimport {promptProviders} from './promptProviders.js'\n\n/**\n * Prompt the user to select a login provider, or use the specified provider if given.\n *\n * @param options - Options for the provider resolve operation\n * @returns Promise that resolves to the selected login provider\n * @internal\n */\nexport async function getProvider({\n  client,\n  experimental,\n  orgSlug,\n  specifiedProvider,\n}: {\n  client: SanityClient\n  experimental: boolean | undefined\n  orgSlug: string | undefined\n  specifiedProvider: string | undefined\n}): Promise<LoginProvider | undefined> {\n  if (orgSlug) {\n    return getSSOProvider({client, orgSlug})\n  }\n\n  // Fetch and prompt for login provider to use\n  const spin = spinner('Fetching providers...').start()\n  let {providers} = await client.request<ProvidersResponse>({uri: '/auth/providers'})\n  if (experimental) {\n    providers = [...providers, {name: 'sso', title: 'SSO', url: '_not_used_'}]\n  }\n  spin.stop()\n\n  const providerNames = providers.map((prov) => prov.name)\n\n  if (specifiedProvider && providerNames.includes(specifiedProvider)) {\n    const provider = providers.find((prov) => prov.name === specifiedProvider)\n\n    if (!provider) {\n      throw new Error(`Cannot find login provider with name \"${specifiedProvider}\"`)\n    }\n\n    return provider\n  }\n\n  const provider = await promptProviders(providers)\n  if (provider.name === 'sso') {\n    const orgSlug = await input({message: 'Organization slug:'})\n    return getSSOProvider({client, orgSlug})\n  }\n\n  return provider\n}\n"],"names":["input","spinner","getSSOProvider","promptProviders","getProvider","client","experimental","orgSlug","specifiedProvider","spin","start","providers","request","uri","name","title","url","stop","providerNames","map","prov","includes","provider","find","Error","message"],"mappings":"AAAA,SAAQA,KAAK,EAAEC,OAAO,QAAO,sBAAqB;AAIlD,SAAQC,cAAc,QAAO,sBAAqB;AAClD,SAAQC,eAAe,QAAO,uBAAsB;AAEpD;;;;;;CAMC,GACD,OAAO,eAAeC,YAAY,EAChCC,MAAM,EACNC,YAAY,EACZC,OAAO,EACPC,iBAAiB,EAMlB;IACC,IAAID,SAAS;QACX,OAAOL,eAAe;YAACG;YAAQE;QAAO;IACxC;IAEA,6CAA6C;IAC7C,MAAME,OAAOR,QAAQ,yBAAyBS,KAAK;IACnD,IAAI,EAACC,SAAS,EAAC,GAAG,MAAMN,OAAOO,OAAO,CAAoB;QAACC,KAAK;IAAiB;IACjF,IAAIP,cAAc;QAChBK,YAAY;eAAIA;YAAW;gBAACG,MAAM;gBAAOC,OAAO;gBAAOC,KAAK;YAAY;SAAE;IAC5E;IACAP,KAAKQ,IAAI;IAET,MAAMC,gBAAgBP,UAAUQ,GAAG,CAAC,CAACC,OAASA,KAAKN,IAAI;IAEvD,IAAIN,qBAAqBU,cAAcG,QAAQ,CAACb,oBAAoB;QAClE,MAAMc,WAAWX,UAAUY,IAAI,CAAC,CAACH,OAASA,KAAKN,IAAI,KAAKN;QAExD,IAAI,CAACc,UAAU;YACb,MAAM,IAAIE,MAAM,CAAC,sCAAsC,EAAEhB,kBAAkB,CAAC,CAAC;QAC/E;QAEA,OAAOc;IACT;IAEA,MAAMA,WAAW,MAAMnB,gBAAgBQ;IACvC,IAAIW,SAASR,IAAI,KAAK,OAAO;QAC3B,MAAMP,UAAU,MAAMP,MAAM;YAACyB,SAAS;QAAoB;QAC1D,OAAOvB,eAAe;YAACG;YAAQE;QAAO;IACxC;IAEA,OAAOe;AACT"}
+{"version":3,"sources":["../../../../src/actions/auth/login/getProvider.ts"],"sourcesContent":["import {subdebug} from '@sanity/cli-core'\nimport {input, spinner, SpinnerInstance} from '@sanity/cli-core/ux'\n\nimport {promptForProviders} from '../../../prompts/promptForProviders.js'\nimport {getProviders} from '../../../services/auth.js'\nimport {type LoginProvider} from '../types.js'\nimport {getSSOProvider} from './getSSOProvider.js'\n\nconst debug = subdebug('login:getProvider')\n\n/**\n * Prompt the user to select a login provider, or use the specified provider if given.\n *\n * @param options - Options for the provider resolve operation\n * @returns Promise that resolves to the selected login provider\n * @internal\n */\nexport async function getProvider({\n  experimental,\n  orgSlug,\n  specifiedProvider,\n}: {\n  experimental: boolean | undefined\n  orgSlug: string | undefined\n  specifiedProvider: string | undefined\n}): Promise<LoginProvider | undefined> {\n  let spin: SpinnerInstance | undefined\n\n  try {\n    if (orgSlug) {\n      return getSSOProvider(orgSlug)\n    }\n\n    spin = spinner('Fetching providers...').start()\n    // Fetch and prompt for login provider to use\n    let {providers} = await getProviders()\n    if (experimental) {\n      providers = [...providers, {name: 'sso', title: 'SSO', url: '_not_used_'}]\n    }\n    spin.stop()\n\n    if (specifiedProvider) {\n      const provider = providers.find((prov) => prov.name === specifiedProvider)\n      if (!provider) {\n        throw new Error(`Cannot find login provider with name \"${specifiedProvider}\"`)\n      }\n      return provider\n    }\n\n    if (providers.length === 0) {\n      return undefined\n    }\n\n    const provider = await promptForProviders(providers)\n    if (provider.name === 'sso') {\n      const orgSlug = await input({message: 'Organization slug:'})\n      return getSSOProvider(orgSlug)\n    }\n\n    return provider\n  } catch (err) {\n    spin?.stop()\n    debug('Error retrieving providers', err)\n    throw err\n  }\n}\n"],"names":["subdebug","input","spinner","promptForProviders","getProviders","getSSOProvider","debug","getProvider","experimental","orgSlug","specifiedProvider","spin","start","providers","name","title","url","stop","provider","find","prov","Error","length","undefined","message","err"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,mBAAkB;AACzC,SAAQC,KAAK,EAAEC,OAAO,QAAwB,sBAAqB;AAEnE,SAAQC,kBAAkB,QAAO,yCAAwC;AACzE,SAAQC,YAAY,QAAO,4BAA2B;AAEtD,SAAQC,cAAc,QAAO,sBAAqB;AAElD,MAAMC,QAAQN,SAAS;AAEvB;;;;;;CAMC,GACD,OAAO,eAAeO,YAAY,EAChCC,YAAY,EACZC,OAAO,EACPC,iBAAiB,EAKlB;IACC,IAAIC;IAEJ,IAAI;QACF,IAAIF,SAAS;YACX,OAAOJ,eAAeI;QACxB;QAEAE,OAAOT,QAAQ,yBAAyBU,KAAK;QAC7C,6CAA6C;QAC7C,IAAI,EAACC,SAAS,EAAC,GAAG,MAAMT;QACxB,IAAII,cAAc;YAChBK,YAAY;mBAAIA;gBAAW;oBAACC,MAAM;oBAAOC,OAAO;oBAAOC,KAAK;gBAAY;aAAE;QAC5E;QACAL,KAAKM,IAAI;QAET,IAAIP,mBAAmB;YACrB,MAAMQ,WAAWL,UAAUM,IAAI,CAAC,CAACC,OAASA,KAAKN,IAAI,KAAKJ;YACxD,IAAI,CAACQ,UAAU;gBACb,MAAM,IAAIG,MAAM,CAAC,sCAAsC,EAAEX,kBAAkB,CAAC,CAAC;YAC/E;YACA,OAAOQ;QACT;QAEA,IAAIL,UAAUS,MAAM,KAAK,GAAG;YAC1B,OAAOC;QACT;QAEA,MAAML,WAAW,MAAMf,mBAAmBU;QAC1C,IAAIK,SAASJ,IAAI,KAAK,OAAO;YAC3B,MAAML,UAAU,MAAMR,MAAM;gBAACuB,SAAS;YAAoB;YAC1D,OAAOnB,eAAeI;QACxB;QAEA,OAAOS;IACT,EAAE,OAAOO,KAAK;QACZd,MAAMM;QACNX,MAAM,8BAA8BmB;QACpC,MAAMA;IACR;AACF"}

package/dist/actions/auth/login/getSSOProvider.js

@@ -1,30 +1,36 @@
+import { subdebug } from '@sanity/cli-core';
 import { select } from '@sanity/cli-core/ux';
+import { getSSOProviders } from '../../../services/auth.js';
 import { samlProviderToLoginProvider } from './samlProviderToLoginProvider.js';
+const debug = subdebug('login:getSSOProvider');
 /**
  * Get the SSO provider for the given slug
  *
- * @param options - Options for the provider resolve operation
+ * @param orgSlug - The slug of the organization to get the SSO provider for
  * @returns Promise that resolves to the SSO provider
  * @internal
- */ export async function getSSOProvider({ client, orgSlug }) {
-    const providers = await client.request({
-        uri: `/auth/organizations/by-slug/${orgSlug}/providers`
-    });
-    const enabledProviders = providers.filter((candidate)=>!candidate.disabled);
-    if (enabledProviders.length === 0) {
-        return undefined;
+ */ export async function getSSOProvider(orgSlug) {
+    try {
+        const providers = await getSSOProviders(orgSlug);
+        const enabledProviders = providers.filter((candidate)=>!candidate.disabled);
+        if (enabledProviders.length === 0) {
+            return undefined;
+        }
+        if (enabledProviders.length === 1) {
+            return samlProviderToLoginProvider(enabledProviders[0]);
+        }
+        const selectedProvider = await select({
+            choices: enabledProviders.map((provider)=>({
+                    name: provider.name,
+                    value: provider
+                })),
+            message: 'Select SSO provider'
+        });
+        return samlProviderToLoginProvider(selectedProvider);
+    } catch (err) {
+        debug('Error retrieving SSO Providers: %O', err);
+        throw err;
     }
-    if (enabledProviders.length === 1) {
-        return samlProviderToLoginProvider(enabledProviders[0]);
-    }
-    const selectedProvider = await select({
-        choices: enabledProviders.map((provider)=>({
-                name: provider.name,
-                value: provider
-            })),
-        message: 'Select SSO provider'
-    });
-    return selectedProvider ? samlProviderToLoginProvider(selectedProvider) : undefined;
 }
 
 //# sourceMappingURL=getSSOProvider.js.map

package/dist/actions/auth/login/getSSOProvider.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/auth/login/getSSOProvider.ts"],"sourcesContent":["import {select} from '@sanity/cli-core/ux'\nimport {type SanityClient} from '@sanity/client'\n\nimport {type LoginProvider, type SamlLoginProvider} from '../types.js'\nimport {samlProviderToLoginProvider} from './samlProviderToLoginProvider.js'\n\n/**\n * Get the SSO provider for the given slug\n *\n * @param options - Options for the provider resolve operation\n * @returns Promise that resolves to the SSO provider\n * @internal\n */\nexport async function getSSOProvider({\n  client,\n  orgSlug,\n}: {\n  client: SanityClient\n  orgSlug: string\n}): Promise<LoginProvider | undefined> {\n  const providers = await client.request<SamlLoginProvider[]>({\n    uri: `/auth/organizations/by-slug/${orgSlug}/providers`,\n  })\n\n  const enabledProviders = providers.filter((candidate) => !candidate.disabled)\n  if (enabledProviders.length === 0) {\n    return undefined\n  }\n\n  if (enabledProviders.length === 1) {\n    return samlProviderToLoginProvider(enabledProviders[0])\n  }\n\n  const selectedProvider = await select({\n    choices: enabledProviders.map((provider) => ({name: provider.name, value: provider})),\n    message: 'Select SSO provider',\n  })\n\n  return selectedProvider ? samlProviderToLoginProvider(selectedProvider) : undefined\n}\n"],"names":["select","samlProviderToLoginProvider","getSSOProvider","client","orgSlug","providers","request","uri","enabledProviders","filter","candidate","disabled","length","undefined","selectedProvider","choices","map","provider","name","value","message"],"mappings":"AAAA,SAAQA,MAAM,QAAO,sBAAqB;AAI1C,SAAQC,2BAA2B,QAAO,mCAAkC;AAE5E;;;;;;CAMC,GACD,OAAO,eAAeC,eAAe,EACnCC,MAAM,EACNC,OAAO,EAIR;IACC,MAAMC,YAAY,MAAMF,OAAOG,OAAO,CAAsB;QAC1DC,KAAK,CAAC,4BAA4B,EAAEH,QAAQ,UAAU,CAAC;IACzD;IAEA,MAAMI,mBAAmBH,UAAUI,MAAM,CAAC,CAACC,YAAc,CAACA,UAAUC,QAAQ;IAC5E,IAAIH,iBAAiBI,MAAM,KAAK,GAAG;QACjC,OAAOC;IACT;IAEA,IAAIL,iBAAiBI,MAAM,KAAK,GAAG;QACjC,OAAOX,4BAA4BO,gBAAgB,CAAC,EAAE;IACxD;IAEA,MAAMM,mBAAmB,MAAMd,OAAO;QACpCe,SAASP,iBAAiBQ,GAAG,CAAC,CAACC,WAAc,CAAA;gBAACC,MAAMD,SAASC,IAAI;gBAAEC,OAAOF;YAAQ,CAAA;QAClFG,SAAS;IACX;IAEA,OAAON,mBAAmBb,4BAA4Ba,oBAAoBD;AAC5E"}
+{"version":3,"sources":["../../../../src/actions/auth/login/getSSOProvider.ts"],"sourcesContent":["import {subdebug} from '@sanity/cli-core'\nimport {select} from '@sanity/cli-core/ux'\n\nimport {getSSOProviders} from '../../../services/auth.js'\nimport {type LoginProvider} from '../types.js'\nimport {samlProviderToLoginProvider} from './samlProviderToLoginProvider.js'\n\nconst debug = subdebug('login:getSSOProvider')\n\n/**\n * Get the SSO provider for the given slug\n *\n * @param orgSlug - The slug of the organization to get the SSO provider for\n * @returns Promise that resolves to the SSO provider\n * @internal\n */\nexport async function getSSOProvider(orgSlug: string): Promise<LoginProvider | undefined> {\n  try {\n    const providers = await getSSOProviders(orgSlug)\n\n    const enabledProviders = providers.filter((candidate) => !candidate.disabled)\n    if (enabledProviders.length === 0) {\n      return undefined\n    }\n\n    if (enabledProviders.length === 1) {\n      return samlProviderToLoginProvider(enabledProviders[0])\n    }\n\n    const selectedProvider = await select({\n      choices: enabledProviders.map((provider) => ({name: provider.name, value: provider})),\n      message: 'Select SSO provider',\n    })\n\n    return samlProviderToLoginProvider(selectedProvider)\n  } catch (err) {\n    debug('Error retrieving SSO Providers: %O', err)\n    throw err\n  }\n}\n"],"names":["subdebug","select","getSSOProviders","samlProviderToLoginProvider","debug","getSSOProvider","orgSlug","providers","enabledProviders","filter","candidate","disabled","length","undefined","selectedProvider","choices","map","provider","name","value","message","err"],"mappings":"AAAA,SAAQA,QAAQ,QAAO,mBAAkB;AACzC,SAAQC,MAAM,QAAO,sBAAqB;AAE1C,SAAQC,eAAe,QAAO,4BAA2B;AAEzD,SAAQC,2BAA2B,QAAO,mCAAkC;AAE5E,MAAMC,QAAQJ,SAAS;AAEvB;;;;;;CAMC,GACD,OAAO,eAAeK,eAAeC,OAAe;IAClD,IAAI;QACF,MAAMC,YAAY,MAAML,gBAAgBI;QAExC,MAAME,mBAAmBD,UAAUE,MAAM,CAAC,CAACC,YAAc,CAACA,UAAUC,QAAQ;QAC5E,IAAIH,iBAAiBI,MAAM,KAAK,GAAG;YACjC,OAAOC;QACT;QAEA,IAAIL,iBAAiBI,MAAM,KAAK,GAAG;YACjC,OAAOT,4BAA4BK,gBAAgB,CAAC,EAAE;QACxD;QAEA,MAAMM,mBAAmB,MAAMb,OAAO;YACpCc,SAASP,iBAAiBQ,GAAG,CAAC,CAACC,WAAc,CAAA;oBAACC,MAAMD,SAASC,IAAI;oBAAEC,OAAOF;gBAAQ,CAAA;YAClFG,SAAS;QACX;QAEA,OAAOjB,4BAA4BW;IACrC,EAAE,OAAOO,KAAK;QACZjB,MAAM,sCAAsCiB;QAC5C,MAAMA;IACR;AACF"}

package/dist/actions/auth/login/login.js

@@ -1,11 +1,12 @@
-import { getCliToken, getGlobalCliClient, setConfig } from '@sanity/cli-core';
+import { getCliToken, setCliUserConfig, subdebug } from '@sanity/cli-core';
 import { spinner } from '@sanity/cli-core/ux';
 import open from 'open';
+import { logout } from '../../../services/auth.js';
 import { LoginTrace } from '../../../telemetry/login.telemetry.js';
 import { canLaunchBrowser } from '../../../util/canLaunchBrowser.js';
 import { startServerForTokenCallback } from '../authServer.js';
 import { getProvider } from './getProvider.js';
-const LOGIN_API_VERSION = '2024-02-01';
+const debug = subdebug('login');
 /**
  * Trigger the authentication flow for the CLI.
  *
@@ -21,15 +22,7 @@ const LOGIN_API_VERSION = '2024-02-01';
     const hasExistingToken = Boolean(previousToken);
     const trace = telemetry.trace(LoginTrace);
     trace.start();
-    // We explicitly want to use an unauthenticated client here, even if we already logged in
-    const globalClient = await getGlobalCliClient({
-        apiVersion: LOGIN_API_VERSION
-    });
-    const client = globalClient.withConfig({
-        token: undefined
-    });
     const provider = await getProvider({
-        client,
         experimental: options.experimental,
         orgSlug: options.sso,
         specifiedProvider: options.provider
@@ -41,19 +34,10 @@ const LOGIN_API_VERSION = '2024-02-01';
     if (provider === undefined) {
         throw new Error('No authentication providers found');
     }
-    const { loginUrl, server, token: tokenPromise } = await startServerForTokenCallback({
-        client,
-        providerUrl: provider.url
-    });
+    const { loginUrl, server, token: tokenPromise } = await startServerForTokenCallback(provider.url);
     trace.log({
         step: 'waitForToken'
     });
-    const serverUrl = server.address();
-    if (!serverUrl || typeof serverUrl === 'string') {
-        // Note: `serverUrl` is string only when binding to unix sockets,
-        // thus we can safely assume Something Is Wrong™ if it's a string
-        throw new Error('Failed to start auth callback server');
-    }
     // Open a browser on the login page (or tell the user to)
     const shouldLaunchBrowser = canLaunchBrowser() && options.open !== false;
     const actionText = shouldLaunchBrowser ? 'Opening browser at' : 'Please open a browser at';
@@ -70,25 +54,20 @@ const LOGIN_API_VERSION = '2024-02-01';
     } catch (err) {
         spin.stop();
         trace.error(err);
-        throw err instanceof Error ? new Error(`Login failed: ${err.message}`, {
-            cause: err
-        }) : new Error(`${err}`);
+        debug('Error retrieving token: %O', err);
+        throw err;
     } finally{
-        server.close();
-        server.unref();
+        await new Promise((resolve)=>{
+            server.close(()=>resolve());
+        });
     }
     // Store the token
-    await setConfig('authToken', authToken);
+    await setCliUserConfig('authToken', authToken);
     // Clear cached telemetry consent
-    await setConfig('telemetryConsent', undefined);
+    await setCliUserConfig('telemetryConsent', undefined);
     // If we had a session previously, attempt to clear it
     if (hasExistingToken) {
-        await globalClient.withConfig({
-            token: previousToken
-        }).request({
-            method: 'POST',
-            uri: '/auth/logout'
-        }).catch((err)=>{
+        await logout(previousToken).catch((err)=>{
             const statusCode = err && err.response && err.response.statusCode;
             if (statusCode !== 401) {
                 output.warn('Failed to invalidate previous session');

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../../src/actions/auth/login/login.ts"],"sourcesContent":["import {\n  type CLITelemetryStore,\n  getCliToken,\n  getGlobalCliClient,\n  type Output,\n  setConfig,\n} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\nimport open from 'open'\n\nimport {LoginTrace} from '../../../telemetry/login.telemetry.js'\nimport {canLaunchBrowser} from '../../../util/canLaunchBrowser.js'\nimport {startServerForTokenCallback} from '../authServer.js'\nimport {getProvider} from './getProvider.js'\n\nconst LOGIN_API_VERSION = '2024-02-01'\n\ninterface LoginOptions {\n  output: Output\n\n  telemetry: CLITelemetryStore\n\n  experimental?: boolean\n  open?: boolean\n  provider?: string\n  sso?: string\n}\n\n/**\n * Trigger the authentication flow for the CLI.\n *\n * NOTE: This uses terminal prompts and will not work for non-interactive/programmatic uses.\n *\n * @param options - Options for the login operation\n * @returns Promise that resolves when the login operation is complete\n * @throws Will throw if login fails or is cancelled\n * @internal\n */\nexport async function login(options: LoginOptions) {\n  const {output, telemetry} = options\n  const previousToken = await getCliToken()\n  const hasExistingToken = Boolean(previousToken)\n\n  const trace = telemetry.trace(LoginTrace)\n  trace.start()\n\n  // We explicitly want to use an unauthenticated client here, even if we already logged in\n  const globalClient = await getGlobalCliClient({apiVersion: LOGIN_API_VERSION})\n  const client = globalClient.withConfig({token: undefined})\n\n  const provider = await getProvider({\n    client,\n    experimental: options.experimental,\n    orgSlug: options.sso,\n    specifiedProvider: options.provider,\n  })\n\n  trace.log({provider: provider?.name, step: 'selectProvider'})\n\n  if (provider === undefined) {\n    throw new Error('No authentication providers found')\n  }\n\n  const {\n    loginUrl,\n    server,\n    token: tokenPromise,\n  } = await startServerForTokenCallback({client, providerUrl: provider.url})\n\n  trace.log({step: 'waitForToken'})\n\n  const serverUrl = server.address()\n  if (!serverUrl || typeof serverUrl === 'string') {\n    // Note: `serverUrl` is string only when binding to unix sockets,\n    // thus we can safely assume Something Is Wrong™ if it's a string\n    throw new Error('Failed to start auth callback server')\n  }\n\n  // Open a browser on the login page (or tell the user to)\n  const shouldLaunchBrowser = canLaunchBrowser() && options.open !== false\n  const actionText = shouldLaunchBrowser ? 'Opening browser at' : 'Please open a browser at'\n\n  output.log(`\\n${actionText} ${loginUrl.href}\\n`)\n\n  const spin = spinner('Waiting for browser login to complete... Press Ctrl + C to cancel').start()\n\n  if (shouldLaunchBrowser) {\n    open(loginUrl.href)\n  }\n\n  // Wait for a success/error on the HTTP callback server\n  let authToken: string\n  try {\n    authToken = (await tokenPromise).token\n    spin.stop()\n  } catch (err: unknown) {\n    spin.stop()\n    trace.error(err as Error)\n    throw err instanceof Error\n      ? new Error(`Login failed: ${err.message}`, {cause: err})\n      : new Error(`${err}`)\n  } finally {\n    server.close()\n    server.unref()\n  }\n\n  // Store the token\n  await setConfig('authToken', authToken)\n\n  // Clear cached telemetry consent\n  await setConfig('telemetryConsent', undefined)\n\n  // If we had a session previously, attempt to clear it\n  if (hasExistingToken) {\n    await globalClient\n      .withConfig({token: previousToken})\n      .request({method: 'POST', uri: '/auth/logout'})\n      .catch((err) => {\n        const statusCode = err && err.response && err.response.statusCode\n        if (statusCode !== 401) {\n          output.warn('Failed to invalidate previous session')\n        }\n      })\n  }\n\n  trace.complete()\n}\n"],"names":["getCliToken","getGlobalCliClient","setConfig","spinner","open","LoginTrace","canLaunchBrowser","startServerForTokenCallback","getProvider","LOGIN_API_VERSION","login","options","output","telemetry","previousToken","hasExistingToken","Boolean","trace","start","globalClient","apiVersion","client","withConfig","token","undefined","provider","experimental","orgSlug","sso","specifiedProvider","log","name","step","Error","loginUrl","server","tokenPromise","providerUrl","url","serverUrl","address","shouldLaunchBrowser","actionText","href","spin","authToken","stop","err","error","message","cause","close","unref","request","method","uri","catch","statusCode","response","warn","complete"],"mappings":"AAAA,SAEEA,WAAW,EACXC,kBAAkB,EAElBC,SAAS,QACJ,mBAAkB;AACzB,SAAQC,OAAO,QAAO,sBAAqB;AAC3C,OAAOC,UAAU,OAAM;AAEvB,SAAQC,UAAU,QAAO,wCAAuC;AAChE,SAAQC,gBAAgB,QAAO,oCAAmC;AAClE,SAAQC,2BAA2B,QAAO,mBAAkB;AAC5D,SAAQC,WAAW,QAAO,mBAAkB;AAE5C,MAAMC,oBAAoB;AAa1B;;;;;;;;;CASC,GACD,OAAO,eAAeC,MAAMC,OAAqB;IAC/C,MAAM,EAACC,MAAM,EAAEC,SAAS,EAAC,GAAGF;IAC5B,MAAMG,gBAAgB,MAAMd;IAC5B,MAAMe,mBAAmBC,QAAQF;IAEjC,MAAMG,QAAQJ,UAAUI,KAAK,CAACZ;IAC9BY,MAAMC,KAAK;IAEX,yFAAyF;IACzF,MAAMC,eAAe,MAAMlB,mBAAmB;QAACmB,YAAYX;IAAiB;IAC5E,MAAMY,SAASF,aAAaG,UAAU,CAAC;QAACC,OAAOC;IAAS;IAExD,MAAMC,WAAW,MAAMjB,YAAY;QACjCa;QACAK,cAAcf,QAAQe,YAAY;QAClCC,SAAShB,QAAQiB,GAAG;QACpBC,mBAAmBlB,QAAQc,QAAQ;IACrC;IAEAR,MAAMa,GAAG,CAAC;QAACL,UAAUA,UAAUM;QAAMC,MAAM;IAAgB;IAE3D,IAAIP,aAAaD,WAAW;QAC1B,MAAM,IAAIS,MAAM;IAClB;IAEA,MAAM,EACJC,QAAQ,EACRC,MAAM,EACNZ,OAAOa,YAAY,EACpB,GAAG,MAAM7B,4BAA4B;QAACc;QAAQgB,aAAaZ,SAASa,GAAG;IAAA;IAExErB,MAAMa,GAAG,CAAC;QAACE,MAAM;IAAc;IAE/B,MAAMO,YAAYJ,OAAOK,OAAO;IAChC,IAAI,CAACD,aAAa,OAAOA,cAAc,UAAU;QAC/C,iEAAiE;QACjE,iEAAiE;QACjE,MAAM,IAAIN,MAAM;IAClB;IAEA,yDAAyD;IACzD,MAAMQ,sBAAsBnC,sBAAsBK,QAAQP,IAAI,KAAK;IACnE,MAAMsC,aAAaD,sBAAsB,uBAAuB;IAEhE7B,OAAOkB,GAAG,CAAC,CAAC,EAAE,EAAEY,WAAW,CAAC,EAAER,SAASS,IAAI,CAAC,EAAE,CAAC;IAE/C,MAAMC,OAAOzC,QAAQ,qEAAqEe,KAAK;IAE/F,IAAIuB,qBAAqB;QACvBrC,KAAK8B,SAASS,IAAI;IACpB;IAEA,uDAAuD;IACvD,IAAIE;IACJ,IAAI;QACFA,YAAY,AAAC,CAAA,MAAMT,YAAW,EAAGb,KAAK;QACtCqB,KAAKE,IAAI;IACX,EAAE,OAAOC,KAAc;QACrBH,KAAKE,IAAI;QACT7B,MAAM+B,KAAK,CAACD;QACZ,MAAMA,eAAed,QACjB,IAAIA,MAAM,CAAC,cAAc,EAAEc,IAAIE,OAAO,EAAE,EAAE;YAACC,OAAOH;QAAG,KACrD,IAAId,MAAM,GAAGc,KAAK;IACxB,SAAU;QACRZ,OAAOgB,KAAK;QACZhB,OAAOiB,KAAK;IACd;IAEA,kBAAkB;IAClB,MAAMlD,UAAU,aAAa2C;IAE7B,iCAAiC;IACjC,MAAM3C,UAAU,oBAAoBsB;IAEpC,sDAAsD;IACtD,IAAIT,kBAAkB;QACpB,MAAMI,aACHG,UAAU,CAAC;YAACC,OAAOT;QAAa,GAChCuC,OAAO,CAAC;YAACC,QAAQ;YAAQC,KAAK;QAAc,GAC5CC,KAAK,CAAC,CAACT;YACN,MAAMU,aAAaV,OAAOA,IAAIW,QAAQ,IAAIX,IAAIW,QAAQ,CAACD,UAAU;YACjE,IAAIA,eAAe,KAAK;gBACtB7C,OAAO+C,IAAI,CAAC;YACd;QACF;IACJ;IAEA1C,MAAM2C,QAAQ;AAChB"}
+{"version":3,"sources":["../../../../src/actions/auth/login/login.ts"],"sourcesContent":["import {\n  type CLITelemetryStore,\n  getCliToken,\n  type Output,\n  setCliUserConfig,\n  subdebug,\n} from '@sanity/cli-core'\nimport {spinner} from '@sanity/cli-core/ux'\nimport open from 'open'\n\nimport {logout} from '../../../services/auth.js'\nimport {LoginTrace} from '../../../telemetry/login.telemetry.js'\nimport {canLaunchBrowser} from '../../../util/canLaunchBrowser.js'\nimport {startServerForTokenCallback} from '../authServer.js'\nimport {getProvider} from './getProvider.js'\n\nconst debug = subdebug('login')\n\ninterface LoginOptions {\n  output: Output\n\n  telemetry: CLITelemetryStore\n\n  experimental?: boolean\n  open?: boolean\n  provider?: string\n  sso?: string\n}\n\n/**\n * Trigger the authentication flow for the CLI.\n *\n * NOTE: This uses terminal prompts and will not work for non-interactive/programmatic uses.\n *\n * @param options - Options for the login operation\n * @returns Promise that resolves when the login operation is complete\n * @throws Will throw if login fails or is cancelled\n * @internal\n */\nexport async function login(options: LoginOptions) {\n  const {output, telemetry} = options\n  const previousToken = await getCliToken()\n  const hasExistingToken = Boolean(previousToken)\n\n  const trace = telemetry.trace(LoginTrace)\n  trace.start()\n\n  const provider = await getProvider({\n    experimental: options.experimental,\n    orgSlug: options.sso,\n    specifiedProvider: options.provider,\n  })\n\n  trace.log({provider: provider?.name, step: 'selectProvider'})\n\n  if (provider === undefined) {\n    throw new Error('No authentication providers found')\n  }\n\n  const {loginUrl, server, token: tokenPromise} = await startServerForTokenCallback(provider.url)\n\n  trace.log({step: 'waitForToken'})\n\n  // Open a browser on the login page (or tell the user to)\n  const shouldLaunchBrowser = canLaunchBrowser() && options.open !== false\n  const actionText = shouldLaunchBrowser ? 'Opening browser at' : 'Please open a browser at'\n\n  output.log(`\\n${actionText} ${loginUrl.href}\\n`)\n\n  const spin = spinner('Waiting for browser login to complete... Press Ctrl + C to cancel').start()\n\n  if (shouldLaunchBrowser) {\n    open(loginUrl.href)\n  }\n\n  // Wait for a success/error on the HTTP callback server\n  let authToken: string\n  try {\n    authToken = (await tokenPromise).token\n    spin.stop()\n  } catch (err: unknown) {\n    spin.stop()\n    trace.error(err as Error)\n    debug('Error retrieving token: %O', err)\n    throw err\n  } finally {\n    await new Promise<void>((resolve) => {\n      server.close(() => resolve())\n    })\n  }\n\n  // Store the token\n  await setCliUserConfig('authToken', authToken)\n\n  // Clear cached telemetry consent\n  await setCliUserConfig('telemetryConsent', undefined)\n\n  // If we had a session previously, attempt to clear it\n  if (hasExistingToken) {\n    await logout(previousToken).catch((err) => {\n      const statusCode = err && err.response && err.response.statusCode\n      if (statusCode !== 401) {\n        output.warn('Failed to invalidate previous session')\n      }\n    })\n  }\n\n  trace.complete()\n}\n"],"names":["getCliToken","setCliUserConfig","subdebug","spinner","open","logout","LoginTrace","canLaunchBrowser","startServerForTokenCallback","getProvider","debug","login","options","output","telemetry","previousToken","hasExistingToken","Boolean","trace","start","provider","experimental","orgSlug","sso","specifiedProvider","log","name","step","undefined","Error","loginUrl","server","token","tokenPromise","url","shouldLaunchBrowser","actionText","href","spin","authToken","stop","err","error","Promise","resolve","close","catch","statusCode","response","warn","complete"],"mappings":"AAAA,SAEEA,WAAW,EAEXC,gBAAgB,EAChBC,QAAQ,QACH,mBAAkB;AACzB,SAAQC,OAAO,QAAO,sBAAqB;AAC3C,OAAOC,UAAU,OAAM;AAEvB,SAAQC,MAAM,QAAO,4BAA2B;AAChD,SAAQC,UAAU,QAAO,wCAAuC;AAChE,SAAQC,gBAAgB,QAAO,oCAAmC;AAClE,SAAQC,2BAA2B,QAAO,mBAAkB;AAC5D,SAAQC,WAAW,QAAO,mBAAkB;AAE5C,MAAMC,QAAQR,SAAS;AAavB;;;;;;;;;CASC,GACD,OAAO,eAAeS,MAAMC,OAAqB;IAC/C,MAAM,EAACC,MAAM,EAAEC,SAAS,EAAC,GAAGF;IAC5B,MAAMG,gBAAgB,MAAMf;IAC5B,MAAMgB,mBAAmBC,QAAQF;IAEjC,MAAMG,QAAQJ,UAAUI,KAAK,CAACZ;IAC9BY,MAAMC,KAAK;IAEX,MAAMC,WAAW,MAAMX,YAAY;QACjCY,cAAcT,QAAQS,YAAY;QAClCC,SAASV,QAAQW,GAAG;QACpBC,mBAAmBZ,QAAQQ,QAAQ;IACrC;IAEAF,MAAMO,GAAG,CAAC;QAACL,UAAUA,UAAUM;QAAMC,MAAM;IAAgB;IAE3D,IAAIP,aAAaQ,WAAW;QAC1B,MAAM,IAAIC,MAAM;IAClB;IAEA,MAAM,EAACC,QAAQ,EAAEC,MAAM,EAAEC,OAAOC,YAAY,EAAC,GAAG,MAAMzB,4BAA4BY,SAASc,GAAG;IAE9FhB,MAAMO,GAAG,CAAC;QAACE,MAAM;IAAc;IAE/B,yDAAyD;IACzD,MAAMQ,sBAAsB5B,sBAAsBK,QAAQR,IAAI,KAAK;IACnE,MAAMgC,aAAaD,sBAAsB,uBAAuB;IAEhEtB,OAAOY,GAAG,CAAC,CAAC,EAAE,EAAEW,WAAW,CAAC,EAAEN,SAASO,IAAI,CAAC,EAAE,CAAC;IAE/C,MAAMC,OAAOnC,QAAQ,qEAAqEgB,KAAK;IAE/F,IAAIgB,qBAAqB;QACvB/B,KAAK0B,SAASO,IAAI;IACpB;IAEA,uDAAuD;IACvD,IAAIE;IACJ,IAAI;QACFA,YAAY,AAAC,CAAA,MAAMN,YAAW,EAAGD,KAAK;QACtCM,KAAKE,IAAI;IACX,EAAE,OAAOC,KAAc;QACrBH,KAAKE,IAAI;QACTtB,MAAMwB,KAAK,CAACD;QACZ/B,MAAM,8BAA8B+B;QACpC,MAAMA;IACR,SAAU;QACR,MAAM,IAAIE,QAAc,CAACC;YACvBb,OAAOc,KAAK,CAAC,IAAMD;QACrB;IACF;IAEA,kBAAkB;IAClB,MAAM3C,iBAAiB,aAAasC;IAEpC,iCAAiC;IACjC,MAAMtC,iBAAiB,oBAAoB2B;IAE3C,sDAAsD;IACtD,IAAIZ,kBAAkB;QACpB,MAAMX,OAAOU,eAAe+B,KAAK,CAAC,CAACL;YACjC,MAAMM,aAAaN,OAAOA,IAAIO,QAAQ,IAAIP,IAAIO,QAAQ,CAACD,UAAU;YACjE,IAAIA,eAAe,KAAK;gBACtBlC,OAAOoC,IAAI,CAAC;YACd;QACF;IACF;IAEA/B,MAAMgC,QAAQ;AAChB"}

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

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/auth/types.ts"],"sourcesContent":["/**\n * @internal\n */\nexport interface LoginProvider {\n  name: string\n  title: string\n  url: string\n}\n\n/**\n * @internal\n */\nexport interface SamlLoginProvider {\n  callbackUrl: string\n  disabled: boolean\n  id: string\n  loginUrl: string\n  name: string\n  organizationId: string\n  type: 'saml'\n}\n\n/**\n * @internal\n */\nexport interface ProvidersResponse {\n  providers: LoginProvider[]\n}\n"],"names":[],"mappings":"AAAA;;CAEC,GAoBD;;CAEC,GACD,WAEC"}
+{"version":3,"sources":["../../../src/actions/auth/types.ts"],"sourcesContent":["/**\n * @internal\n */\nexport interface LoginProvider {\n  name: string\n  title: string\n  url: string\n}\n\n/**\n * @internal\n */\nexport interface SamlLoginProvider {\n  callbackUrl: string\n  disabled: boolean\n  id: string\n  loginUrl: string\n  name: string\n  organizationId: string\n  type: 'saml'\n}\n\n/**\n * @internal\n */\nexport interface ProvidersResponse {\n  providers: LoginProvider[]\n}\n\n/**\n * @internal\n */\nexport interface TokenDetails {\n  label: string\n  token: string\n}\n"],"names":[],"mappings":"AAAA;;CAEC,GA2BD;;CAEC,GACD,WAGC"}

package/dist/actions/codemods/reactIconsV3.js

@@ -1,4 +1,4 @@
-import semverCompare from 'semver-compare';
+import semver from 'semver';
 import { getLocalPackageVersion } from '../../util/getLocalPackageVersion.js';
 const purpose = 'Transform react-icons v2 imports to v3 form';
 const description = `
@@ -21,7 +21,7 @@ export const reactIconsV3 = {
         if (!dependencyVersion) {
             throw new Error('Could not find react-icons declared as dependency in package.json');
         }
-        if (semverCompare(dependencyVersion, '3.0.0') < 0) {
+        if (semver.compare(dependencyVersion, '3.0.0') < 0) {
             throw new Error('react-icons declared in package.json dependencies is lower than 3.0.0');
         }
     }

package/dist/actions/codemods/reactIconsV3.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/codemods/reactIconsV3.ts"],"sourcesContent":["import semverCompare from 'semver-compare'\n\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {type CodeMod} from './types.js'\n\nconst purpose = 'Transform react-icons v2 imports to v3 form'\nconst description = `\nModifies all found react-icons import and require statements from their v2 form\nto the path structure used in react-icons v3. For instance:\n\nfrom: import {MdPerson} from 'react-icons/lib/md'\n  to: import {MdPerson} from 'react-icons/md'\n\nfrom: import PersonIcon from 'react-icons/lib/md/person'\n  to: import {MdPerson as PersonIcon} from 'react-icons/md'\n`.trim()\n\nexport const reactIconsV3: CodeMod = {\n  description,\n  filename: 'reactIconsV3.js',\n  purpose,\n  verify: async (context) => {\n    const {workDir} = context\n\n    const dependencyVersion = await getLocalPackageVersion('react-icons', workDir)\n    if (!dependencyVersion) {\n      throw new Error('Could not find react-icons declared as dependency in package.json')\n    }\n\n    if (semverCompare(dependencyVersion, '3.0.0') < 0) {\n      throw new Error('react-icons declared in package.json dependencies is lower than 3.0.0')\n    }\n  },\n}\n"],"names":["semverCompare","getLocalPackageVersion","purpose","description","trim","reactIconsV3","filename","verify","context","workDir","dependencyVersion","Error"],"mappings":"AAAA,OAAOA,mBAAmB,iBAAgB;AAE1C,SAAQC,sBAAsB,QAAO,uCAAsC;AAG3E,MAAMC,UAAU;AAChB,MAAMC,cAAc,CAAC;;;;;;;;;AASrB,CAAC,CAACC,IAAI;AAEN,OAAO,MAAMC,eAAwB;IACnCF;IACAG,UAAU;IACVJ;IACAK,QAAQ,OAAOC;QACb,MAAM,EAACC,OAAO,EAAC,GAAGD;QAElB,MAAME,oBAAoB,MAAMT,uBAAuB,eAAeQ;QACtE,IAAI,CAACC,mBAAmB;YACtB,MAAM,IAAIC,MAAM;QAClB;QAEA,IAAIX,cAAcU,mBAAmB,WAAW,GAAG;YACjD,MAAM,IAAIC,MAAM;QAClB;IACF;AACF,EAAC"}
+{"version":3,"sources":["../../../src/actions/codemods/reactIconsV3.ts"],"sourcesContent":["import semver from 'semver'\n\nimport {getLocalPackageVersion} from '../../util/getLocalPackageVersion.js'\nimport {type CodeMod} from './types.js'\n\nconst purpose = 'Transform react-icons v2 imports to v3 form'\nconst description = `\nModifies all found react-icons import and require statements from their v2 form\nto the path structure used in react-icons v3. For instance:\n\nfrom: import {MdPerson} from 'react-icons/lib/md'\n  to: import {MdPerson} from 'react-icons/md'\n\nfrom: import PersonIcon from 'react-icons/lib/md/person'\n  to: import {MdPerson as PersonIcon} from 'react-icons/md'\n`.trim()\n\nexport const reactIconsV3: CodeMod = {\n  description,\n  filename: 'reactIconsV3.js',\n  purpose,\n  verify: async (context) => {\n    const {workDir} = context\n\n    const dependencyVersion = await getLocalPackageVersion('react-icons', workDir)\n    if (!dependencyVersion) {\n      throw new Error('Could not find react-icons declared as dependency in package.json')\n    }\n\n    if (semver.compare(dependencyVersion, '3.0.0') < 0) {\n      throw new Error('react-icons declared in package.json dependencies is lower than 3.0.0')\n    }\n  },\n}\n"],"names":["semver","getLocalPackageVersion","purpose","description","trim","reactIconsV3","filename","verify","context","workDir","dependencyVersion","Error","compare"],"mappings":"AAAA,OAAOA,YAAY,SAAQ;AAE3B,SAAQC,sBAAsB,QAAO,uCAAsC;AAG3E,MAAMC,UAAU;AAChB,MAAMC,cAAc,CAAC;;;;;;;;;AASrB,CAAC,CAACC,IAAI;AAEN,OAAO,MAAMC,eAAwB;IACnCF;IACAG,UAAU;IACVJ;IACAK,QAAQ,OAAOC;QACb,MAAM,EAACC,OAAO,EAAC,GAAGD;QAElB,MAAME,oBAAoB,MAAMT,uBAAuB,eAAeQ;QACtE,IAAI,CAACC,mBAAmB;YACtB,MAAM,IAAIC,MAAM;QAClB;QAEA,IAAIX,OAAOY,OAAO,CAACF,mBAAmB,WAAW,GAAG;YAClD,MAAM,IAAIC,MAAM;QAClB;IACF;AACF,EAAC"}

package/dist/actions/debug/formatters.js

@@ -0,0 +1,22 @@
+import { inspect } from 'node:util';
+import { ux } from '@oclif/core';
+export function formatObject(obj) {
+    return inspect(obj, {
+        colors: true,
+        depth: +Infinity
+    });
+}
+export function printKeyValue(obj) {
+    let printedLines = 0;
+    for (const key of Object.keys(obj)){
+        if (obj[key] !== undefined) {
+            ux.stdout(`  ${key}: ${formatObject(obj[key])}`);
+            printedLines++;
+        }
+    }
+    if (printedLines > 0) {
+        ux.stdout('');
+    }
+}
+
+//# sourceMappingURL=formatters.js.map

package/dist/actions/debug/formatters.js.map

@@ -0,0 +1 @@
+{"version":3,"sources":["../../../src/actions/debug/formatters.ts"],"sourcesContent":["import {inspect} from 'node:util'\n\nimport {ux} from '@oclif/core'\n\nexport function formatObject(obj: unknown): string {\n  return inspect(obj, {colors: true, depth: +Infinity})\n}\n\nexport function printKeyValue(obj: Record<string, unknown>): void {\n  let printedLines = 0\n  for (const key of Object.keys(obj)) {\n    if (obj[key] !== undefined) {\n      ux.stdout(`  ${key}: ${formatObject(obj[key])}`)\n      printedLines++\n    }\n  }\n\n  if (printedLines > 0) {\n    ux.stdout('')\n  }\n}\n"],"names":["inspect","ux","formatObject","obj","colors","depth","Infinity","printKeyValue","printedLines","key","Object","keys","undefined","stdout"],"mappings":"AAAA,SAAQA,OAAO,QAAO,YAAW;AAEjC,SAAQC,EAAE,QAAO,cAAa;AAE9B,OAAO,SAASC,aAAaC,GAAY;IACvC,OAAOH,QAAQG,KAAK;QAACC,QAAQ;QAAMC,OAAO,CAACC;IAAQ;AACrD;AAEA,OAAO,SAASC,cAAcJ,GAA4B;IACxD,IAAIK,eAAe;IACnB,KAAK,MAAMC,OAAOC,OAAOC,IAAI,CAACR,KAAM;QAClC,IAAIA,GAAG,CAACM,IAAI,KAAKG,WAAW;YAC1BX,GAAGY,MAAM,CAAC,CAAC,EAAE,EAAEJ,IAAI,EAAE,EAAEP,aAAaC,GAAG,CAACM,IAAI,GAAG;YAC/CD;QACF;IACF;IAEA,IAAIA,eAAe,GAAG;QACpBP,GAAGY,MAAM,CAAC;IACZ;AACF"}

package/dist/actions/dev/getDashboardAppUrl.js

@@ -2,9 +2,9 @@ import { getSanityUrl, subdebug } from '@sanity/cli-core';
 const debug = subdebug('dev:getDashboardAppURL');
 const DEFAULT_TIMEOUT = 5000;
 const getDefaultDashboardURL = ({ organizationId, url })=>{
-    return `${getSanityUrl()}/@${organizationId}?${new URLSearchParams({
+    return getSanityUrl(`/@${organizationId}?${new URLSearchParams({
         dev: url
-    }).toString()}`;
+    }).toString()}`);
 };
 /**
  * Gets the dashboard URL from API or uses the default dashboard URL
@@ -18,7 +18,7 @@ const getDefaultDashboardURL = ({ organizationId, url })=>{
             organizationId,
             url
         });
-        const res = await globalThis.fetch(`${getSanityUrl()}/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`, {
+        const res = await globalThis.fetch(getSanityUrl(`/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`), {
             signal: abortController.signal
         });
         if (!res.ok) {

package/dist/actions/dev/getDashboardAppUrl.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../../src/actions/dev/getDashboardAppUrl.ts"],"sourcesContent":["import {getSanityUrl, subdebug} from '@sanity/cli-core'\n\nconst debug = subdebug('dev:getDashboardAppURL')\n\nconst DEFAULT_TIMEOUT = 5000\n\nconst getDefaultDashboardURL = ({\n  organizationId,\n  url,\n}: {\n  organizationId: string\n  url: string\n}): string => {\n  return `${getSanityUrl()}/@${organizationId}?${new URLSearchParams({\n    dev: url,\n  }).toString()}`\n}\n\n/**\n * Gets the dashboard URL from API or uses the default dashboard URL\n */\nexport const getDashboardAppURL = async ({\n  httpHost = 'localhost',\n  httpPort = 3333,\n  organizationId,\n}: {\n  httpHost?: string\n  httpPort?: number\n  organizationId: string\n}): Promise<string> => {\n  const url = `http://${httpHost}:${httpPort}`\n\n  const abortController = new AbortController()\n  // Wait for 5 seconds before aborting the request\n  const timer = setTimeout(() => abortController.abort(), DEFAULT_TIMEOUT)\n  try {\n    const queryParams = new URLSearchParams({\n      organizationId,\n      url,\n    })\n\n    const res = await globalThis.fetch(\n      `${getSanityUrl()}/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`,\n      {\n        signal: abortController.signal,\n      },\n    )\n\n    if (!res.ok) {\n      debug(`Failed to fetch dashboard URL: ${res.statusText}`)\n      return getDefaultDashboardURL({organizationId, url})\n    }\n\n    const body = await res.json()\n    // <dashboard-app-url>/<orgniazationId>?dev=<dev-server-url>\n    return body?.url ?? getDefaultDashboardURL({organizationId, url})\n  } catch (err) {\n    debug(`Failed to fetch dashboard URL: ${err instanceof Error ? err.message : String(err)}`)\n    return getDefaultDashboardURL({organizationId, url})\n  } finally {\n    clearTimeout(timer)\n  }\n}\n"],"names":["getSanityUrl","subdebug","debug","DEFAULT_TIMEOUT","getDefaultDashboardURL","organizationId","url","URLSearchParams","dev","toString","getDashboardAppURL","httpHost","httpPort","abortController","AbortController","timer","setTimeout","abort","queryParams","res","globalThis","fetch","signal","ok","statusText","body","json","err","Error","message","String","clearTimeout"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,QAAQ,QAAO,mBAAkB;AAEvD,MAAMC,QAAQD,SAAS;AAEvB,MAAME,kBAAkB;AAExB,MAAMC,yBAAyB,CAAC,EAC9BC,cAAc,EACdC,GAAG,EAIJ;IACC,OAAO,GAAGN,eAAe,EAAE,EAAEK,eAAe,CAAC,EAAE,IAAIE,gBAAgB;QACjEC,KAAKF;IACP,GAAGG,QAAQ,IAAI;AACjB;AAEA;;CAEC,GACD,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,WAAW,WAAW,EACtBC,WAAW,IAAI,EACfP,cAAc,EAKf;IACC,MAAMC,MAAM,CAAC,OAAO,EAAEK,SAAS,CAAC,EAAEC,UAAU;IAE5C,MAAMC,kBAAkB,IAAIC;IAC5B,iDAAiD;IACjD,MAAMC,QAAQC,WAAW,IAAMH,gBAAgBI,KAAK,IAAId;IACxD,IAAI;QACF,MAAMe,cAAc,IAAIX,gBAAgB;YACtCF;YACAC;QACF;QAEA,MAAMa,MAAM,MAAMC,WAAWC,KAAK,CAChC,GAAGrB,eAAe,4CAA4C,EAAEkB,YAAYT,QAAQ,IAAI,EACxF;YACEa,QAAQT,gBAAgBS,MAAM;QAChC;QAGF,IAAI,CAACH,IAAII,EAAE,EAAE;YACXrB,MAAM,CAAC,+BAA+B,EAAEiB,IAAIK,UAAU,EAAE;YACxD,OAAOpB,uBAAuB;gBAACC;gBAAgBC;YAAG;QACpD;QAEA,MAAMmB,OAAO,MAAMN,IAAIO,IAAI;QAC3B,4DAA4D;QAC5D,OAAOD,MAAMnB,OAAOF,uBAAuB;YAACC;YAAgBC;QAAG;IACjE,EAAE,OAAOqB,KAAK;QACZzB,MAAM,CAAC,+BAA+B,EAAEyB,eAAeC,QAAQD,IAAIE,OAAO,GAAGC,OAAOH,MAAM;QAC1F,OAAOvB,uBAAuB;YAACC;YAAgBC;QAAG;IACpD,SAAU;QACRyB,aAAahB;IACf;AACF,EAAC"}
+{"version":3,"sources":["../../../src/actions/dev/getDashboardAppUrl.ts"],"sourcesContent":["import {getSanityUrl, subdebug} from '@sanity/cli-core'\n\nconst debug = subdebug('dev:getDashboardAppURL')\n\nconst DEFAULT_TIMEOUT = 5000\n\nconst getDefaultDashboardURL = ({\n  organizationId,\n  url,\n}: {\n  organizationId: string\n  url: string\n}): string => {\n  return getSanityUrl(\n    `/@${organizationId}?${new URLSearchParams({\n      dev: url,\n    }).toString()}`,\n  )\n}\n\n/**\n * Gets the dashboard URL from API or uses the default dashboard URL\n */\nexport const getDashboardAppURL = async ({\n  httpHost = 'localhost',\n  httpPort = 3333,\n  organizationId,\n}: {\n  httpHost?: string\n  httpPort?: number\n  organizationId: string\n}): Promise<string> => {\n  const url = `http://${httpHost}:${httpPort}`\n\n  const abortController = new AbortController()\n  // Wait for 5 seconds before aborting the request\n  const timer = setTimeout(() => abortController.abort(), DEFAULT_TIMEOUT)\n  try {\n    const queryParams = new URLSearchParams({\n      organizationId,\n      url,\n    })\n\n    const res = await globalThis.fetch(\n      getSanityUrl(`/api/dashboard/mode/development/resolve-url?${queryParams.toString()}`),\n      {\n        signal: abortController.signal,\n      },\n    )\n\n    if (!res.ok) {\n      debug(`Failed to fetch dashboard URL: ${res.statusText}`)\n      return getDefaultDashboardURL({organizationId, url})\n    }\n\n    const body = await res.json()\n    // <dashboard-app-url>/<orgniazationId>?dev=<dev-server-url>\n    return body?.url ?? getDefaultDashboardURL({organizationId, url})\n  } catch (err) {\n    debug(`Failed to fetch dashboard URL: ${err instanceof Error ? err.message : String(err)}`)\n    return getDefaultDashboardURL({organizationId, url})\n  } finally {\n    clearTimeout(timer)\n  }\n}\n"],"names":["getSanityUrl","subdebug","debug","DEFAULT_TIMEOUT","getDefaultDashboardURL","organizationId","url","URLSearchParams","dev","toString","getDashboardAppURL","httpHost","httpPort","abortController","AbortController","timer","setTimeout","abort","queryParams","res","globalThis","fetch","signal","ok","statusText","body","json","err","Error","message","String","clearTimeout"],"mappings":"AAAA,SAAQA,YAAY,EAAEC,QAAQ,QAAO,mBAAkB;AAEvD,MAAMC,QAAQD,SAAS;AAEvB,MAAME,kBAAkB;AAExB,MAAMC,yBAAyB,CAAC,EAC9BC,cAAc,EACdC,GAAG,EAIJ;IACC,OAAON,aACL,CAAC,EAAE,EAAEK,eAAe,CAAC,EAAE,IAAIE,gBAAgB;QACzCC,KAAKF;IACP,GAAGG,QAAQ,IAAI;AAEnB;AAEA;;CAEC,GACD,OAAO,MAAMC,qBAAqB,OAAO,EACvCC,WAAW,WAAW,EACtBC,WAAW,IAAI,EACfP,cAAc,EAKf;IACC,MAAMC,MAAM,CAAC,OAAO,EAAEK,SAAS,CAAC,EAAEC,UAAU;IAE5C,MAAMC,kBAAkB,IAAIC;IAC5B,iDAAiD;IACjD,MAAMC,QAAQC,WAAW,IAAMH,gBAAgBI,KAAK,IAAId;IACxD,IAAI;QACF,MAAMe,cAAc,IAAIX,gBAAgB;YACtCF;YACAC;QACF;QAEA,MAAMa,MAAM,MAAMC,WAAWC,KAAK,CAChCrB,aAAa,CAAC,4CAA4C,EAAEkB,YAAYT,QAAQ,IAAI,GACpF;YACEa,QAAQT,gBAAgBS,MAAM;QAChC;QAGF,IAAI,CAACH,IAAII,EAAE,EAAE;YACXrB,MAAM,CAAC,+BAA+B,EAAEiB,IAAIK,UAAU,EAAE;YACxD,OAAOpB,uBAAuB;gBAACC;gBAAgBC;YAAG;QACpD;QAEA,MAAMmB,OAAO,MAAMN,IAAIO,IAAI;QAC3B,4DAA4D;QAC5D,OAAOD,MAAMnB,OAAOF,uBAAuB;YAACC;YAAgBC;QAAG;IACjE,EAAE,OAAOqB,KAAK;QACZzB,MAAM,CAAC,+BAA+B,EAAEyB,eAAeC,QAAQD,IAAIE,OAAO,GAAGC,OAAOH,MAAM;QAC1F,OAAOvB,uBAAuB;YAACC;YAAgBC;QAAG;IACpD,SAAU;QACRyB,aAAahB;IACf;AACF,EAAC"}

package/dist/actions/documents/validateDocuments.worker.js

@@ -4,7 +4,7 @@ import path from 'node:path';
 import readline from 'node:readline';
 import { Readable } from 'node:stream';
 import { workerData as _workerData, isMainThread, parentPort } from 'node:worker_threads';
-import { getStudioWorkspaces, isRecord, resolveLocalPackage } from '@sanity/cli-core';
+import { getStudioWorkspaces, resolveLocalPackage } from '@sanity/cli-core';
 import { createClient } from '@sanity/client';
 import { WorkerChannelReporter } from '@sanity/worker-channels';
 import pMap from 'p-map';
@@ -215,7 +215,7 @@ async function main() {
                     return markerValue <= flagLevelValue;
                 });
             } catch (err) {
-                const errorMessage = isRecord(err) && typeof err.message === 'string' ? err.message : 'Unknown error';
+                const errorMessage = err instanceof Error ? err.message : 'Unknown error';
                 const message = `Exception occurred while validating value: ${errorMessage}`;
                 markers = [
                     {