@olenbetong/appframe-vite 6.12.2 → 6.13.1

package/README.md

@@ -33,10 +33,10 @@ Then run your app:
 pnpm --filter <app> start
 ```
 
-Make sure your Appframe credentials are available as environment variables:
-
-- `APPFRAME_LOGIN`: username
-- `APPFRAME_PWD`: password
+The dev server logs in with the credentials `@olenbetong/appframe-auth` finds for the site:
+`APPFRAME_LOGIN_<ENV>` / `APPFRAME_PWD_<ENV>`, then `APPFRAME_LOGIN` / `APPFRAME_PWD`, then the
+password `af auth <env>` saved in the OS keychain. It never asks for one; without credentials it
+stops and says which `af auth` to run.
 
 On first run, the plugin logs in, configures Vite’s proxy for Appframe routes, and serves the article HTML with your local entry injected.
 

package/lib/cli-resources-add.js

@@ -1,10 +1,11 @@
 import { relative, resolve } from "node:path";
+import { authenticate } from "@olenbetong/appframe-auth";
 import { Client, generateApiDataHandler } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
 import fuzzy from "fuzzy";
 import inquirer from "inquirer";
 import autocomplete from "inquirer-autocomplete-standalone";
-import { getLoginInfo } from "./devServer.js";
+import { getAppHostname } from "./devServer.js";
 import { fetchAndGenerate, fetchResourceDefinition, writeGeneratedFile } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig, writeResourcesConfig } from "./resourcesConfig.js";
 config({ quiet: true });
@@ -21,9 +22,9 @@ async function getResources(client) {
     return ds.retrieve({ maxRecords: -1 });
 }
 export async function addResource() {
-    let { hostname, username, password } = await getLoginInfo();
+    let { hostname } = await getAppHostname();
     let client = new Client(hostname);
-    await client.login(username, password);
+    await authenticate(client, { hostname });
     // Step 1: pick a resource
     let resources = await getResources(client);
     let resourceChoices = resources.map((r) => ({

package/lib/cli-resources-edit.js

@@ -1,10 +1,11 @@
 import { relative, resolve } from "node:path";
+import { authenticate } from "@olenbetong/appframe-auth";
 import { Client } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
 import fuzzy from "fuzzy";
 import inquirer from "inquirer";
 import autocomplete from "inquirer-autocomplete-standalone";
-import { getLoginInfo } from "./devServer.js";
+import { getAppHostname } from "./devServer.js";
 import { fetchAndGenerate, fetchResourceDefinition, writeGeneratedFile } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig, writeResourcesConfig } from "./resourcesConfig.js";
 config({ quiet: true });
@@ -44,9 +45,9 @@ export async function editResource(id) {
         selected = allEntries.find((e) => e.entry.id === chosenId);
     }
     let { entry, isView } = selected;
-    let { hostname, username, password } = await getLoginInfo();
+    let { hostname } = await getAppHostname();
     let client = new Client(hostname);
-    await client.login(username, password);
+    await authenticate(client, { hostname });
     // Fetch definition for field picker
     let definition = await fetchResourceDefinition(client, entry.resource);
     let allFields = definition.Parameters?.filter((p) => !["CUT", "CDL"].includes(p.Name)).map((p) => isView ? p.Name : p.ParamName) ?? [];

package/lib/cli-resources-generate.js

@@ -1,7 +1,8 @@
 import { dirname, relative, resolve, sep } from "node:path";
+import { authenticate } from "@olenbetong/appframe-auth";
 import { Client } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
-import { getLoginInfo } from "./devServer.js";
+import { getAppHostname } from "./devServer.js";
 import { fetchAndGenerate, writeGeneratedFile } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig } from "./resourcesConfig.js";
 config({ quiet: true });
@@ -27,7 +28,7 @@ function resolveMasterImport(entry, allDataObjects) {
     return { ...entry, master: `${masterId}:${rel}` };
 }
 export async function generateFromConfig(configPath) {
-    let { hostname, username, password } = await getLoginInfo();
+    let { hostname } = await getAppHostname();
     let resourcesConfig = await readResourcesConfig(configPath);
     let allEntries = [
         ...(resourcesConfig.dataObjects ?? []).map((e) => ({ type: "dataObject", entry: e })),
@@ -38,7 +39,7 @@ export async function generateFromConfig(configPath) {
         return;
     }
     let client = new Client(hostname);
-    await client.login(username, password);
+    await authenticate(client, { hostname });
     let errors = [];
     let allDataObjects = resourcesConfig.dataObjects ?? [];
     for (let { entry } of allEntries) {

package/lib/cli-resources-migrate.js

@@ -1,7 +1,8 @@
 import { resolve } from "node:path";
+import { authenticate } from "@olenbetong/appframe-auth";
 import { Client, generateApiDataHandler } from "@olenbetong/appframe-data";
 import { config } from "dotenv";
-import { getLoginInfo } from "./devServer.js";
+import { getAppHostname } from "./devServer.js";
 import { fetchAndGenerate, writeGeneratedFile } from "./resourceGenerate.js";
 import { entryToCLIOptions, readResourcesConfig, writeResourcesConfig, } from "./resourcesConfig.js";
 config({ quiet: true });
@@ -223,7 +224,7 @@ function upsertEntry(entries, entry) {
     return "updated";
 }
 export async function migrateArticleResources(id, options = {}) {
-    let { hostname, username, password, appframe } = await getLoginInfo();
+    let { hostname, appframe } = await getAppHostname();
     let articleId = appframe.article?.id ?? appframe.article;
     let articleHost = appframe.article?.hostname ?? hostname;
     if (!articleId) {
@@ -232,7 +233,7 @@ export async function migrateArticleResources(id, options = {}) {
     let outputDir = (options.outputDir ?? "src/data").replace(/\\/g, "/").replace(/\/$/, "");
     let dryRun = options.dryRun ?? false;
     let client = new Client(hostname);
-    await client.login(username, password);
+    await authenticate(client, { hostname });
     let dsApiResources = createApiResourcesHandler(client);
     let registered = new Map();
     // The CMS configuration views are not exposed through the data API by default.

package/lib/cli.js

@@ -12,13 +12,12 @@ const pkg = await importJson("../package.json");
 async function generateTypes() {
     const appPkg = await importJson("./package.json", true);
     const hostname = appPkg.appframe.proxy?.hostname ?? "dev.obet.no";
-    const { APPFRAME_LOGIN: username = "", APPFRAME_PWD: password = "" } = process.env;
     const logger = {
         info: (msg) => console.log(msg),
         error: (msg) => console.error(msg),
     };
     logger.info(createLogMessage("Generating types…", { source: hostname }));
-    await runGenerateTypes(hostname, username, password, appPkg.appframe, logger);
+    await runGenerateTypes(hostname, appPkg.appframe, logger);
 }
 // ---------------------------------------------------------------------------
 // Program

package/lib/devServer.d.ts

@@ -1,6 +1,16 @@
 import type { Connect, ViteDevServer } from "vite";
+/** The site the app talks to in dev (`appframe.proxy.hostname`, then `appframe.deploy.hostname`). */
+export declare function getAppHostname(): Promise<{
+    hostname: string;
+    appframe: any;
+}>;
+/**
+ * The site and its credentials: `APPFRAME_LOGIN_<ENV>` / `APPFRAME_PWD_<ENV>`, then
+ * `APPFRAME_LOGIN` / `APPFRAME_PWD`, then what `af auth` saved (`@olenbetong/appframe-auth`).
+ * Throws an `AuthenticationError` that says to run `af auth` when there are none.
+ */
 export declare function getLoginInfo(): Promise<{
-    hostname: any;
+    hostname: string;
     username: string;
     password: string;
     appframe: any;

package/lib/devServer.js

@@ -1,6 +1,7 @@
 import { existsSync } from "node:fs";
 import { mkdir, readFile, stat, writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
+import { AuthenticationError, authenticate, loginHint, resolveCredentials } from "@olenbetong/appframe-auth";
 import { Client } from "@olenbetong/appframe-data";
 import dotenv from "dotenv";
 import { JSDOM } from "jsdom";
@@ -10,14 +11,24 @@ import { diagnoseServerResponse } from "./utils.js";
 dotenv.config({ quiet: true });
 let appPkg = await importJson("./package.json", true);
 let { appframe } = appPkg;
-export async function getLoginInfo() {
+/** The site the app talks to in dev (`appframe.proxy.hostname`, then `appframe.deploy.hostname`). */
+export async function getAppHostname() {
     let { appframe } = await importJson("./package.json", true);
     const hostname = appframe.proxy?.hostname ?? appframe.deploy?.hostname ?? "dev.obet.no";
-    const { APPFRAME_LOGIN: username, APPFRAME_PWD: password } = process.env;
-    if (!username || !password) {
-        throw new Error("Your Appframe credentials are not set in the environment variables. Username should be set in APPFRAME_LOGIN and password in APPFRAME_PWD.");
+    return { hostname, appframe };
+}
+/**
+ * The site and its credentials: `APPFRAME_LOGIN_<ENV>` / `APPFRAME_PWD_<ENV>`, then
+ * `APPFRAME_LOGIN` / `APPFRAME_PWD`, then what `af auth` saved (`@olenbetong/appframe-auth`).
+ * Throws an `AuthenticationError` that says to run `af auth` when there are none.
+ */
+export async function getLoginInfo() {
+    let { hostname, appframe } = await getAppHostname();
+    let credentials = await resolveCredentials(hostname);
+    if (!credentials) {
+        throw new AuthenticationError(`No Appframe credentials for ${hostname}. ${loginHint(hostname)}`);
     }
-    return { hostname, username, password, appframe };
+    return { hostname, username: credentials.username, password: credentials.password, appframe };
 }
 export function getProxyRoutes() {
     const proxyRoutes = [
@@ -68,7 +79,7 @@ async function transformArticleHtml(html) {
         entry = "/src/index.js";
     }
     let article = appframe.article?.id;
-    let { hostname } = await getLoginInfo();
+    let { hostname } = await getAppHostname();
     let dom = new JSDOM(html);
     let nodesToRemove = [];
     let mainScriptAdded = false;
@@ -127,16 +138,17 @@ async function transformArticleHtml(html) {
     return dom.serialize();
 }
 async function getArticleHtml() {
-    let { hostname, username, password } = await getLoginInfo();
+    let { hostname } = await getAppHostname();
     let article = appframe.article?.id;
     let client = new Client(hostname);
     try {
-        await client.login(username, password);
+        await authenticate(client, { hostname, interactive: false });
     }
     catch (loginError) {
         const isJsonError = loginError instanceof SyntaxError &&
             (loginError.message.includes("not valid JSON") || loginError.message.includes("Unexpected token"));
         if (isJsonError) {
+            let { username, password } = await getLoginInfo();
             let loginBody = `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}&remember=true&RequireTwoFactor=0`;
             let diagnostic = await diagnoseServerResponse(`https://${hostname}/login`, {
                 method: "POST",

package/lib/devtoolsServer.js

@@ -2,7 +2,7 @@ import { createReleaseManager, handleReleaseApi, } from "./releaseServer.js";
 import { rmSync } from "node:fs";
 import https from "node:https";
 import bodyParser from "body-parser";
-import { login } from "./proxy.js";
+import { authenticatedLogin } from "./proxy.js";
 import { readResourcesConfig, writeResourcesConfig } from "./resourcesConfig.js";
 const ALL_SERVERS = ["dev.obet.no", "stage.obet.no", "test.obet.no"];
 /**
@@ -99,13 +99,9 @@ async function handleApi(req, res, apiPath, info, release, next) {
             if (!dbObjectId) {
                 return sendJson(res, 400, { error: "dbObjectId is required" });
             }
-            const username = process.env.APPFRAME_LOGIN ?? "";
-            const password = process.env.APPFRAME_PWD ?? "";
-            if (!username || !password) {
-                return sendJson(res, 500, { error: "APPFRAME_LOGIN and APPFRAME_PWD environment variables must be set" });
-            }
+            // Each site with its own credentials; one without any fails on its own row.
             const settled = await Promise.allSettled(ALL_SERVERS.map(async (server) => {
-                const cookies = await login(server, username, password, { silent: true });
+                const cookies = await authenticatedLogin(server, { silent: true });
                 return addResourceOnServer(server, cookies, dbObjectId, name);
             }));
             const results = settled.map((r, i) => r.status === "fulfilled"

package/lib/generateTypes.d.ts

@@ -1,4 +1,12 @@
 import type { ViteDevServer } from "vite";
 type Logger = Pick<ViteDevServer["config"]["logger"], "info" | "error">;
-export declare function runGenerateTypes(hostname: string, username: string, password: string, appframe: any, logger: Logger): Promise<void>;
+export type GenerateTypesOptions = {
+    /**
+     * May ask for a password in the terminal (`appframe-vite generate-types`). Default: when stdin
+     * and stdout are a terminal. The dev server passes `false`.
+     */
+    interactive?: boolean;
+};
+/** Logs in with the site's credentials (`@olenbetong/appframe-auth`) and writes `src/appframe.d.ts`. */
+export declare function runGenerateTypes(hostname: string, appframe: any, logger: Logger, options?: GenerateTypesOptions): Promise<void>;
 export {};

package/lib/generateTypes.js

@@ -2,6 +2,7 @@ import { existsSync } from "node:fs";
 import fs from "node:fs/promises";
 import { resolve } from "node:path";
 import vm from "node:vm";
+import { authenticate, resolveCredentials } from "@olenbetong/appframe-auth";
 import { Client, DataObject, generateApiDataHandler, getDefaultClient, Procedure, setDefaultClient, } from "@olenbetong/appframe-data";
 import { formatFile, lintFile } from "./format.js";
 import { importJson } from "./importJson.js";
@@ -122,16 +123,20 @@ function withTimeout(promise, ms, label) {
 const TIMEOUT_MS = 30_000;
 const MAX_RETRIES = 3;
 const RETRY_DELAY_BASE_MS = 2_000;
-async function doGenerateTypes(hostname, username, password, appframe, logger) {
+async function doGenerateTypes(hostname, appframe, logger, options) {
     const client = new Client(hostname);
     setDefaultClient(client);
     try {
-        await withTimeout(client.login(username, password), TIMEOUT_MS, "login");
+        let login = authenticate(client, { hostname, interactive: options.interactive });
+        // No timeout while the login may be waiting for someone to type a password.
+        await (options.interactive ? login : withTimeout(login, TIMEOUT_MS, "login"));
     }
     catch (loginError) {
         const isJsonError = loginError instanceof SyntaxError &&
             (loginError.message.includes("not valid JSON") || loginError.message.includes("Unexpected token"));
-        if (isJsonError) {
+        let credentials = isJsonError ? await resolveCredentials(hostname) : undefined;
+        if (credentials) {
+            let { username, password } = credentials;
             let loginBody = `username=${encodeURIComponent(username)}&password=${encodeURIComponent(password)}&remember=true&RequireTwoFactor=0`;
             let diagnostic = await diagnoseServerResponse(`https://${hostname}/login`, {
                 method: "POST",
@@ -223,15 +228,17 @@ async function doGenerateTypes(hostname, username, password, appframe, logger) {
         logger.info(createLogMessage(message, { source: hostname, type: "warn" }));
     }
 }
-export async function runGenerateTypes(hostname, username, password, appframe, logger) {
+/** Logs in with the site's credentials (`@olenbetong/appframe-auth`) and writes `src/appframe.d.ts`. */
+export async function runGenerateTypes(hostname, appframe, logger, options = {}) {
     for (let attempt = 1; attempt <= MAX_RETRIES; attempt++) {
         try {
-            await doGenerateTypes(hostname, username, password, appframe, logger);
+            await doGenerateTypes(hostname, appframe, logger, options);
             logger.info(createLogMessage("typescript types generated successfully", { source: hostname }));
             return;
         }
         catch (error) {
-            if (attempt < MAX_RETRIES) {
+            // Missing or rejected credentials do not get better by trying again.
+            if (attempt < MAX_RETRIES && error?.name !== "AuthenticationError") {
                 // Exponential backoff before retry
                 await new Promise((r) => setTimeout(r, RETRY_DELAY_BASE_MS * attempt));
             }

package/lib/index.js

@@ -5,13 +5,13 @@ import { watch } from "chokidar";
 import { appframeDataGlobal } from "./appframeDataGlobal.js";
 import { addAppframeBuildConfig, PLATFORM_EXTERNALS, PLATFORM_GLOBALS, PLATFORM_UPSTREAM, platformManifest, usesPlatform, } from "./build.js";
 import { generateFromConfig } from "./cli-resources-generate.js";
-import { createDevMiddleware, getLoginInfo, getProxyRoutes } from "./devServer.js";
+import { createDevMiddleware, getAppHostname, getProxyRoutes } from "./devServer.js";
 import { createDevtoolsMiddleware } from "./devtoolsServer.js";
 import { importJson } from "./importJson.js";
 import { runGenerateTypes } from "./generateTypes.js";
 import { getMuiXLicenseKey } from "./licenses.js";
 import { localizeMiddleware } from "./localization.js";
-import { checkSession, getLastSession, login } from "./proxy.js";
+import { authenticatedLogin, checkSession, getLastSession } from "./proxy.js";
 import { RESOURCES_CONFIG_FILE } from "./resourcesConfig.js";
 import { createLogMessage, getServerName } from "./utils.js";
 import { publishSafeOutput } from "./publishSafeOutput.js";
@@ -33,7 +33,7 @@ function watchAppPackage() {
         let appPkgUrl = `file://${process.cwd()}/package.json`;
         watcher = watch(appPkgUrl).on("all", async () => {
             if (server) {
-                let { hostname } = await getLoginInfo();
+                let { hostname } = await getAppHostname();
                 if (lastHostname !== hostname) {
                     server.restart(false);
                 }
@@ -135,9 +135,11 @@ export default function appframe(options = {}) {
                 watchAppPackage();
                 let proxy = config.server?.proxy ?? {};
                 let routes = getProxyRoutes();
-                let { hostname, username, password } = await getLoginInfo();
+                let { hostname } = await getAppHostname();
                 lastHostname = hostname;
-                await login(hostname, username, password);
+                // Never prompts (the dev server owns the terminal): without credentials it stops with
+                // "Run af auth <env>", and a rejected saved password is removed first.
+                await authenticatedLogin(hostname);
                 console.log(createLogMessage(`connected to '${getServerName(hostname)}'`, { source: hostname }));
                 if (interval)
                     clearInterval(interval);
@@ -148,7 +150,7 @@ export default function appframe(options = {}) {
                     try {
                         const alive = await checkSession(hostname);
                         if (!alive) {
-                            await login(hostname, username, password, { silent: true });
+                            await authenticatedLogin(hostname, { silent: true });
                         }
                     }
                     catch (error) {
@@ -186,11 +188,11 @@ export default function appframe(options = {}) {
             return config;
         },
         async configureServer(_server) {
-            let { appframe, hostname, username, password } = await getLoginInfo();
+            let { appframe, hostname } = await getAppHostname();
             server = _server;
             // Run type generation in the background — doesn't block the dev server from starting.
             if (generateTypes) {
-                runGenerateTypes(hostname, username, password, appframe, _server.config.logger);
+                runGenerateTypes(hostname, appframe, _server.config.logger, { interactive: false });
             }
             // Watch resources.yaml and regenerate on change
             let resourcesConfigPath = resolve(process.cwd(), RESOURCES_CONFIG_FILE);

package/lib/localization.js

@@ -13,7 +13,7 @@
 import { existsSync } from "node:fs";
 import { mkdir, writeFile } from "node:fs/promises";
 import { resolve } from "node:path";
-import { getLoginInfo } from "./devServer.js";
+import { getAppHostname } from "./devServer.js";
 import { importJson } from "./importJson.js";
 import { getLastSession } from "./proxy.js";
 function debounce(callback, delay = 300) {
@@ -49,7 +49,7 @@ export function addStringToCache(text, translation) {
 export const localizeMiddleware = async (req, res, _next) => {
     // @ts-expect-error - Vite's types don't include the body property, but it is there because we use the bodyParser middleware before this.
     let text = req.body.text;
-    let { hostname, appframe } = await getLoginInfo();
+    let { hostname, appframe } = await getAppHostname();
     let authCookies = getLastSession(hostname)?.authCookies;
     if (authCookies) {
         let cookies = [];

package/lib/proxy.d.ts

@@ -13,4 +13,13 @@ export declare function checkSession(hostname: string): Promise<boolean>;
 export declare function login(hostname: string, username: string, password: string, loginOptions?: {
     silent?: boolean;
 }): Promise<CookieObject>;
+/**
+ * `login` with the site's credentials from `@olenbetong/appframe-auth`: `APPFRAME_LOGIN_<ENV>` /
+ * `APPFRAME_PWD_<ENV>`, `APPFRAME_LOGIN` / `APPFRAME_PWD`, or what `af auth` saved. A rejected
+ * saved password is removed, and a missing or rejected one throws an `AuthenticationError` that
+ * says to run `af auth`. Never prompts: it runs inside the dev server.
+ */
+export declare function authenticatedLogin(hostname: string, loginOptions?: {
+    silent?: boolean;
+}): Promise<CookieObject>;
 export {};

package/lib/proxy.js

@@ -2,6 +2,7 @@ import { existsSync, mkdirSync } from "node:fs";
 import { readFile, writeFile } from "node:fs/promises";
 import https from "node:https";
 import { dirname, resolve } from "node:path";
+import { authenticate, createLoginRejectedError, isRejectedLogin } from "@olenbetong/appframe-auth";
 import { createLogMessage } from "./utils.js";
 const lastLogin = new Map();
 let currentLogin = null;
@@ -108,7 +109,8 @@ export async function login(hostname, username, password, loginOptions) {
         }
     }
     if (currentLogin) {
-        await currentLogin;
+        // Wait for a login in flight; its failure is its caller's to report.
+        await currentLogin.catch(() => { });
     }
     let loginPromise = new Promise((resolve, reject) => {
         if (lastLogin.has(hostname)) {
@@ -163,10 +165,26 @@ export async function login(hostname, username, password, loginOptions) {
                 }
             }
         }, 400);
-        let request = https.request(options, (response) => {
+        let request = https.request(options, async (response) => {
+            let body = "";
+            try {
+                for await (let chunk of response)
+                    body += chunk;
+            }
+            catch {
+                // The status and cookies are what matter; a broken body is treated as empty.
+            }
             clearInterval(interval);
             let status = response.statusCode ?? 600;
-            if (status < 400) {
+            // A wrong password is answered with 200 and `{ error }`, and no session cookies.
+            let rejection;
+            try {
+                rejection = JSON.parse(body)?.error;
+            }
+            catch {
+                // Not JSON: a redirect or a page, which is what a successful login looks like.
+            }
+            if (status < 400 && !rejection) {
                 let cookies = response.headers["set-cookie"] ?? [];
                 let cookieObj = {};
                 for (let cookie of cookies) {
@@ -188,6 +206,11 @@ export async function login(hostname, username, password, loginOptions) {
                 writeSessionStore(hostname, entry);
                 resolve(cookieObj);
             }
+            else if (rejection || (status >= 400 && status < 500)) {
+                if (!silent)
+                    process.stdout.write("\n");
+                reject(createLoginRejectedError(rejection ?? `Login failed: ${status} ${response.statusMessage}`));
+            }
             else {
                 reject(Error(createLogMessage(`authentication failed: ${response.statusCode} ${response.statusMessage}`, {
                     source: hostname,
@@ -196,22 +219,41 @@ export async function login(hostname, username, password, loginOptions) {
             }
         });
         request.on("error", (error) => {
-            console.error(createLogMessage(error.message, { source: hostname, type: "error" }));
+            clearInterval(interval);
+            reject(error);
         });
         request.write(data);
         request.end();
     });
     try {
         currentLogin = loginPromise;
-        let result = await loginPromise;
-        currentLogin = null;
-        return result;
+        return await loginPromise;
     }
     catch (error) {
+        // A server that is down should not stop a dev server that still has a session, but a
+        // rejected password must be reported rather than hidden behind the old cookies.
         let cookies = lastLogin.get(hostname)?.authCookies;
-        if (cookies) {
+        if (cookies && !isRejectedLogin(error)) {
             return cookies;
         }
         throw error;
     }
+    finally {
+        currentLogin = null;
+    }
+}
+/**
+ * `login` with the site's credentials from `@olenbetong/appframe-auth`: `APPFRAME_LOGIN_<ENV>` /
+ * `APPFRAME_PWD_<ENV>`, `APPFRAME_LOGIN` / `APPFRAME_PWD`, or what `af auth` saved. A rejected
+ * saved password is removed, and a missing or rejected one throws an `AuthenticationError` that
+ * says to run `af auth`. Never prompts: it runs inside the dev server.
+ */
+export async function authenticatedLogin(hostname, loginOptions) {
+    let cookies = {};
+    await authenticate({
+        async login(username, password) {
+            cookies = await login(hostname, username, password, loginOptions);
+        },
+    }, { hostname, interactive: false });
+    return cookies;
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@olenbetong/appframe-vite",
-  "version": "6.12.2",
+  "version": "6.13.1",
   "description": "Tools to use and deploy Vite applications to Appframe",
   "main": "./lib/index.js",
   "type": "module",
@@ -29,9 +29,10 @@
   "author": "Bjørnar Vister Hansen <bvh@olenbetong.no>",
   "license": "MIT",
   "dependencies": {
-    "@olenbetong/appframe-data": "1.7.4",
+    "@olenbetong/appframe-auth": "0.1.0",
+    "@olenbetong/appframe-data": "1.8.1",
     "body-parser": "^2.3.0",
-    "chalk": "6.0.0",
+    "chalk": "6.0.1",
     "chokidar": "^5.0.0",
     "commander": "15.0.0",
     "dotenv": "^17.4.2",
@@ -44,9 +45,9 @@
   },
   "devDependencies": {
     "@types/jsdom": "^30.0.0",
-    "@types/node": "26.6.2",
+    "@types/node": "26.6.3",
     "typescript": "7.0.2",
-    "vite": "8.3.0"
+    "vite": "8.3.1"
   },
   "peerDependencies": {
     "vite": ">=8.1.5"