@mintlify/cli 4.0.1098 → 4.0.1100

package/bin/cli.js

@@ -27,9 +27,9 @@ import { getAccessToken } from './keyring.js';
 import { login } from './login.js';
 import { logout } from './logout.js';
 import { mdxLinter } from './mdxLinter.js';
+import { createTelemetryMiddleware } from './middlewares/telemetryMiddleware.js';
 import { checkOpenApiFile, getOpenApiFilenamesFromDocsConfig } from './openApiCheck.js';
-import { status, getCliSubdomain } from './status.js';
-import { createTelemetryMiddleware } from './telemetry/middleware.js';
+import { status, getCliSubdomains } from './status.js';
 import { trackTelemetryPreferenceChange } from './telemetry/track.js';
 import { update } from './update.js';
 import { addWorkflow } from './workflow.js';
@@ -89,7 +89,7 @@ export const cli = ({ packageName = 'mint' }) => {
         .usage('usage: mintlify dev [options]')
         .example('mintlify dev', 'run with default settings (opens in browser)')
         .example('mintlify dev --no-open', 'run without opening in browser'), (argv) => __awaiter(void 0, void 0, void 0, function* () {
-        var _a, _b;
+        var _a;
         yield autoUpgradeIfNeeded();
         const port = yield checkPort(argv);
         const { cli: cliVersion } = getVersions();
@@ -99,9 +99,9 @@ export const cli = ({ packageName = 'mint' }) => {
             accessToken = (_a = (yield getAccessToken())) !== null && _a !== void 0 ? _a : undefined;
             const configuredSubdomain = getConfigValue('subdomain');
             subdomain =
-                configuredSubdomain !== null && configuredSubdomain !== void 0 ? configuredSubdomain : (accessToken ? (_b = (yield getCliSubdomain(accessToken))) !== null && _b !== void 0 ? _b : undefined : undefined);
+                configuredSubdomain !== null && configuredSubdomain !== void 0 ? configuredSubdomain : (accessToken ? (yield getCliSubdomains(accessToken))[0] : undefined);
         }
-        catch (_c) { }
+        catch (_b) { }
         if (port != undefined) {
             yield dev(Object.assign(Object.assign({}, argv), { port,
                 packageName,

package/bin/keyring.js

@@ -38,6 +38,12 @@ export function getAccessToken() {
         return keytar.getPassword(SERVICE, ACCESS_TOKEN_ACCOUNT);
     });
 }
+export function getRefreshToken() {
+    return __awaiter(this, void 0, void 0, function* () {
+        const keytar = yield getKeytar();
+        return keytar.getPassword(SERVICE, REFRESH_TOKEN_ACCOUNT);
+    });
+}
 export function clearCredentials() {
     return __awaiter(this, void 0, void 0, function* () {
         const keytar = yield getKeytar();

package/bin/login.js

@@ -8,15 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { input } from '@inquirer/prompts';
-import { addLog, ErrorLog, SuccessLog } from '@mintlify/previewing';
+import { input, search } from '@inquirer/prompts';
+import { addLog, ErrorLog, InfoLog, SuccessLog } from '@mintlify/previewing';
 import chalk from 'chalk';
 import { Box, Text } from 'ink';
 import open from 'open';
 import { calculatePKCECodeChallenge, randomNonce, randomPKCECodeVerifier, randomState, } from 'openid-client';
 import { startCallbackServer } from './callbackServer.js';
+import { setConfigValue } from './config.js';
 import { DASHBOARD_URL, STYTCH_CLIENT_ID, TOKEN_ENDPOINT } from './constants.js';
 import { storeCredentials } from './keyring.js';
+import { getCliSubdomains } from './status.js';
 import { trackLoginAttempt, trackLoginFailed, trackLoginSuccess } from './telemetry/track.js';
 export function login() {
     return __awaiter(this, void 0, void 0, function* () {
@@ -80,5 +82,43 @@ export function login() {
         yield storeCredentials(token.access_token, token.refresh_token);
         void trackLoginSuccess();
         addLog(_jsx(SuccessLog, { message: "logged in successfully" }));
+        yield promptSubdomainSelection(token.access_token);
+    });
+}
+function isPromptCancellationError(error) {
+    return error instanceof Error && error.name === 'ExitPromptError';
+}
+function promptSubdomainSelection(accessToken) {
+    return __awaiter(this, void 0, void 0, function* () {
+        const subdomains = yield getCliSubdomains(accessToken);
+        if (subdomains.length === 0)
+            return;
+        if (subdomains.length === 1) {
+            yield setConfigValue('subdomain', subdomains[0]);
+            addLog(_jsx(InfoLog, { message: `default project set to ${subdomains[0]}` }));
+            return;
+        }
+        yield new Promise((resolve) => setTimeout(resolve, 50));
+        let chosen;
+        try {
+            chosen = yield search({
+                message: 'Select a default project',
+                source: (term) => {
+                    const results = term
+                        ? subdomains.filter((s) => s.toLowerCase().includes(term.toLowerCase()))
+                        : subdomains;
+                    return results.map((s) => ({ name: s, value: s }));
+                },
+            });
+        }
+        catch (error) {
+            if (isPromptCancellationError(error)) {
+                addLog(_jsx(InfoLog, { message: `No project set. To set a default project, run ${chalk.bold('mintlify config set subdomain <subdomain>')}` }));
+                return;
+            }
+            throw error;
+        }
+        yield setConfigValue('subdomain', chosen);
+        addLog(_jsx(InfoLog, { message: `default project set to ${chosen}` }));
     });
 }

package/bin/middlewares/subdomainMiddleware.js

@@ -0,0 +1,28 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { getConfigValue } from '../config.js';
+import { getAccessToken } from '../keyring.js';
+import { getCliSubdomains } from '../status.js';
+export function subdomainMiddleware(argv) {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (argv.subdomain)
+            return;
+        const fromConfig = getConfigValue('subdomain');
+        if (fromConfig) {
+            argv.subdomain = fromConfig;
+            return;
+        }
+        const accessToken = yield getAccessToken();
+        if (!accessToken)
+            return;
+        const subdomains = yield getCliSubdomains(accessToken);
+        argv.subdomain = subdomains[0];
+    });
+}

package/bin/{telemetry/middleware.js → middlewares/telemetryMiddleware.js}

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 };
 import { getConfigValue } from '../config.js';
 import { getVersions } from '../helpers.js';
-import { trackCommand } from './track.js';
+import { trackCommand } from '../telemetry/track.js';
 const SCRAPE_SUBCOMMANDS = new Set(['page', 'site', 'openapi']);
 export function getSanitizedCommandForTelemetry(_) {
     const parts = _.filter((p) => typeof p === 'string');

package/bin/status.js

@@ -11,6 +11,7 @@ import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { addLog, ErrorLog } from '@mintlify/previewing';
 import { Box, Text } from 'ink';
 import { z } from 'zod';
+import { authenticatedFetch } from './authenticatedFetch.js';
 import { getConfigValue } from './config.js';
 import { API_URL } from './constants.js';
 import { getCliVersion } from './helpers.js';
@@ -18,23 +19,22 @@ import { getAccessToken } from './keyring.js';
 const StatusResponseSchema = z.object({
     user: z.object({ email: z.string() }),
     org: z.object({ name: z.string() }),
-    subdomain: z.string().nullable().optional(),
+    subdomains: z.array(z.string()).default([]),
 });
-export function getCliSubdomain(accessToken) {
+export function getCliSubdomains(accessToken) {
     return __awaiter(this, void 0, void 0, function* () {
-        var _a;
         try {
             const res = yield fetch(`${API_URL}/api/cli/status`, {
                 headers: { Authorization: `Bearer ${accessToken}` },
             });
             if (!res.ok)
-                return null;
+                return [];
             const json = yield res.json().catch(() => null);
             const parsed = StatusResponseSchema.safeParse(json);
-            return parsed.success ? (_a = parsed.data.subdomain) !== null && _a !== void 0 ? _a : null : null;
+            return parsed.success ? parsed.data.subdomains : [];
         }
-        catch (_b) {
-            return null;
+        catch (_a) {
+            return [];
         }
     });
 }
@@ -47,9 +47,7 @@ export function status() {
             return;
         }
         try {
-            const res = yield fetch(`${API_URL}/api/cli/status`, {
-                headers: { Authorization: `Bearer ${accessToken}` },
-            });
+            const res = yield authenticatedFetch(`${API_URL}/api/cli/status`);
             if (!res.ok) {
                 addLog(_jsx(ErrorLog, { message: "not logged in. Run `mint login` to authenticate." }));
                 return;
@@ -60,9 +58,9 @@ export function status() {
                 addLog(_jsx(ErrorLog, { message: "unexpected response from server. please try again." }));
                 return;
             }
-            const { user, org, subdomain: apiSubdomain } = parsed.data;
+            const { user, org, subdomains } = parsed.data;
             const version = getCliVersion();
-            const subdomain = (_b = (_a = getConfigValue('subdomain')) !== null && _a !== void 0 ? _a : apiSubdomain) !== null && _b !== void 0 ? _b : null;
+            const subdomain = (_b = (_a = getConfigValue('subdomain')) !== null && _a !== void 0 ? _a : subdomains[0]) !== null && _b !== void 0 ? _b : null;
             addLog(_jsxs(Box, { flexDirection: "column", paddingY: 1, children: [version && (_jsxs(Box, { children: [_jsx(Box, { minWidth: 16, children: _jsx(Text, { dimColor: true, children: "Version" }) }), _jsx(Text, { children: version })] })), _jsxs(Box, { children: [_jsx(Box, { minWidth: 16, children: _jsx(Text, { dimColor: true, children: "Email" }) }), _jsx(Text, { children: user.email })] }), _jsxs(Box, { children: [_jsx(Box, { minWidth: 16, children: _jsx(Text, { dimColor: true, children: "Organization" }) }), _jsx(Text, { children: org.name })] }), subdomain && (_jsxs(Box, { children: [_jsx(Box, { minWidth: 16, children: _jsx(Text, { dimColor: true, children: "Subdomain" }) }), _jsx(Text, { children: subdomain })] }))] }));
         }
         catch (e) {

package/bin/tokenRefresh.js

@@ -0,0 +1,50 @@
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+import { STYTCH_CLIENT_ID, TOKEN_ENDPOINT } from './constants.js';
+import { getRefreshToken, storeCredentials } from './keyring.js';
+let inflightRefresh = null;
+export function refreshAccessToken() {
+    return __awaiter(this, void 0, void 0, function* () {
+        if (inflightRefresh)
+            return inflightRefresh;
+        inflightRefresh = doRefresh().finally(() => {
+            inflightRefresh = null;
+        });
+        return inflightRefresh;
+    });
+}
+function doRefresh() {
+    return __awaiter(this, void 0, void 0, function* () {
+        try {
+            const refreshToken = yield getRefreshToken();
+            if (!refreshToken)
+                return null;
+            const res = yield fetch(TOKEN_ENDPOINT, {
+                method: 'POST',
+                headers: { 'Content-Type': 'application/json' },
+                body: JSON.stringify({
+                    client_id: STYTCH_CLIENT_ID,
+                    grant_type: 'refresh_token',
+                    refresh_token: refreshToken,
+                }),
+            });
+            if (!res.ok)
+                return null;
+            const body = (yield res.json().catch(() => null));
+            if (!(body === null || body === void 0 ? void 0 : body.access_token) || !body.refresh_token)
+                return null;
+            yield storeCredentials(body.access_token, body.refresh_token);
+            return body.access_token;
+        }
+        catch (_a) {
+            return null;
+        }
+    });
+}