@ofidj/generator-fidj 1.4.1 → 1.5.0

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

@@ -274,6 +274,16 @@ function startModule() {
   }
 }
 function render() {
+  // Leaving the provider's screen is a hash change, and a hash change does not
+  // reload the document: without this the shell kept its interaction state and
+  // drew that screen again over an address that no longer named one — the
+  // person asked to leave and stayed put.
+  if (interactionId && !addressedInteraction()) {
+    interactionId = "";
+    interactionError = "";
+    interaction = null;
+    interactionFailed = false;
+  }
   // Once the mounted app owns the document the shell cannot draw over it, and
   // its own router will try to match addresses that were never its business.
   // So any address it does not own means starting the document again — checked
@@ -397,7 +407,9 @@ function render() {
       config.title,
       config.appId,
       config.ownCredentials ? credentialFields() : "",
+      isFidjItself,
     );
+
   element("forget-hint")?.addEventListener("click", () => {
     forgetSignIn(config.appId);
     render();
@@ -578,6 +590,22 @@ const refusals: Record<string, string> = {
   refused: "That could not be completed. Please try again.",
 };
 
+// Fidj's own front end, told apart by the one fact it already carries: the
+// dashboard it points people to is itself. "Sign in with Fidj" is the right
+// label on an app that is not Fidj; here it names a provider the person is
+// standing in, and hides the form behind a click that only fetches it.
+const isFidjItself = (() => {
+  try {
+    return new URL(config.dashboardUrl).origin === window.location.origin;
+  } catch {
+    return false;
+  }
+})();
+function addressedInteraction() {
+  const query = window.location.hash.slice(2).split("?")[1] || "";
+  return new URLSearchParams(query).get("interaction") || "";
+}
+
 function readInteraction() {
   const query = window.location.hash.slice(2).split("?")[1] || "";
   const parameters = new URLSearchParams(query);

package/generators/app/templates/typescript/src/service-agreement.ts

@@ -108,6 +108,7 @@ export function providerEntry(
   title: string,
   appId: string,
   credentials: string,
+  isFidjItself = false,
 ) {
   const escapeText = (value: unknown) =>
     String(value ?? "").replace(
@@ -123,10 +124,12 @@ export function providerEntry(
     ? `<p class="signin-lead">You signed in here with Fidj before. ${escapeText(title)} accounts are Fidj accounts — continue as yourself, or use another.</p>`
     : both
       ? `<p class="signin-lead">${escapeText(title)} accounts are Fidj accounts. Sign in below, or let Fidj do it on its own page — where this site never sees your password.</p>`
-      : `<p class="signin-lead">${escapeText(title)} accounts are Fidj accounts. You will sign in — or create yours — on Fidj's own page, so this site never sees your password.</p>`;
+      : isFidjItself
+        ? `<p class="signin-lead">One account across every app that uses Fidj, and a separate set of choices for each one. Sign in, or create yours, on the next screen.</p>`
+        : `<p class="signin-lead">${escapeText(title)} accounts are Fidj accounts. You will sign in — or create yours — on Fidj's own page, so this site never sees your password.</p>`;
   const fidj = hint
     ? `<button class="primary" type="submit" name="entry" value="fidj">Continue as ${escapeText(hint)}</button><button type="button" id="forget-hint" class="quiet">Use a different account</button>`
-    : `<button class="${both ? "secondary" : "primary"}" type="submit" name="entry" value="fidj">Sign in with Fidj</button>`;
+    : `<button class="${both ? "secondary" : "primary"}" type="submit" name="entry" value="fidj">${isFidjItself ? "Sign in" : "Sign in with Fidj"}</button>`;
   if (!both) return lead + agreementMarkup() + fidj;
   // Both doors. A remembered address puts Fidj first because it is one tap; no
   // memory puts the form first, because that is what the person came to do.

package/package.json

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