@ofidj/generator-fidj 1.7.3 → 3.7.3

package/README.md

@@ -62,7 +62,16 @@ a style change lands here first.
 
 Generation writes `.env.example`, `.env` and public `app.config.json`. Static configuration is embedded at build time: regenerate/rebuild when changing endpoints. Notes server configuration is read at runtime. Do not place secrets in any public configuration or content input.
 
-For unpublished coordinated changes, build the sibling SDK and pass `--sdk-path` with its absolute `dist` path. Committed templates use registry dependency `@ofidj/node ^3.6.24`; a registry-only install is not validated until coordinated versions are published.
+For unpublished coordinated changes, build the sibling SDK and pass `--sdk-path` with its absolute `dist` path. Committed templates use registry dependency `@ofidj/node ^3.7.3`; a registry-only install is not validated until coordinated versions are published.
+
+Every generated app carries a fixed bottom-right badge naming the Fidj it runs:
+`fidj@<version>`, taken from the SDK it was generated with — the `--sdk-path`
+build when one is supplied, the template's `@ofidj/node` range otherwise — and
+written to `APP_VERSION` and `app.config.json`. On Fidj's own apps it also shows
+the version `/v3/status` answers with, so the two can be compared without
+translation. Keep that range on the version this generator releases: the
+workspace's `scripts/check-versions.py` and this package's own suite both refuse
+the mismatch.
 
 ## Real validation repository
 

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

@@ -15,7 +15,7 @@
     "privacy:rehearse": "npm run build && node --test test/server.test.mjs"
   },
   "dependencies": {
-    "@ofidj/node": "^3.6.26"
+    "@ofidj/node": "^3.7.3"
   },
   "devDependencies": {
     "@types/node": "^22.0.0",

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

@@ -437,7 +437,14 @@ function render() {
     askedProvider = true;
     void (async () => {
       if (!(await providerRendersHere())) return;
-      window.location.assign(await oidc.beginLogin());
+      // Being recognised again is the one thing somebody who just signed out did
+      // not ask for, and this shortcut is what made a sign-out undoable by a page
+      // reload. Ending the provider session is what should make that impossible,
+      // and that call can be refused — so here the screen asks rather than
+      // assumes, until somebody signs in again.
+      window.location.assign(
+        await oidc.beginLogin(oidc.signedOutHere() ? { prompt: "login" } : {}),
+      );
     })();
   }
 

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

@@ -1,9 +1,9 @@
 export function showVersionBadge(version: string, apiEndpoint?: string): void {
-  if (!/^\d{2}\.\d{2}\.\d{2}$/.test(version || "")) return;
+  if (!/^\d+\.\d+\.\d+(-[\w.]+)?$/.test(version || "")) return;
   const badge = document.createElement("div");
   badge.className = "fidj-version";
-  badge.setAttribute("aria-label", `App version ${version}`);
-  badge.textContent = `v${version}`;
+  badge.setAttribute("aria-label", `Fidj version ${version}`);
+  badge.textContent = `fidj@${version}`;
   document.body.append(badge);
   if (apiEndpoint) {
     void fetch(`${apiEndpoint.replace(/\/$/, "")}/status`)
@@ -11,8 +11,8 @@ export function showVersionBadge(version: string, apiEndpoint?: string): void {
       .then(status => {
         const apiVersion = status?.version || status?.built;
         if (!apiVersion) return;
-        badge.textContent = `v${version} · API ${apiVersion}`;
-        badge.setAttribute("aria-label", `App version ${version}, API version ${apiVersion}`);
+        badge.textContent = `fidj@${version} · API ${apiVersion}`;
+        badge.setAttribute("aria-label", `Fidj version ${version}, API version ${apiVersion}`);
       })
       .catch(() => undefined);
   }

package/lib/scaffold.cjs

@@ -135,6 +135,10 @@ function scaffold(destination, options) {
     fs.readFileSync(path.join(dir, "package.json"), "utf8"),
   );
   pkg.name = name;
+  // The badge says which Fidj the app is running, so the version comes from the
+  // SDK the app will actually carry: the local build when one is supplied, the
+  // published range otherwise. A date told nobody which API it could talk to.
+  let releaseVersion = pkg.dependencies["@ofidj/node"].replace(/^[\^~]/, "");
   if (options.sdkPath) {
     const sdkPath = path.resolve(options.sdkPath);
     const sdk = JSON.parse(
@@ -142,6 +146,7 @@ function scaffold(destination, options) {
     );
     if (sdk.name !== "@ofidj/node")
       throw new Error("SDK path must contain a built @ofidj/node package.");
+    releaseVersion = sdk.version;
     pkg.dependencies["@ofidj/node"] = "file:" + sdkPath;
   }
   fs.writeFileSync(
@@ -149,7 +154,6 @@ function scaffold(destination, options) {
     JSON.stringify(pkg, null, 2) + "\n",
   );
   fs.renameSync(path.join(dir, "gitignore"), path.join(dir, ".gitignore"));
-  const releaseVersion = new Date().toISOString().slice(2, 10).replaceAll("-", ".");
   // The app's own server serves this to its page: the entry cannot redirect to
   // a provider it was never told about.
   const issuerSetting = options.oidcIssuer ? `FIDJ_OIDC_ISSUER=${options.oidcIssuer}\n` : "";

package/package.json

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