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

package/dist/app.js

@@ -4,6 +4,7 @@ import { detectProject } from './utils/project-detection.js';
 import { MainMenu } from './components/MainMenu.js';
 import { InfoScreen } from './components/InfoScreen.js';
 import { SetupFlow } from './components/SetupFlow.js';
+import { DevPropertiesForm } from './components/DevPropertiesForm.js';
 import { PasswordInput } from './components/PasswordInput.js';
 import { KeychainPasswordChoice } from './components/KeychainPasswordChoice.js';
 import { decideSigningStep } from './utils/signing-step.js';
@@ -135,6 +136,13 @@ export default function App({ project: initialProject }) {
             case 'setup-signing':
                 setState('setup-signing');
                 break;
+            case 'change-auth':
+                if (!project.hasDevProperties || !project.devProperties) {
+                    console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
+                    return;
+                }
+                setState('change-auth-method');
+                break;
             case 'dev':
                 if (!project.hasDevProperties || !project.devProperties) {
                     console.log('\x1b[31mDevelopment properties not configured. Create a .dev_properties.json file first.\x1b[0m');
@@ -221,6 +229,12 @@ export default function App({ project: initialProject }) {
                 break;
         }
     };
+    if (state === 'change-auth-method') {
+        return (_jsx(DevPropertiesForm, { projectRoot: project.root, initialProperties: project.devProperties, packageJson: project.packageJson, authOnly: true, onComplete: () => {
+                reloadProject();
+                setState('menu');
+            }, onCancel: () => setState('menu') }));
+    }
     if (state === 'setup') {
         return (_jsx(SetupFlow, { project: project, onReload: reloadProject, onComplete: () => setState('menu') }));
     }
@@ -293,7 +307,7 @@ export default function App({ project: initialProject }) {
                 if (project.devProperties)
                     project.devProperties.password = undefined;
                 setState('dev-password-input');
-            } }));
+            }, onChangeAuthMethod: () => setState('change-auth-method') }));
     }
     if (state === 'setup-signing') {
         return (_jsx(SigningPropertiesForm, { projectRoot: project.root, onComplete: () => {

package/dist/commands/deploy.d.ts

@@ -10,7 +10,8 @@ interface DeployScreenProps {
     activate: boolean;
     onBack?: () => void;
     onRetryCredentials?: () => void;
+    onChangeAuthMethod?: () => void;
 }
-export declare function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, }: DeployScreenProps): React.JSX.Element;
+export declare function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, onChangeAuthMethod, }: DeployScreenProps): React.JSX.Element;
 export declare const deployCommand: Command;
 export {};

package/dist/commands/deploy.js

@@ -6,10 +6,10 @@ import { deployApp, deployProduction } from '../utils/sitevision-api.js';
 import { getZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
 import { zipExists } from '../utils/zip.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { setDeployPassword, deleteSessionCookie } from '../utils/keychain.js';
+import { setDeployPassword, deleteSessionCookie, deleteOAuth2RefreshToken, } from '../utils/keychain.js';
 import { resolveOAuth2AccessToken } from '../utils/oauth2-auth.js';
 import { AuthLoginScreen } from '../components/AuthLoginScreen.js';
-export function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, }) {
+export function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, onBack, onRetryCredentials, onChangeAuthMethod, }) {
     const [state, setState] = React.useState({
         status: 'deploying',
         message: production ? 'Deploying to production...' : 'Deploying to dev...',
@@ -23,19 +23,56 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
         sessionCookie: devProperties.sessionCookie,
     });
     const deployStartedRef = React.useRef(false);
+    const authMethod = devProperties.authMethod ?? 'basic';
+    // OAuth2 and cookie can re-authenticate in-place; basic re-prompts via the
+    // parent (TUI password entry).
+    const canRelogin = authMethod === 'oauth2' || authMethod === 'cookie';
+    // Discard the stored credential and force a fresh login. This is the
+    // "retry with new credentials" action for token/cookie auth — the usual fix
+    // when a session/token has expired (Sitevision reports that as a 400, not a
+    // 401, so it isn't auto-cleared).
+    const retryWithFreshLogin = () => {
+        const { domain, username } = devProperties;
+        if (authMethod === 'cookie' && domain && username) {
+            deleteSessionCookie(domain, username);
+            devProperties.sessionCookie = undefined;
+        }
+        else if (authMethod === 'oauth2' &&
+            domain &&
+            devProperties.oauth2?.clientId) {
+            deleteOAuth2RefreshToken(domain, devProperties.oauth2.clientId);
+            devProperties.accessToken = undefined;
+        }
+        setCredential({});
+        deployStartedRef.current = false;
+        setState({
+            status: 'deploying',
+            message: production
+                ? 'Deploying to production...'
+                : 'Deploying to dev...',
+        });
+        setPhase('login');
+    };
     useInput((input, key) => {
         if (state.status !== 'deploying') {
             if (onBack && (key.escape || input === 'q')) {
                 onBack();
             }
-            if (onRetryCredentials && state.status === 'error' && input === 'r') {
-                onRetryCredentials();
+            if (state.status === 'error' && input === 'r') {
+                if (canRelogin) {
+                    retryWithFreshLogin();
+                }
+                else if (onRetryCredentials) {
+                    onRetryCredentials();
+                }
+            }
+            if (state.status === 'error' && input === 'm' && onChangeAuthMethod) {
+                onChangeAuthMethod();
             }
         }
     });
     // Decide once whether we can deploy straight away or must log in first.
     React.useEffect(() => {
-        const authMethod = devProperties.authMethod ?? 'basic';
         if (authMethod === 'basic' || devProperties.sessionCookie) {
             setPhase('deploy');
             return;
@@ -72,7 +109,6 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
         async function runDeploy() {
             try {
                 const appType = getAppType(manifest);
-                const authMethod = devProperties.authMethod ?? 'basic';
                 // Credential resolved in the init effect / login screen.
                 const { accessToken, sessionCookie } = credential;
                 // A stale session fails without a clean 401 — clear the stored cookie
@@ -191,7 +227,7 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                         ? 'Deploying'
                         : state.status === 'success'
                             ? 'Deployed'
-                            : 'Failed', message: state.message }) }), state.status === 'success' && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "green", children: [production ? 'Production deployment' : 'Dev deployment', " complete"] }), state.executableId && (_jsxs(Text, { dimColor: true, children: ["Executable ID: ", state.executableId] })), force && _jsx(Text, { dimColor: true, children: "(Force mode - overwrote existing)" }), activate && production && _jsx(Text, { dimColor: true, children: "(Activated)" })] })), state.status === 'error' && state.error && (_jsx(Box, { flexDirection: "column", marginTop: 1, children: _jsx(Text, { color: "red", children: state.error }) })), state.status !== 'deploying' && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [state.status === 'error' && onRetryCredentials && (_jsx(Text, { dimColor: true, children: "Press r to retry with new credentials" })), onBack && _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" })] }))] }));
+                            : 'Failed', message: state.message }) }), state.status === 'success' && (_jsxs(Box, { flexDirection: "column", marginLeft: 2, children: [_jsxs(Text, { color: "green", children: [production ? 'Production deployment' : 'Dev deployment', " complete"] }), state.executableId && (_jsxs(Text, { dimColor: true, children: ["Executable ID: ", state.executableId] })), force && _jsx(Text, { dimColor: true, children: "(Force mode - overwrote existing)" }), activate && production && _jsx(Text, { dimColor: true, children: "(Activated)" })] })), state.status === 'error' && state.error && (_jsxs(Box, { flexDirection: "column", marginTop: 1, children: [_jsx(Text, { color: "red", children: state.error }), canRelogin && (_jsx(Text, { color: "yellow", children: "This can happen when your session or token has expired \u2014 log in again to get fresh credentials." }))] })), state.status !== 'deploying' && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [state.status === 'error' && canRelogin && (_jsx(Text, { dimColor: true, children: "Press r to log in again with fresh credentials" })), state.status === 'error' && !canRelogin && onRetryCredentials && (_jsx(Text, { dimColor: true, children: "Press r to retry with new credentials" })), state.status === 'error' && onChangeAuthMethod && (_jsx(Text, { dimColor: true, children: "Press m to change auth method" })), onBack && _jsx(Text, { dimColor: true, children: "Press q or Esc to return to menu" })] }))] }));
 }
 export const deployCommand = {
     name: 'deploy',

package/dist/components/DevPropertiesForm.d.ts

@@ -3,8 +3,9 @@ interface Props {
     projectRoot: string;
     initialProperties?: DevProperties;
     packageJson: PackageJson;
+    authOnly?: boolean;
     onComplete: () => void;
     onCancel: () => void;
 }
-export declare function DevPropertiesForm({ projectRoot, initialProperties, packageJson, onComplete, onCancel, }: Props): import("react").JSX.Element;
+export declare function DevPropertiesForm({ projectRoot, initialProperties, packageJson, authOnly, onComplete, onCancel, }: Props): import("react").JSX.Element;
 export {};

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',
@@ -32,7 +32,7 @@ function parseScopes(raw) {
         .filter(Boolean);
     return scopes.length > 0 ? scopes : undefined;
 }
-export function DevPropertiesForm({ projectRoot, initialProperties, packageJson, onComplete, onCancel, }) {
+export function DevPropertiesForm({ projectRoot, initialProperties, packageJson, authOnly, onComplete, onCancel, }) {
     const [stepIndex, setStepIndex] = useState(0);
     const [properties, setProperties] = useState(() => {
         const defaults = {
@@ -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',
@@ -63,15 +94,17 @@ export function DevPropertiesForm({ projectRoot, initialProperties, packageJson,
         : method === 'cookie'
             ? ['sessionLoginUrl']
             : ['password'];
-    const steps = [
-        'domain',
-        'siteName',
-        'addonName',
-        'username',
-        'authMethod',
-        ...methodSteps,
-        'useHTTP',
-    ];
+    const steps = authOnly
+        ? ['authMethod', ...methodSteps]
+        : [
+            'domain',
+            'siteName',
+            'addonName',
+            'username',
+            'authMethod',
+            ...methodSteps,
+            'useHTTP',
+        ];
     const currentStep = steps[stepIndex];
     const redirectPort = initialProperties?.oauth2?.redirectPort ?? DEFAULT_REDIRECT_PORT;
     const advance = () => {
@@ -175,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/components/MainMenu.js

@@ -51,6 +51,11 @@ export function MainMenu({ project, onSelect }) {
             value: 'deploy-production',
             description: 'Deploy to production server',
         },
+        {
+            label: '🔑 Auth Method',
+            value: 'change-auth',
+            description: 'Change the deploy authentication method',
+        },
         {
             label: 'ℹ️  Info',
             value: 'info',

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.10",
+	"version": "1.0.0-beta.12",
 	"license": "MIT",
 	"bin": {
 		"svc": "dist/cli.js"