@ofidj/generator-fidj 3.16.0 → 3.18.0

package/generators/app/templates/typescript/package.json

@@ -15,8 +15,8 @@
     "privacy:rehearse": "npm run build && node --test test/server.test.mjs"
   },
   "dependencies": {
-    "@ofidj/entry": "^3.16.0",
-    "@ofidj/node": "^3.16.0"
+    "@ofidj/entry": "^3.18.0",
+    "@ofidj/node": "^3.18.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

package/generators/app/templates/typescript/src/content.ts

@@ -1,5 +1,5 @@
-import {signInErrorMessage, agreementRequired, agreementFromRefusal, verificationPending, pollVerification, rememberSignIn, forgetSignIn, signInHint, type SigninShape} from "@ofidj/entry";
-import {agreementScreen, bindAgreementScreen, bindPasswordReveal, acceptedAgreement, verificationWait, providerEntry, showEmailEntry, showVersionBadge, escape, masthead, highlightCells, badgeStrip, credentialFields, accountForm, passkeySupported, passkeyAssertion, walletDoor, oidcInteractionMarkup, oidcInteractionStyles, bindOidcInteraction} from "@ofidj/entry/dom";
+import {signInErrorMessage, formatDate, agreementRequired, agreementFromRefusal, verificationPending, pollVerification, rememberSignIn, forgetSignIn, signInHint, type SigninShape} from "@ofidj/entry";
+import {agreementScreen, bindAgreementScreen, bindPasswordReveal, acceptedAgreement, verificationWait, providerEntry, showEmailEntry, showVersionBadge, escape, masthead, highlightCells, badgeStrip, credentialFields, accountForm, passkeySupported, passkeyAssertion, walletDoor, memberCard, oidcInteractionMarkup, oidcInteractionStyles, bindOidcInteraction} from "@ofidj/entry/dom";
 import {openProviderWindow, relayProviderAnswer, type ProviderWindow} from "@ofidj/entry/window";
 import { FidjNodeService, FidjOidcClient } from "@ofidj/node";
 import config from "../app.config.json";
@@ -330,7 +330,10 @@ const PUBLIC_ROUTE = "pub";
 // spinner's worth of ceremony, and it says what it is doing.
 let recognising = false;
 function mightBeRecognised() {
-  if (!oidc || !isFidjItself) return false;
+  // Fidj itself, or an app this browser signed in to before: its session lives
+  // in the tab, so a new tab would otherwise draw "Continue as …" for somebody
+  // Fidj still recognises.
+  if (!oidc || !(isFidjItself || signInHint(config.appId))) return false;
   if ((moduleRoute() || "").split("/")[0] === PUBLIC_ROUTE) return false;
   // Not on a screen somebody was sent to by a link.
   //
@@ -354,7 +357,12 @@ function mightBeRecognised() {
 }
 
 async function askWhetherFidjKnowsThisBrowser() {
-  if (!oidc || !isFidjItself || sdk.isLoggedIn() || oidc.signedOutHere())
+  if (
+    !oidc ||
+    !(isFidjItself || signInHint(config.appId)) ||
+    sdk.isLoggedIn() ||
+    oidc.signedOutHere()
+  )
     return false;
   if ((moduleRoute() || "").split("/")[0] === PUBLIC_ROUTE) return false;
   // Not on a screen somebody was sent to by a link.
@@ -404,16 +412,16 @@ function signInThroughProvider(
   void action(async () => {
     let url: string;
     try {
-      // Being recognised again is the one thing somebody who has just signed
-      // out did not ask for, and skipping this is what let a sign-out be undone
-      // by pressing the door again: the provider still knew the browser and
-      // answered with a code, no screen at all. Ending the provider session is
-      // what should make that impossible, and that call can be refused — so the
-      // door asks rather than assumes, until somebody signs in again.
+      // Somebody who has just signed out of this app did not ask to be walked
+      // straight back in: the provider still knows the browser and would answer
+      // with a code and no screen. So the door asks which account — the consent
+      // screen names the one Fidj recognises and offers another. It does not ask
+      // for a password: prompt=login told Fidj "this is not me" and ended the
+      // Fidj session along with the app's.
       url = await oidc.beginLogin(
         options.prompt || options.silent || !oidc.signedOutHere()
           ? options
-          : {...options, prompt: "login"},
+          : {...options, prompt: "consent"},
       );
     } catch (error) {
       providerWindow?.giveUp();
@@ -603,7 +611,7 @@ function render() {
     // The two ways out, last and together: back to the app, or out of this
     // session. Leaving the app itself is a different decision and stays where
     // the things it erases are listed.
-    root.innerHTML = `<section class="content-account">${profileSummary()}<div class="card profile-body">${banner()}${accountForm("account", {linkToken, verificationConfirmed, emailVerified, accountEmail}, {compact: true})}${privacyBlock()}</div></section>`;
+    root.innerHTML = `<section class="content-account">${profileSummary()}<div class="card profile-body">${banner()}${emailVerified ? accountRows() : accountForm("account", {linkToken, verificationConfirmed, emailVerified, accountEmail}, {compact: true})}${privacyBlock()}</div></section>`;
     renderNav("account");
     wireAccount("account");
     wireSignOut();
@@ -909,13 +917,15 @@ function wirePrivacy() {
         navigate("signin");
       }),
   );
-  element("terms")?.addEventListener(
+  element("accept-terms")?.addEventListener(
     "click",
     () =>
       void action(async () => {
+        // The version published now is the version recorded.
+        const agreement = await readAgreement();
         await request(appPath + "/consents", "PUT", {
           terms: true,
-          cguVersion: "starter-demo-1",
+          ...(agreement ? {cguVersion: agreement.version} : {}),
           source: "profile",
         });
         await refresh();
@@ -984,27 +994,22 @@ function wirePrivacy() {
 // about it. It used to be a screen of its own called My privacy, one tab
 // away from the account it was about — so a person looking for their own
 // data had two places to try and no way to tell which.
+// The account, once there is nothing left to verify: one line, and the way to
+// change it, which is on Fidj — the account is Fidj's, not this app's.
+function accountRows() {
+  return `<div class="member-rows"><div class="member-row"><div><strong>Email</strong><small>${escape(accountEmail)} · verified</small></div><a href="${escape(config.dashboardUrl)}/#/my/profile" target="_blank" rel="noopener noreferrer">Manage on Fidj ↗</a></div></div>`;
+}
+
 function privacyBlock() {
-  return `<h2>What ${escape(config.title)} holds</h2><p>Roles: ${roles.map(escape).join(" · ") || "No assigned roles"}</p><button id="refresh">Refresh access</button>
-  <p>These choices apply only to this app.${config.allowAnonymous ? " You can also view the public content by entering anonymously." : ""}</p>
-  <p>Service agreement: ${consent.terms ? "Accepted" : "Not recorded"}. ${consent.terms ? "Leaving withdraws this agreement." : 'This generated example uses a demo agreement. <button id="terms">Accept demo agreement</button>'}</p>
-  ${["analytics", "communications", "optionalData"].map((key, i) => `<label class="toggle"><span>${["Analytics", "Communications", "Optional data"][i]}</span><input type="checkbox" data-purpose="${key}" ${consent[key] ? "checked" : ""}></label>`).join("")}
-  <h3>Consent history</h3>${
-    history.length
-      ? history
-          .slice()
-          .reverse()
-          .map(
-            (entry) =>
-              `<p>${escape(entry.type)} · ${entry.granted ? "Accepted" : "Withdrawn"} · ${escape(entry.changedAt)}</p>`,
-          )
-          .join("")
-      : "<p>No changes yet.</p>"
-  }
-  <button id="export">Export</button>
-  <p>This app stores its session in this browser. The export covers Fidj-held records for this membership. There is no separate app database in this static template.</p>
-  ${roles.includes("Owner") ? "<p>Resolve app ownership before leaving.</p>" : leaving ? '<p>Confirm departure: your membership and its Fidj-held data will be removed. Your other apps remain available.</p><button id="confirm-leave" class="danger">Leave &amp; erase</button><button id="cancel-leave">Keep my membership</button>' : '<button id="leave" class="danger">Leave &amp; erase</button>'}
-  <p class="leaving"><a href="${escape(config.dashboardUrl)}/#/my" target="_blank" rel="noopener">Open Fidj to manage every app you use ↗</a><br><small>Fidj is the account provider behind ${escape(config.title)}. This opens it in a new tab; you stay signed in here.</small></p>`;
+  const version = String((consent as Record<string, unknown>).termsVersion || "");
+  return memberCard({
+    consent,
+    history,
+    agreementHref: `${config.apiEndpoint}/apps/${encodeURIComponent(config.appId)}/agreements/${encodeURIComponent(version)}`,
+    owner: roles.includes("Owner"),
+    leaving,
+    manageHref: `${config.dashboardUrl}/#/my/gdpr`,
+  });
 }
 
 // ------------------------------------------------ signing in, for the provider
@@ -1031,6 +1036,10 @@ type Interaction = {
   agreement?: {version: string; text: string} | null;
   // Who the consent screen recognises, as the provider names them.
   recognisedEmail?: string;
+  // The passkey door's challenge, on the login step.
+  passkey?: {ticket: string; options: unknown};
+  // The recognised person's agreement is on file at the version in force.
+  agreementAccepted?: boolean;
   action: string;
 };
 let interactionId = "";
@@ -1155,6 +1164,8 @@ function interactionScreen() {
     // The agreement is a document read in the browser, like the privacy notice.
     agreementHref: details.termsUri || undefined,
     recognisedEmail: details.recognisedEmail || undefined,
+    passkey: details.passkey,
+    agreementAccepted: details.agreementAccepted,
     logoSrc: "./fidj-logo.png",
   })}`;
   bindOidcInteraction(root);

package/generators/app/templates/typescript/src/main.ts

@@ -1,5 +1,5 @@
-import {agreementRequired, agreementFromRefusal, signInErrorMessage, rememberSignIn, forgetSignIn, type SigninShape} from "@ofidj/entry";
-import {acceptedAgreement, agreementScreen, bindAgreementScreen, bindPasswordReveal, providerEntry, showEmailEntry, showVersionBadge} from "@ofidj/entry/dom";
+import {agreementRequired, agreementFromRefusal, signInErrorMessage, rememberSignIn, forgetSignIn, formatDate, type SigninShape} from "@ofidj/entry";
+import {acceptedAgreement, agreementScreen, memberCard, bindAgreementScreen, bindPasswordReveal, providerEntry, showEmailEntry, showVersionBadge} from "@ofidj/entry/dom";
 import {openProviderWindow, relayProviderAnswer, type ProviderWindow} from "@ofidj/entry/window";
 import { FidjNodeService, FidjOidcClient } from "@ofidj/node";
 import "@ofidj/entry/style.css";
@@ -223,19 +223,19 @@ function render() {
   <nav><button id="workspace-tab" class="${view === "workspace" ? "selected" : ""}">My notes</button><button id="privacy-tab" class="${view === "privacy" ? "selected" : ""}">My privacy</button><button id="refresh">Refresh access</button></nav>
   ${
     view === "workspace"
-      ? `<section class="workspace"><div><div class="section-heading"><h2>Your notes</h2><span>${notes.length} saved</span></div>${notes.length ? notes.map((note) => `<article class="card note"><small>${escape(new Date(note.createdAt).toLocaleString())}</small><h3>${escape(note.title)}</h3><p>${escape(note.body)}</p></article>`).join("") : `<article class="card empty"><span>✳</span><h3>Room for your next idea.</h3><p>Your saved notes will appear here. Only you can read your notes.</p></article>`}</div><form id="note" class="card"><p class="eyebrow">CAPTURE SOMETHING</p><h2>A fresh note</h2><p>${canWrite ? "You have permission to save notes." : "Ask your app owner for Editor access to save notes."}</p><label for="note-title">Title</label><input id="note-title" maxlength="120" required ${!canWrite ? "disabled" : ""}><label for="note-body">Your note</label><textarea id="note-body" rows="6" maxlength="5000" ${!canWrite ? "disabled" : ""}></textarea><button class="primary" type="submit" ${!canWrite ? "disabled" : ""}>Save note</button><small>Your notes are saved by this app and survive a server restart.</small></form></section>`
-      : `<section class="privacy-grid"><article class="card"><p class="eyebrow">ONLY ${escape(settings.title).toUpperCase()}</p><h2>Your choices in this app</h2><p>These preferences are independent of Fidj and your other apps.</p><div class="agreement"><strong>Service agreement</strong><span>${privacy?.consent.terms ? "Accepted" : "Not recorded"}</span>${!privacy?.consent.terms ? '<p>This starter uses a demo agreement. Accept it to record your choice.</p><button id="accept-terms">Accept demo agreement</button>' : "<p>Leaving this app withdraws its required agreement.</p>"}</div>${["analytics", "communications", "optionalData"].map((key, index) => `<label class="toggle"><span><strong>${["Analytics", "Communications", "Optional data"][index]}</strong><small>${["Help improve this app.", "Receive optional news and updates.", "Allow data beyond the essential service."][index]}</small></span><input type="checkbox" data-purpose="${key}" ${privacy?.consent[key] ? "checked" : ""}></label>`).join("")}<button id="export">Export</button></article><article class="card"><h2>Consent history</h2>${
-          privacy?.history.length
-            ? privacy.history
-                .slice()
-                .reverse()
-                .map(
-                  (entry) =>
-                    `<p><strong>${escape(entry.type)}</strong> · ${entry.granted ? "Accepted" : "Withdrawn"}<br><small>${escape(new Date(entry.changedAt).toLocaleString())}</small></p>`,
-                )
-                .join("")
-            : "<p>No changes yet.</p>"
-        }<hr><h2>Leave this app</h2><p>This removes your app membership and this starter’s notes. Your Fidj account and other memberships remain.</p>${session.roles.includes("Owner") ? "<p>As the app owner, resolve ownership before leaving.</p>" : leaving ? '<div role="alertdialog" aria-labelledby="leave-title"><h3 id="leave-title">Confirm departure</h3><p>Your membership, consent and notes in this app will be removed. Your Fidj account and other apps remain available.</p><button id="confirm-leave" class="danger">Leave &amp; erase</button><button id="cancel-leave">Keep my membership</button></div>' : '<button id="leave" class="danger">Leave &amp; erase</button>'}<p class="fineprint">Exports here include your Fidj membership and this starter’s notes. The registered app-data handler lets Fidj export and erase these notes too. If cleanup is pending, retry from My privacy on Fidj. Minimal completion receipts are retained; backups and unregistered systems are outside this operation.</p></article></section>`
+      ? `<section class="workspace"><div><div class="section-heading"><h2>Your notes</h2><span>${notes.length} saved</span></div>${notes.length ? notes.map((note) => `<article class="card note"><small>${escape(formatDate(note.createdAt, "datetime"))}</small><h3>${escape(note.title)}</h3><p>${escape(note.body)}</p></article>`).join("") : `<article class="card empty"><span>✳</span><h3>Room for your next idea.</h3><p>Your saved notes will appear here. Only you can read your notes.</p></article>`}</div><form id="note" class="card"><p class="eyebrow">CAPTURE SOMETHING</p><h2>A fresh note</h2><p>${canWrite ? "You have permission to save notes." : "Ask your app owner for Editor access to save notes."}</p><label for="note-title">Title</label><input id="note-title" maxlength="120" required ${!canWrite ? "disabled" : ""}><label for="note-body">Your note</label><textarea id="note-body" rows="6" maxlength="5000" ${!canWrite ? "disabled" : ""}></textarea><button class="primary" type="submit" ${!canWrite ? "disabled" : ""}>Save note</button><small>Your notes are saved by this app and survive a server restart.</small></form></section>`
+      : `<section class="card privacy-card">${memberCard({
+          consent: privacy?.consent || {},
+          history: privacy?.history || [],
+          agreementHref: privacy?.consent.termsVersion
+            ? `${settings.apiEndpoint}/apps/${encodeURIComponent(settings.appId)}/agreements/${encodeURIComponent(String(privacy.consent.termsVersion))}`
+            : undefined,
+          owner: session.roles.includes("Owner"),
+          leaving,
+          leaveScope:
+            "Your membership, your choices and your notes in this app will be erased. Your Fidj account and other apps remain available.",
+          manageHref: `${settings.dashboardUrl}/#/my/gdpr`,
+        })}</section>`
   }`
   }
   <footer>Built with Fidj · One identity. Separate choices for every app.</footer></main>`;
@@ -348,7 +348,7 @@ function render() {
       void action(async () => {
         await api("privacy", "PUT", { terms: true });
         await load();
-        notice = "Demo agreement accepted.";
+        notice = "Service agreement accepted.";
       }),
   );
   el("export")?.addEventListener(

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ofidj/generator-fidj",
-  "version": "3.16.0",
+  "version": "3.18.0",
   "description": "Generate a TypeScript app with Fidj sign-in, live server-side roles and per-app privacy.",
   "homepage": "https://fidj.ovh",
   "bugs": {