@geekity/cms 0.30.0 → 0.32.0

package/dist/{indieauth → admin}/connected-apps.js

@@ -6,17 +6,18 @@
  * approved it. Revoking deletes the connection from `data/indieauth-tokens.json`,
  * so the access token and the refresh token stop working on the next request.
  */
-import { flash } from '../admin/flash.js';
-import { formatInTimezone } from '../admin/formatting.js';
-import { findUserById, listUsers } from '../admin/accounts.js';
-import { readSiteSettings, updateSiteSettings } from '../admin/settings.js';
-import { ADMIN_TEMPLATES } from '../admin/templates.js';
-import { CONNECTED_APPS_CHILD, CONNECTED_APPS_PATH } from '../admin/users.js';
-import { clientIdentifier, sameClient } from './client-id.js';
-import { SCOPE_LABELS } from './consent.js';
-import { SCOPES, siteBaseUrl } from './discovery.js';
-import { meForSignIn } from './identity.js';
-import { createToken, lapsesAt, listTokens, revokeConnection } from './tokens.js';
+import { flash } from './flash.js';
+import { formatInTimezone } from './formatting.js';
+import { ADMIN_TEMPLATES } from './templates.js';
+import { CONNECTED_APPS_CHILD, CONNECTED_APPS_PATH } from './users.js';
+import { editSiteSetting } from './site-setting-edit.js';
+import { findUserById, listUsers } from '../site/users.js';
+import { stringOrEmpty } from '../util/forms.js';
+import { clientIdentifier, sameClient } from '../util/client-id.js';
+import { SCOPE_LABELS } from './indieauth-consent.js';
+import { SCOPES } from '../indieauth/request.js';
+import { meForSignIn } from '../indieauth/identity.js';
+import { createToken, lapsesAt, listTokens, revokeConnection } from '../indieauth/tokens.js';
 /** Where a Revoke button posts. */
 export const REVOKE_CONNECTION_PATH = `${CONNECTED_APPS_PATH}/revoke`;
 /** The field a Revoke button submits: the connection's id. */
@@ -37,7 +38,7 @@ export function mountConnectedApps(app, options) {
     const { render } = options;
     app.get(CONNECTED_APPS_PATH, (c) => render(c, ADMIN_TEMPLATES.connectedApps, screen(c)));
     app.post(ADD_CLIENT_WITHOUT_PKCE_PATH, async (c) => {
-        const value = text((await c.req.parseBody())[CLIENT_FIELD]).trim();
+        const value = stringOrEmpty((await c.req.parseBody())[CLIENT_FIELD]).trim();
         const refuse = (problem) => {
             c.status(400);
             return render(c, ADMIN_TEMPLATES.connectedApps, screen(c, { value, problem }));
@@ -45,32 +46,28 @@ export function mountConnectedApps(app, options) {
         if (clientIdentifier(value) === undefined)
             return refuse(NOT_A_CLIENT_ID);
         let listed = false;
-        await updateSiteSettings({
-            contentDir: c.var.config.contentDir,
-            change: (current) => {
-                listed = current.clientsWithoutPkce.some((id) => sameClient(id, value));
-                return listed
-                    ? current
-                    : { ...current, clientsWithoutPkce: [...current.clientsWithoutPkce, value] };
-            },
+        const saved = await editSiteSetting(c.var.settings, 'clients_without_pkce', (current) => {
+            listed = current.some((id) => sameClient(id, value));
+            return listed ? current : [...current, value];
         });
+        if (!saved.ok)
+            return refuse(Object.values(saved.problems).join(' '));
         if (listed)
             return refuse(`${value} is already on the list.`);
         flash(c, 'notice', `${value} may now sign in without PKCE.`);
         return c.redirect(CONNECTED_APPS_PATH, 303);
     });
     app.post(REMOVE_CLIENT_WITHOUT_PKCE_PATH, async (c) => {
-        const value = text((await c.req.parseBody())[CLIENT_FIELD]);
+        const value = stringOrEmpty((await c.req.parseBody())[CLIENT_FIELD]);
         let removed = false;
-        await updateSiteSettings({
-            contentDir: c.var.config.contentDir,
-            change: (current) => {
-                const kept = current.clientsWithoutPkce.filter((id) => id !== value);
-                removed = kept.length < current.clientsWithoutPkce.length;
-                return { ...current, clientsWithoutPkce: kept };
-            },
+        const saved = await editSiteSetting(c.var.settings, 'clients_without_pkce', (current) => {
+            const kept = current.filter((id) => id !== value);
+            removed = kept.length < current.length;
+            return kept;
         });
-        if (removed)
+        if (!saved.ok)
+            flash(c, 'error', Object.values(saved.problems).join(' '));
+        else if (removed)
             flash(c, 'notice', `${value} must use PKCE again.`);
         else
             flash(c, 'warning', 'That app was already off the list.');
@@ -80,9 +77,9 @@ export function mountConnectedApps(app, options) {
         const { config } = c.var;
         const body = await c.req.parseBody({ all: true });
         const form = {
-            name: text(body['name']).trim(),
-            scopes: [body['scope'] ?? []].flat().map(text),
-            expires: text(body['expires']),
+            name: stringOrEmpty(body['name']).trim(),
+            scopes: [body['scope'] ?? []].flat().map(stringOrEmpty),
+            expires: stringOrEmpty(body['expires']),
         };
         const user = c.var.session?.userId == null
             ? undefined
@@ -103,13 +100,13 @@ export function mountConnectedApps(app, options) {
             c.status(400);
             return render(c, ADMIN_TEMPLATES.connectedApps, screen(c, undefined, { refused: form, problems }));
         }
-        const baseUrl = siteBaseUrl(c);
+        const baseUrl = c.var.config.baseUrl;
         const { accessToken } = await createToken(config.dataDir, {
             userId: user.id,
             me: meForSignIn(`${baseUrl}/`, user, {
                 baseUrl,
                 users: listUsers(config.dataDir),
-                settings: readSiteSettings(config.contentDir),
+                settings: c.var.siteAtRequestStart,
             }),
             name: form.name,
             scopes,
@@ -135,7 +132,7 @@ const NOT_A_CLIENT_ID = 'Enter the app’s client_id exactly as it sends it: an
 function screen(c, refused, token) {
     const { config } = c.var;
     const userId = c.var.session?.userId;
-    const settings = readSiteSettings(config.contentDir);
+    const settings = c.var.siteAtRequestStart;
     const now = config.now().getTime();
     const connections = listTokens(config.dataDir)
         .filter((stored) => stored.userId === userId && Date.parse(lapsesAt(stored)) > now)
@@ -150,7 +147,7 @@ function screen(c, refused, token) {
         connectionField: CONNECTION_FIELD,
         connections,
         withoutPkce: {
-            clients: settings.clientsWithoutPkce,
+            clients: settings.clients_without_pkce,
             addUrl: ADD_CLIENT_WITHOUT_PKCE_PATH,
             removeUrl: REMOVE_CLIENT_WITHOUT_PKCE_PATH,
             field: CLIENT_FIELD,
@@ -174,9 +171,6 @@ function screen(c, refused, token) {
         },
     };
 }
-function text(value) {
-    return typeof value === 'string' ? value : '';
-}
 /** One connection as the table shows it. */
 function row(token, timezone) {
     const when = (instant) => ({ iso: instant, text: formatInTimezone(instant, timezone) });

package/dist/admin/connected-apps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"connected-apps.js","sourceRoot":"","sources":["../../src/admin/connected-apps.ts"],"names":[],"mappings":"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"}

package/dist/admin/credentials.js

@@ -1,4 +1,4 @@
-import { EMAIL_PATTERN } from './settings.js';
+import { EMAIL_PATTERN } from '../site/setting-values.js';
 /**
  * The rules a username, a password and an email address have to satisfy, in
  * one place.

package/dist/admin/credentials.js.map

@@ -1 +1 @@
-{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/admin/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,eAAe,CAAC;AAE9C;;;;;;;;GAQG;AAEH,iDAAiD;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,kCAAkC;AAClC,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,OAAO,wGAAwG,CAAC;IAClH,CAAC;IACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IACtD,OAAO,CACL,sBAAsB,MAAM,CAAC,uBAAuB,CAAC,oCAAoC;QACzF,cAAc,CACf,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,QAAQ,CAAC,MAAM,IAAI,uBAAuB;QAAE,OAAO,SAAS,CAAC;IACjE,OAAO,0BAA0B,MAAM,CAAC,uBAAuB,CAAC,cAAc,CAAC;AACjF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IACpE,OAAO,iEAAiE,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;IAClE,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;AAChE,CAAC"}
+{"version":3,"file":"credentials.js","sourceRoot":"","sources":["../../src/admin/credentials.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,aAAa,EAAE,MAAM,2BAA2B,CAAC;AAE1D;;;;;;;;GAQG;AAEH,iDAAiD;AACjD,MAAM,CAAC,MAAM,uBAAuB,GAAG,CAAC,CAAC;AAEzC,kCAAkC;AAClC,MAAM,CAAC,MAAM,uBAAuB,GAAG,EAAE,CAAC;AAE1C;;;GAGG;AACH,MAAM,CAAC,MAAM,gBAAgB,GAAG,wBAAwB,CAAC;AAEzD;;;;;;;;;;;;GAYG;AACH,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,OAAO,CAAC,IAAI,CAAC,QAAQ,CAAC,EAAE,CAAC;QAC3B,OAAO,wGAAwG,CAAC;IAClH,CAAC;IACD,IAAI,gBAAgB,CAAC,IAAI,CAAC,QAAQ,CAAC;QAAE,OAAO,SAAS,CAAC;IACtD,OAAO,CACL,sBAAsB,MAAM,CAAC,uBAAuB,CAAC,oCAAoC;QACzF,cAAc,CACf,CAAC;AACJ,CAAC;AAED,qEAAqE;AACrE,MAAM,UAAU,eAAe,CAAC,QAAgB;IAC9C,IAAI,QAAQ,CAAC,MAAM,IAAI,uBAAuB;QAAE,OAAO,SAAS,CAAC;IACjE,OAAO,0BAA0B,MAAM,CAAC,uBAAuB,CAAC,cAAc,CAAC;AACjF,CAAC;AAED;;;;;;;;;GASG;AACH,MAAM,UAAU,YAAY,CAAC,KAAa;IACxC,MAAM,OAAO,GAAG,KAAK,CAAC,IAAI,EAAE,CAAC;IAC7B,IAAI,OAAO,KAAK,EAAE,IAAI,aAAa,CAAC,IAAI,CAAC,OAAO,CAAC;QAAE,OAAO,SAAS,CAAC;IACpE,OAAO,iEAAiE,CAAC;AAC3E,CAAC;AAED;;;;GAIG;AACH,MAAM,UAAU,iBAAiB,CAAC,QAAgB,EAAE,QAAgB;IAClE,OAAO,eAAe,CAAC,QAAQ,CAAC,IAAI,eAAe,CAAC,QAAQ,CAAC,CAAC;AAChE,CAAC"}

package/dist/admin/dev-mode.d.ts

@@ -1,5 +1,5 @@
 import type { Hono } from 'hono';
-import type { GeekityEnv } from '../env.ts';
+import type { GeekityEnv } from '../web/env.ts';
 import type { AdminRender } from './documents.ts';
 export declare const DEV_MODE_PATH = "/admin/tools/dev-mode";
 export declare const DEV_MODE_CHILD = "dev-mode";

package/dist/admin/dev-mode.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"dev-mode.d.ts","sourceRoot":"","sources":["../../src/admin/dev-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,MAAM,CAAC;AAIjC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,WAAW,CAAC;AAC5C,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAIlD,eAAO,MAAM,aAAa,0BAA2B,CAAC;AAEtD,eAAO,MAAM,cAAc,aAAa,CAAC;AAYzC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAahG"}
+{"version":3,"file":"dev-mode.d.ts","sourceRoot":"","sources":["../../src/admin/dev-mode.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAW,IAAI,EAAE,MAAM,MAAM,CAAC;AAI1C,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAC;AAKlD,eAAO,MAAM,aAAa,0BAA2B,CAAC;AAEtD,eAAO,MAAM,cAAc,aAAa,CAAC;AA0BzC,wBAAgB,kBAAkB,CAAC,GAAG,EAAE,IAAI,CAAC,UAAU,CAAC,EAAE,OAAO,EAAE;IAAE,MAAM,EAAE,WAAW,CAAA;CAAE,GAAG,IAAI,CAiChG"}

package/dist/admin/dev-mode.js

@@ -1,4 +1,5 @@
-import { devModeOn, readDevModeRecord } from '../dev-mode.js';
+import { DEV_MODE, DEV_MODE_LATCHED, readDevModeRecord } from '../settings/dev-mode.js';
+import { flash } from './flash.js';
 import { ADMIN_TEMPLATES } from './templates.js';
 import { TOOLS_PATH, TOOLS_SECTION } from './tools.js';
 export const DEV_MODE_PATH = `${TOOLS_PATH}/dev-mode`;
@@ -11,31 +12,55 @@ const KIND_LABELS = {
     indexnow: 'IndexNow',
     mail: 'Email',
 };
+const ON_BY = {
+    config: 'GEEKITY_DEV_MODE or the devMode setting',
+    command: 'geekity dev-mode on',
+    admin: 'the admin switch',
+    plugin: 'a plugin',
+};
+const OFF_BY = {
+    ...ON_BY,
+    command: 'geekity dev-mode off',
+};
+const LATCHED = `${DEV_MODE_LATCHED} Remove it and restart the site, then take it live here.`;
 export function mountDevModeScreen(app, options) {
-    app.get(DEV_MODE_PATH, (c) => {
+    async function show(c, problem) {
         const record = readDevModeRecord(c.var.config.dataDir);
         return options.render(c, ADMIN_TEMPLATES.toolsDevMode, {
             section: TOOLS_SECTION,
             child: DEV_MODE_CHILD,
             heading: 'Dev mode',
-            on: devModeOn(c.var.config),
+            saveUrl: DEV_MODE_PATH,
+            on: await c.var.settings.get(DEV_MODE.on),
+            latched: c.var.config.devMode ? LATCHED : undefined,
+            problem,
             heldCount: record.filter((entry) => entry.type === 'held').length,
             shown: SHOWN,
             rows: record.slice(-SHOWN).reverse().map(row),
         });
+    }
+    app.get(DEV_MODE_PATH, (c) => show(c));
+    app.post(DEV_MODE_PATH, async (c) => {
+        const on = (await c.req.parseBody())['on'] !== undefined;
+        if (!on && c.var.config.devMode) {
+            c.status(400);
+            return await show(c, LATCHED);
+        }
+        const result = await c.var.settings.set('dev_mode', new Map([['on', on]]), 'admin');
+        if (!result.ok) {
+            c.status(400);
+            return await show(c, Object.values(result.problems).join(' '));
+        }
+        flash(c, 'notice', on ? 'Dev mode is on.' : 'Dev mode is off: the site is live.');
+        return c.redirect(DEV_MODE_PATH, 303);
     });
 }
 function row(entry) {
     if (entry.type === 'on') {
-        return {
-            at: entry.at,
-            what: 'Dev mode on',
-            detail: entry.by === 'config' ? 'GEEKITY_DEV_MODE or the devMode setting' : 'geekity dev-mode on',
-            to: [],
-        };
+        return { at: entry.at, what: 'Dev mode on', detail: ON_BY[entry.by], to: [] };
     }
     if (entry.type === 'off') {
-        return { at: entry.at, what: 'Went live', detail: 'geekity dev-mode off', to: [] };
+        return { at: entry.at, what: 'Went live', detail: OFF_BY[entry.by], to: [] };
     }
     return { at: entry.at, what: KIND_LABELS[entry.kind], detail: entry.what, to: entry.to };
 }

package/dist/admin/dev-mode.js.map

@@ -1 +1 @@
-{"version":3,"file":"dev-mode.js","sourceRoot":"","sources":["../../src/admin/dev-mode.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,SAAS,EAAE,iBAAiB,EAAE,MAAM,gBAAgB,CAAC;AAI9D,OAAO,EAAE,eAAe,EAAE,MAAM,gBAAgB,CAAC;AACjD,OAAO,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAEvD,MAAM,CAAC,MAAM,aAAa,GAAG,GAAG,UAAU,WAAW,CAAC;AAEtD,MAAM,CAAC,MAAM,cAAc,GAAG,UAAU,CAAC;AAEzC,MAAM,KAAK,GAAG,GAAG,CAAC;AAElB,MAAM,WAAW,GAA6B;IAC5C,WAAW,EAAE,aAAa;IAC1B,UAAU,EAAE,YAAY;IACxB,WAAW,EAAE,0BAA0B;IACvC,QAAQ,EAAE,UAAU;IACpB,IAAI,EAAE,OAAO;CACd,CAAC;AAEF,MAAM,UAAU,kBAAkB,CAAC,GAAqB,EAAE,OAAgC;IACxF,GAAG,CAAC,GAAG,CAAC,aAAa,EAAE,CAAC,CAAC,EAAE,EAAE;QAC3B,MAAM,MAAM,GAAG,iBAAiB,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC;QACvD,OAAO,OAAO,CAAC,MAAM,CAAC,CAAC,EAAE,eAAe,CAAC,YAAY,EAAE;YACrD,OAAO,EAAE,aAAa;YACtB,KAAK,EAAE,cAAc;YACrB,OAAO,EAAE,UAAU;YACnB,EAAE,EAAE,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC;YAC3B,SAAS,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,KAAK,CAAC,IAAI,KAAK,MAAM,CAAC,CAAC,MAAM;YACjE,KAAK,EAAE,KAAK;YACZ,IAAI,EAAE,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,CAAC,OAAO,EAAE,CAAC,GAAG,CAAC,GAAG,CAAC;SAC9C,CAAC,CAAC;IACL,CAAC,CAAC,CAAC;AACL,CAAC;AAED,SAAS,GAAG,CAAC,KAAmB;IAM9B,IAAI,KAAK,CAAC,IAAI,KAAK,IAAI,EAAE,CAAC;QACxB,OAAO;YACL,EAAE,EAAE,KAAK,CAAC,EAAE;YACZ,IAAI,EAAE,aAAa;YACnB,MAAM,EACJ,KAAK,CAAC,EAAE,KAAK,QAAQ,CAAC,CAAC,CAAC,yCAAyC,CAAC,CAAC,CAAC,qBAAqB;YAC3F,EAAE,EAAE,EAAE;SACP,CAAC;IACJ,CAAC;IACD,IAAI,KAAK,CAAC,IAAI,KAAK,KAAK,EAAE,CAAC;QACzB,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,EAAE,MAAM,EAAE,sBAAsB,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC;IACrF,CAAC;IACD,OAAO,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,IAAI,EAAE,EAAE,EAAE,KAAK,CAAC,EAAE,EAAE,CAAC;AAC3F,CAAC"}
+{"version":3,"file":"dev-mode.js","sourceRoot":"","sources":["../../src/admin/dev-mode.ts"],"names":[],"mappings":"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"}