@ofidj/generator-fidj 3.19.0 → 3.20.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.19.0",
-    "@ofidj/node": "^3.19.0"
+    "@ofidj/entry": "^3.20.0",
+    "@ofidj/node": "^3.20.0"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

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

@@ -1,4 +1,4 @@
-import {signInErrorMessage, formatDate, agreementRequired, agreementFromRefusal, verificationPending, pollVerification, rememberSignIn, forgetSignIn, signInHint, type SigninShape} from "@ofidj/entry";
+import {signInErrorMessage, formatDate, agreementRequired, agreementFromRefusal, agreementAddress, type ServiceAgreement, 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, bindMemberHistory, oidcInteractionMarkup, oidcInteractionStyles, bindOidcInteraction} from "@ofidj/entry/dom";
 import {openProviderWindow, relayProviderAnswer, type ProviderWindow} from "@ofidj/entry/window";
 import { FidjNodeService, FidjOidcClient } from "@ofidj/node";
@@ -41,7 +41,7 @@ let signInEmail = "";
 let signInPassword = "";
 // The agreement this app is owed, once the API has said so, and the address a
 // just-created account is waiting on. Only one of them is ever set.
-let pendingAgreement: {version: string; text: string} | null = null;
+let pendingAgreement: ServiceAgreement | null = null;
 let awaitingVerification = "";
 let verificationResent = false;
 let verificationNotice = "";
@@ -704,7 +704,7 @@ function render() {
   // form's place rather than sitting under it: the credentials were accepted,
   // and what is left is a decision about this app.
   if (pendingAgreement && element("signin")) {
-    element("signin")!.innerHTML = agreementScreen(config.title, pendingAgreement, `${config.apiEndpoint}/apps/${encodeURIComponent(config.appId)}/agreements/${encodeURIComponent(pendingAgreement.version || "")}`);
+    element("signin")!.innerHTML = agreementScreen(config.title, pendingAgreement, agreementAddress(config.apiEndpoint, config.appId, pendingAgreement));
     bindAgreementScreen(element<HTMLFormElement>("signin"));
   }
   // The app's own form, for whoever came to type a password. Folded away rather
@@ -897,7 +897,12 @@ async function readAgreement() {
       agreement.version &&
       typeof agreement?.text === "string" &&
       agreement.text
-      ? {version: agreement.version, text: agreement.text}
+      ? {
+          version: agreement.version,
+          text: agreement.text,
+          ...(typeof agreement.language === "string" ? {language: agreement.language} : {}),
+          ...(typeof agreement.href === "string" ? {href: agreement.href} : {}),
+        }
       : null;
   } catch {
     return null;
@@ -1041,10 +1046,11 @@ function accountRows() {
 
 function privacyBlock() {
   const version = String((consent as Record<string, unknown>).termsVersion || "");
+  const href = (consent as Record<string, unknown>).termsHref;
   return memberCard({
     consent,
     history,
-    agreementHref: `${config.apiEndpoint}/apps/${encodeURIComponent(config.appId)}/agreements/${encodeURIComponent(version)}`,
+    agreementHref: agreementAddress(config.apiEndpoint, config.appId, {version, href: typeof href === "string" ? href : undefined}),
     owner: roles.includes("Owner"),
     leaving,
     manageHref: `${config.dashboardUrl}/#/my/gdpr`,

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

@@ -1,4 +1,4 @@
-import {agreementRequired, agreementFromRefusal, signInErrorMessage, rememberSignIn, forgetSignIn, formatDate, type SigninShape} from "@ofidj/entry";
+import {agreementRequired, agreementFromRefusal, agreementAddress, type ServiceAgreement, signInErrorMessage, rememberSignIn, forgetSignIn, formatDate, type SigninShape} from "@ofidj/entry";
 import {acceptedAgreement, agreementScreen, memberCard, bindMemberHistory, bindAgreementScreen, bindPasswordReveal, providerEntry, showEmailEntry, showVersionBadge} from "@ofidj/entry/dom";
 import {openProviderWindow, relayProviderAnswer, type ProviderWindow} from "@ofidj/entry/window";
 import { FidjNodeService, FidjOidcClient } from "@ofidj/node";
@@ -30,7 +30,7 @@ let settings: Settings;
 let session: Session | null = null;
 let notes: Note[] = [];
 let privacy: {
-  consent: Record<string, boolean>;
+  consent: Record<string, boolean> & {termsVersion?: string; termsHref?: string};
   history: Array<{ type: string; granted: boolean; changedAt: string }>;
 } | null = null;
 let view = "workspace";
@@ -42,7 +42,7 @@ let signInEmail = "";
 let signInPassword = "";
 // The agreement this app is owed, once the API has said so. There is no
 // account creation here, so there is no verification wait to hold either.
-let pendingAgreement: {version: string; text: string} | null = null;
+let pendingAgreement: ServiceAgreement | null = null;
 // Whether the person asked for the app's own form: the entry is rebuilt on every
 // render, and a refused sign-in is a render, so it has to be remembered or the
 // form folds away under the complaint about it.
@@ -219,7 +219,10 @@ function render() {
           consent: privacy?.consent || {},
           history: privacy?.history || [],
           agreementHref: privacy?.consent.termsVersion
-            ? `${settings.apiEndpoint}/apps/${encodeURIComponent(settings.appId)}/agreements/${encodeURIComponent(String(privacy.consent.termsVersion))}`
+            ? agreementAddress(settings.apiEndpoint, settings.appId, {
+                version: String(privacy.consent.termsVersion),
+                href: privacy.consent.termsHref,
+              })
             : undefined,
           owner: session.roles.includes("Owner"),
           leaving,
@@ -232,7 +235,7 @@ function render() {
   <footer>Built with Fidj · One identity. Separate choices for every app.</footer></main>`;
   // The agreement takes the form's place once the API says this app is owed one.
   if (pendingAgreement && el("signin")) {
-    el("signin")!.innerHTML = agreementScreen(settings.title, pendingAgreement, `${settings.apiEndpoint}/apps/${encodeURIComponent(settings.appId)}/agreements/${encodeURIComponent(pendingAgreement.version || "")}`);
+    el("signin")!.innerHTML = agreementScreen(settings.title, pendingAgreement, agreementAddress(settings.apiEndpoint, settings.appId, pendingAgreement));
     bindAgreementScreen(el<HTMLFormElement>("signin"));
   }
   // The app's own form, folded away under the Fidj door rather than beside it.

package/package.json

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