@ofidj/generator-fidj 3.10.1 → 3.10.2

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

@@ -325,6 +325,22 @@ const RECOGNITION_ASKED = "fidj.oidc.recognition-asked";
 // for. Asking there sent an anonymous visitor to the provider and back, and what
 // they had asked to read never rendered.
 const PUBLIC_ROUTE = "pub";
+// Whether the question is still outstanding. Drawing the credential form and
+// then navigating to the provider loses whatever somebody had begun typing, so
+// the entry waits instead — the answer takes one redirect, not a wait worth a
+// spinner's worth of ceremony, and it says what it is doing.
+let recognising = false;
+function mightBeRecognised() {
+  if (!oidc || !isFidjItself) return false;
+  if ((moduleRoute() || "").split("/")[0] === PUBLIC_ROUTE) return false;
+  if (oidc.signedOutHere()) return false;
+  try {
+    return sessionStorage.getItem(RECOGNITION_ASKED) !== "true";
+  } catch {
+    return false;
+  }
+}
+
 async function askWhetherFidjKnowsThisBrowser() {
   if (!oidc || !isFidjItself || sdk.isLoggedIn() || oidc.signedOutHere())
     return false;
@@ -582,6 +598,10 @@ function render() {
     renderNav("content");
     return;
   }
+  if (recognising) {
+    root.innerHTML = `<section class="signin-shell"><div class="signin-form"><p role="status">Checking whether you are already signed in to Fidj…</p></div></section>`;
+    return;
+  }
   // Only the entry reaches here now: the privacy screen and the account
   // screen became one, and that one is drawn above.
   root.innerHTML = `<section class="signin-shell"><div class="signin-intro${config.highlights?.length ? "" : " is-plain"}"><header class="signin-masthead"><img class="app-mark" src="${escape(config.logo)}" alt=""><strong>${escape(config.title)}</strong></header>
@@ -1119,6 +1139,7 @@ if (relayProviderAnswer()) {
 
 function boot() {
   window.addEventListener("hashchange", render);
+  recognising = mightBeRecognised();
   render();
   if (readInteraction()) {
     render();
@@ -1167,6 +1188,7 @@ function boot() {
       apiEndpoint: config.apiEndpoint,
       prod: !config.localDemo,
     });
+    recognising = recognising && !sdk.isLoggedIn();
     if (sdk.isLoggedIn()) {
       await refresh();
       if (!moduleRoute() && !accountRoutes.includes(currentRoute()))
@@ -1174,6 +1196,8 @@ function boot() {
       return;
     }
     // Nothing held here. Fidj may still know this browser from an app.
-    await askWhetherFidjKnowsThisBrowser();
+    if (await askWhetherFidjKnowsThisBrowser()) return;
+    recognising = false;
+    render();
   });
 }

package/package.json

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