sitevision-cli 1.0.0-beta.11 → 1.0.0-beta.12

package/dist/components/DevPropertiesForm.js

@@ -1,10 +1,10 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
-import { useState } from 'react';
+import { useState, useEffect } from 'react';
 import { Box, Text, useInput } from 'ink';
 import { TextInput } from './TextInput.js';
 import { writeDevProperties } from '../utils/project-detection.js';
 import { setDeployPassword, deleteDeployPassword, setOAuth2ClientSecret, } from '../utils/keychain.js';
-import { DEFAULT_REDIRECT_PORT } from '../utils/oauth2-auth.js';
+import { DEFAULT_REDIRECT_PORT, discoverOAuth2Config, } from '../utils/oauth2-auth.js';
 const LABELS = {
     domain: 'Domain',
     siteName: 'Site Name',
@@ -50,8 +50,39 @@ export function DevPropertiesForm({ projectRoot, initialProperties, packageJson,
         scopes: initialProperties?.oauth2?.scopes?.join(' ') ?? '',
         clientSecret: '',
     }));
+    const [discoveryNote, setDiscoveryNote] = useState('');
     const method = properties.authMethod ?? 'basic';
     const isOAuth = method === 'oauth2';
+    // When OAuth2 is chosen, auto-fill the endpoints from the site's OpenID
+    // configuration (unauthenticated) so the user doesn't type them in.
+    useEffect(() => {
+        if (method !== 'oauth2' || !properties.domain)
+            return;
+        if (oauth.authorizationEndpoint && oauth.tokenEndpoint)
+            return;
+        let cancelled = false;
+        setDiscoveryNote('Looking up OAuth2 endpoints…');
+        void discoverOAuth2Config(properties.domain, properties.useHTTPForDevDeploy).then(discovered => {
+            if (cancelled)
+                return;
+            if (discovered) {
+                setOauth(previous => ({
+                    ...previous,
+                    authorizationEndpoint: previous.authorizationEndpoint || discovered.authorizationEndpoint,
+                    tokenEndpoint: previous.tokenEndpoint || discovered.tokenEndpoint,
+                    scopes: previous.scopes || (discovered.scopesSupported?.join(' ') ?? ''),
+                }));
+                setDiscoveryNote('Endpoints auto-filled from the site OpenID config.');
+            }
+            else {
+                setDiscoveryNote('Could not auto-discover endpoints — enter them below.');
+            }
+        });
+        return () => {
+            cancelled = true;
+        };
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [method, properties.domain]);
     const methodSteps = method === 'oauth2'
         ? [
             'oauthClientId',
@@ -177,7 +208,7 @@ export function DevPropertiesForm({ projectRoot, initialProperties, packageJson,
                 return null;
         }
     };
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Setup Development Properties" }), _jsxs(Text, { children: [' ', "Step ", stepIndex + 1, " of ", steps.length, ":", ' ', currentStep ? LABELS[currentStep] : ''] })] }), isOAuth && (_jsx(Box, { marginBottom: 1, children: _jsxs(Text, { dimColor: true, children: ["Whitelist this redirect URI on the OAuth2 client: http://127.0.0.1:", redirectPort, "/callback"] }) })), _jsx(Box, { marginBottom: 1, children: steps.map((s, i) => (_jsx(Box, { marginRight: 1, children: _jsx(Text, { color: i <= stepIndex ? 'green' : 'gray', children: i < stepIndex ? '✓' : i === stepIndex ? '●' : '○' }) }, s))) }), _jsx(Box, { borderStyle: "single", borderColor: "gray", padding: 1, children: renderInput() })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsxs(Box, { marginBottom: 1, children: [_jsx(Text, { bold: true, color: "cyan", children: "Setup Development Properties" }), _jsxs(Text, { children: [' ', "Step ", stepIndex + 1, " of ", steps.length, ":", ' ', currentStep ? LABELS[currentStep] : ''] })] }), isOAuth && (_jsxs(Box, { marginBottom: 1, flexDirection: "column", children: [_jsxs(Text, { dimColor: true, children: ["Whitelist this redirect URI on the OAuth2 client: http://127.0.0.1:", redirectPort, "/callback"] }), discoveryNote && _jsx(Text, { color: "yellow", children: discoveryNote })] })), _jsx(Box, { marginBottom: 1, children: steps.map((s, i) => (_jsx(Box, { marginRight: 1, children: _jsx(Text, { color: i <= stepIndex ? 'green' : 'gray', children: i < stepIndex ? '✓' : i === stepIndex ? '●' : '○' }) }, s))) }), _jsx(Box, { borderStyle: "single", borderColor: "gray", padding: 1, children: renderInput() })] }));
 }
 function MethodSelect({ defaultValue, onSubmit, }) {
     const [index, setIndex] = useState(() => Math.max(0, AUTH_METHODS.findIndex(m => m.value === defaultValue)));

package/dist/utils/oauth2-auth.d.ts

@@ -6,6 +6,18 @@ export declare function createPkcePair(): {
     verifier: string;
     challenge: string;
 };
+export interface DiscoveredOAuth2 {
+    authorizationEndpoint: string;
+    tokenEndpoint: string;
+    scopesSupported?: string[];
+}
+/**
+ * Fetch the site's OpenID configuration (unauthenticated) to auto-fill the
+ * authorization/token endpoints. Returns null if it isn't published (provider
+ * not enabled) or the response isn't a valid config, so callers fall back to
+ * manual entry.
+ */
+export declare function discoverOAuth2Config(domain: string, useHTTP?: boolean): Promise<DiscoveredOAuth2 | null>;
 export declare function openBrowser(url: string): void;
 /**
  * Start an interactive OAuth2 login. Returns the authorize URL to open and a

package/dist/utils/oauth2-auth.js

@@ -44,6 +44,37 @@ async function postToken(config, params, secret) {
         return null;
     }
 }
+/** OpenID configuration path (published at the issuer root once the provider is saved). */
+const DISCOVERY_PATH = '/.well-known/openid-configuration';
+/**
+ * Fetch the site's OpenID configuration (unauthenticated) to auto-fill the
+ * authorization/token endpoints. Returns null if it isn't published (provider
+ * not enabled) or the response isn't a valid config, so callers fall back to
+ * manual entry.
+ */
+export async function discoverOAuth2Config(domain, useHTTP = false) {
+    if (!domain)
+        return null;
+    const protocol = useHTTP ? 'http' : 'https';
+    try {
+        const response = await makeRequest(`${protocol}://${domain}${DISCOVERY_PATH}`, { method: 'GET' });
+        if (response.statusCode !== 200)
+            return null;
+        const doc = JSON.parse(response.body.toString());
+        if (!doc.authorization_endpoint || !doc.token_endpoint)
+            return null;
+        return {
+            authorizationEndpoint: doc.authorization_endpoint,
+            tokenEndpoint: doc.token_endpoint,
+            scopesSupported: Array.isArray(doc.scopes_supported)
+                ? doc.scopes_supported
+                : undefined,
+        };
+    }
+    catch {
+        return null;
+    }
+}
 export function openBrowser(url) {
     const isWin = process.platform === 'win32';
     const cmd = process.platform === 'darwin' ? 'open' : isWin ? 'cmd' : 'xdg-open';

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "sitevision-cli",
-	"version": "1.0.0-beta.11",
+	"version": "1.0.0-beta.12",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"