sitevision-cli 1.0.0-beta.17 → 1.0.0-beta.18

package/dist/components/AuthLoginScreen.js

@@ -15,6 +15,7 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
     const [phase, setPhase] = React.useState('starting');
     const [authUrl, setAuthUrl] = React.useState('');
     const [note, setNote] = React.useState('');
+    const [loginUrl, setLoginUrl] = React.useState('');
     const cookieRef = React.useRef(null);
     const cancelOAuthRef = React.useRef(null);
     React.useEffect(() => {
@@ -45,6 +46,7 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
                     return;
                 }
                 cookieRef.current = session;
+                setLoginUrl(session.loginUrl);
                 setPhase('awaiting');
             }
         })();
@@ -84,5 +86,5 @@ export function AuthLoginScreen({ method, devProperties, onComplete, onError, on
             })();
         }
     });
-    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: method === 'oauth2' ? t('OAuth2 login') : t('Session cookie login') }) }), method === 'oauth2' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Waiting for you to finish login in the browser…')] })] }), authUrl && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: t("If the browser didn't open, visit:") }), _jsx(Text, { children: authUrl })] }))] })) : (_jsxs(Box, { flexDirection: "column", children: [phase === 'starting' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Opening browser…')] })] })), phase === 'awaiting' && (_jsx(Text, { children: t('Log in in the opened browser, then press Enter to capture the session.') })), phase === 'capturing' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Capturing session…')] })] })), note && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: note }) }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('Press Esc to cancel.') }) })] }));
+    return (_jsxs(Box, { flexDirection: "column", padding: 1, children: [_jsx(Box, { marginBottom: 1, children: _jsx(Text, { bold: true, color: "cyan", children: method === 'oauth2' ? t('OAuth2 login') : t('Session cookie login') }) }), method === 'oauth2' ? (_jsxs(Box, { flexDirection: "column", children: [_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Waiting for you to finish login in the browser…')] })] }), authUrl && (_jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { dimColor: true, children: t("If the browser didn't open, visit:") }), _jsx(Text, { children: authUrl })] }))] })) : (_jsxs(Box, { flexDirection: "column", children: [phase === 'starting' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Opening browser…')] })] })), phase === 'awaiting' && (_jsxs(Box, { flexDirection: "column", children: [_jsx(Text, { children: t('A Chrome window is open at:') }), _jsx(Text, { color: "cyan", children: loginUrl }), _jsxs(Box, { marginTop: 1, flexDirection: "column", children: [_jsx(Text, { children: t('1. Log in to the site there, single sign-on included.') }), _jsx(Text, { children: t('2. Wait until the site itself has finished loading.') }), _jsx(Text, { children: t('3. Come back here and press Enter.') })] }), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('Leave the browser window open; it closes once the session is captured.') }) })] })), phase === 'capturing' && (_jsxs(Box, { children: [_jsx(Text, { color: "green", children: _jsx(Spinner, { type: "dots" }) }), _jsxs(Text, { children: [" ", t('Capturing session…')] })] })), note && (_jsx(Box, { marginTop: 1, children: _jsx(Text, { color: "yellow", children: note }) }))] })), _jsx(Box, { marginTop: 1, children: _jsx(Text, { dimColor: true, children: t('Press Esc to cancel.') }) })] }));
 }

package/dist/shell/ConfigForm.js

@@ -1,7 +1,7 @@
 import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
 import { useEffect, useState } from 'react';
 import { Box, Text, useInput } from 'ink';
-import { getPackageJsonSyncChanges, readInheritedDevProperties, writeDevProperties, } from '../utils/project-detection.js';
+import { getPackageJsonSyncChanges, normalizeDomain, readInheritedDevProperties, writeDevProperties, } from '../utils/project-detection.js';
 import { setDeployPassword, deleteDeployPassword, getOAuth2ClientSecret, setOAuth2ClientSecret, deleteOAuth2ClientSecret, getSigningPassword, setSigningPassword, deleteSigningPassword, } from '../utils/keychain.js';
 import { DEFAULT_SCOPES, discoverOAuth2Config } from '../utils/oauth2-auth.js';
 import { ACCENT } from './Frame.js';
@@ -298,10 +298,16 @@ export function ConfigForm({ project, active, width, height, pickAddon, onSaved,
         : [];
     // Write one field to disk (and the keychain for secrets) right away.
     const commit = (key, value, label = current.label) => {
-        const next = { ...values, [key]: value };
+        const clean = key === 'domain' ? normalizeDomain(value) : value;
+        const next = { ...values, [key]: clean };
         setValues(next);
         saveConfig(project, next, new Set([key]));
-        setNote(t('Saved {label}.', { label: t(label) }));
+        setNote(clean === value
+            ? t('Saved {label}.', { label: t(label) })
+            : t('Saved {label} as {value} — a domain is a host only.', {
+                label: t(label),
+                value: clean,
+            }));
         onSaved();
     };
     // Auto-fill OAuth2 endpoints from the site's OpenID configuration.

package/dist/utils/i18n.js

@@ -230,6 +230,7 @@ const sv = {
     idle: 'inaktiv',
     'workspace config saved': 'arbetsytans konfig sparad',
     'config saved': 'konfig sparad',
+    'Saved {label} as {value} — a domain is a host only.': 'Sparade {label} som {value} — en domän är enbart ett värdnamn.',
     ' · shared .dev_properties.json at the root': ' · delad .dev_properties.json i roten',
     ' · new workspace: fill in once, every app inherits · Esc skips': ' · ny arbetsyta: fyll i en gång, alla appar ärver · Esc hoppar över',
     'y confirm · n cancel': 'y bekräfta · n avbryt',
@@ -267,5 +268,10 @@ const sv = {
     'Opening browser…': 'Öppnar webbläsare…',
     'Log in in the opened browser, then press Enter to capture the session.': 'Logga in i webbläsaren och tryck sedan Enter för att fånga sessionen.',
     'Capturing session…': 'Fångar session…',
+    'A Chrome window is open at:': 'Ett Chrome-fönster är öppet på:',
+    '1. Log in to the site there, single sign-on included.': '1. Logga in på webbplatsen där, även med enkel inloggning.',
+    '2. Wait until the site itself has finished loading.': '2. Vänta tills själva webbplatsen har laddat klart.',
+    '3. Come back here and press Enter.': '3. Kom tillbaka hit och tryck Enter.',
+    'Leave the browser window open; it closes once the session is captured.': 'Låt webbläsarfönstret vara öppet; det stängs när sessionen har hämtats.',
     'Press Esc to cancel.': 'Tryck Esc för att avbryta.',
 };

package/dist/utils/project-detection.d.ts

@@ -22,6 +22,8 @@ export declare function findDevPropertiesPath(root: string): string | null;
  * Get the default dev properties path (for creating new files)
  */
 export declare function getDefaultDevPropertiesPath(root: string): string;
+/** A bare host: no scheme, no path, no stray spaces. */
+export declare function normalizeDomain(value: string): string;
 /**
  * The dev properties a workspace root defines (its own file merged over any
  * ancestors'), with the deploy password resolved from the keychain like an

package/dist/utils/project-detection.js

@@ -81,12 +81,25 @@ function ancestorDirs(root) {
     }
     return dirs;
 }
+/** A bare host: no scheme, no path, no stray spaces. */
+export function normalizeDomain(value) {
+    const host = value
+        .trim()
+        .replace(/^[a-z]+:\/\//i, '')
+        .replaceAll(/\s/g, '');
+    const slash = host.indexOf('/');
+    return slash === -1 ? host : host.slice(0, slash);
+}
 function readDevPropertiesFile(dir) {
     const file = findDevPropertiesPath(dir);
     if (!file)
         return null;
     try {
-        return JSON.parse(fs.readFileSync(file, 'utf-8'));
+        const dev = JSON.parse(fs.readFileSync(file, 'utf-8'));
+        // ponytail: top level only; a hand-edited environment override keeps its
+        // scheme until it is saved from the config form.
+        dev.domain &&= normalizeDomain(dev.domain);
+        return dev;
     }
     catch {
         return null;

package/dist/utils/session-cookie-auth.d.ts

@@ -12,6 +12,7 @@ export interface CaptureResult {
 export interface CookieLoginSession {
     capture: () => Promise<CaptureResult>;
     close: () => Promise<void>;
+    loginUrl: string;
 }
 /**
  * Pick the session from a cookie jar: find JSESSIONID (preferring the deploy

package/dist/utils/session-cookie-auth.js

@@ -86,7 +86,7 @@ export async function beginCookieLogin(dev) {
                 // Best-effort close.
             });
         };
-        return { capture, close };
+        return { capture, close, loginUrl };
     }
     catch {
         if (browser) {

package/package.json

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