sitevision-cli 1.0.0-beta.3 → 1.0.0-beta.31

package/dist/commands/deploy.js

@@ -3,29 +3,127 @@ import React from 'react';
 import { render, Box, Text, useInput } from 'ink';
 import { StatusIndicator } from '../components/StatusIndicator.js';
 import { deployApp, deployProduction } from '../utils/sitevision-api.js';
-import { getZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
+import { getDeployZipPath, getSignedZipPath, getAppType, } from '../utils/project-detection.js';
 import { zipExists } from '../utils/zip.js';
 import { promptPassword, promptYesNo } from '../utils/password-prompt.js';
-import { setDeployPassword } from '../utils/keychain.js';
-export function DeployScreen({ projectRoot, manifest, devProperties, force, production, activate, signingPassword, onBack, onRetryCredentials, }) {
+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, onChangeAuthMethod, }) {
     const [state, setState] = React.useState({
         status: 'deploying',
         message: production ? 'Deploying to production...' : 'Deploying to dev...',
     });
+    // 'init' resolves cached credentials, 'login' shows the Ink login screen,
+    // 'deploy' runs the upload. Token/cookie login now happens here, so both the
+    // TUI and the standalone command reach it.
+    const [phase, setPhase] = React.useState('init');
+    const [credential, setCredential] = React.useState({
+        accessToken: devProperties.accessToken,
+        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(() => {
+        if (authMethod === 'basic' || devProperties.sessionCookie) {
+            setPhase('deploy');
+            return;
+        }
+        if (authMethod === 'cookie') {
+            // env/keychain cookie is already loaded in devProperties; none here.
+            setPhase('login');
+            return;
+        }
+        if (authMethod === 'oauth2') {
+            if (devProperties.accessToken) {
+                setPhase('deploy');
+                return;
+            }
+            void (async () => {
+                const token = await resolveOAuth2AccessToken(devProperties);
+                if (token) {
+                    setCredential({ accessToken: token });
+                    setPhase('deploy');
+                }
+                else {
+                    setPhase('login');
+                }
+            })();
+            return;
+        }
+        setPhase('deploy');
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, []);
     React.useEffect(() => {
+        if (phase !== 'deploy' || deployStartedRef.current)
+            return;
+        deployStartedRef.current = true;
         async function runDeploy() {
             try {
                 const appType = getAppType(manifest);
+                // Credential resolved in the init effect / login screen.
+                const { accessToken, sessionCookie } = credential;
+                // A stale session fails without a clean 401 — clear the stored cookie
+                // so the next run re-authenticates. Skip when SITEVISION_SESSION_COOKIE
+                // is set: detection re-reads it first, so clearing would just replay
+                // the same dead cookie in a loop.
+                const clearStaleCookie = (result) => {
+                    if (result.authExpired &&
+                        authMethod === 'cookie' &&
+                        !process.env['SITEVISION_SESSION_COOKIE'] &&
+                        devProperties.domain &&
+                        devProperties.username) {
+                        deleteSessionCookie(devProperties.domain, devProperties.username);
+                    }
+                };
                 if (production) {
                     // Production deployment requires a signed zip
                     const signedZipPath = getSignedZipPath(projectRoot, manifest);
@@ -42,11 +140,14 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                         addonName: devProperties.addonName,
                         username: devProperties.username,
                         password: devProperties.password,
+                        accessToken,
+                        sessionCookie,
                         useHTTP: devProperties.useHTTPForDevDeploy,
                         activate,
                     };
                     const result = await deployProduction(signedZipPath, config, appType);
                     if (!result.success) {
+                        clearStaleCookie(result);
                         setState({
                             status: 'error',
                             error: result.error || 'Deployment failed',
@@ -60,8 +161,7 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                     });
                 }
                 else {
-                    // Dev deployment can use unsigned zip
-                    const zipPath = getZipPath(projectRoot, manifest);
+                    const zipPath = getDeployZipPath(projectRoot, manifest);
                     if (!zipExists(zipPath)) {
                         setState({
                             status: 'error',
@@ -75,10 +175,13 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
                         addonName: devProperties.addonName,
                         username: devProperties.username,
                         password: devProperties.password,
+                        accessToken,
+                        sessionCookie,
                         useHTTP: devProperties.useHTTPForDevDeploy,
                     };
                     const result = await deployApp(zipPath, config, appType, force);
                     if (!result.success) {
+                        clearStaleCookie(result);
                         setState({
                             status: 'error',
                             error: result.error || 'Deployment failed',
@@ -100,20 +203,30 @@ export function DeployScreen({ projectRoot, manifest, devProperties, force, prod
             }
         }
         runDeploy();
-    }, [
-        projectRoot,
-        manifest,
-        devProperties,
-        force,
-        production,
-        activate,
-        signingPassword,
-    ]);
+        // eslint-disable-next-line react-hooks/exhaustive-deps
+    }, [phase]);
+    if (phase === 'login' && state.status !== 'error') {
+        return (_jsx(AuthLoginScreen, { method: (devProperties.authMethod ?? 'basic') === 'cookie'
+                ? 'cookie'
+                : 'oauth2', devProperties: devProperties, onComplete: cred => {
+                setCredential(cred);
+                setPhase('deploy');
+            }, onError: message => {
+                setState({ status: 'error', error: message });
+            }, onCancel: () => {
+                if (onBack) {
+                    onBack();
+                }
+                else {
+                    setState({ status: 'error', error: 'Login cancelled.' });
+                }
+            } }));
+    }
     return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(StatusIndicator, { status: state.status === 'deploying' ? 'running' : state.status, label: state.status === 'deploying'
                         ? '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',
@@ -146,8 +259,11 @@ export const deployCommand = {
             console.log('Create a .dev_properties.json file with domain, siteName, addonName, and username, then run setup.\n');
             return;
         }
-        // Resolve deploy password (already loaded from keychain/env in detectProject — prompt if missing)
-        if (!project.devProperties.password) {
+        // Basic auth prompts for a password here; OAuth2 and cookie resolve or log
+        // in inside DeployScreen (Ink-native), so both the TUI and this command
+        // share one login path. env/--flag token/cookie are already loaded.
+        const authMethod = project.devProperties.authMethod ?? 'basic';
+        if (authMethod === 'basic' && !project.devProperties.password) {
             const { domain, username } = project.devProperties;
             console.log('');
             const password = await promptPassword(`Deploy password for ${username}@${domain}: `);
@@ -164,15 +280,8 @@ export const deployCommand = {
         const production = Boolean(flags['production']);
         const force = Boolean(flags['force']);
         const activate = Boolean(flags['activate']);
-        // For production, we need the signed zip, which requires signing credentials
-        let signingPassword;
-        if (production &&
-            project.hasSigningProperties &&
-            project.devProperties.signingUsername) {
-            // We already have a signed zip, no need to prompt for password here
-            // The sign command should have been run separately
-        }
-        const { waitUntilExit } = render(_jsx(DeployScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, force: force, production: production, activate: activate, signingPassword: signingPassword }));
+        // Production deploys use the already-signed zip; `sign` is run separately.
+        const { waitUntilExit } = render(_jsx(DeployScreen, { projectRoot: project.root, manifest: project.manifest, devProperties: project.devProperties, force: force, production: production, activate: activate }));
         await waitUntilExit();
     },
 };

package/dist/commands/dev.d.ts

@@ -1,16 +1,14 @@
 import React from 'react';
 import { type Command } from './types.js';
-import type { SitevisionManifest, DevProperties, SigningCredentials } from '../types/index.js';
+import { type DevOptions } from '../utils/tasks.js';
+import type { ProjectInfo, SigningCredentials } from '../types/index.js';
 interface DevScreenProps {
-    projectRoot: string;
-    manifest: SitevisionManifest;
-    devProperties?: DevProperties;
-    signed: boolean;
-    deploy?: boolean;
-    signingCredentials?: SigningCredentials;
-    onBack?: () => void;
-    onRetryCredentials?: () => void;
+    project: ProjectInfo;
+    options: DevOptions;
 }
-export declare function DevScreen({ projectRoot, manifest, devProperties, signed, deploy, signingCredentials, onBack, onRetryCredentials, }: DevScreenProps): React.JSX.Element;
+/** Standalone `svc dev` / `svc watch`: one task, its log, Ctrl+C or q to stop. */
+export declare function DevScreen({ project, options }: DevScreenProps): React.JSX.Element;
+/** Resolve signing credentials for signed dev/watch, prompting if needed. */
+export declare function resolveSigningForCli(project: ProjectInfo): Promise<SigningCredentials | undefined>;
 export declare const devCommand: Command;
 export {};