@ofidj/entry 3.10.0

package/LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 fidj
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

package/README.md

@@ -0,0 +1,66 @@
+# @ofidj/entry
+
+The Fidj entry, as a package: the sign-in and account screens, the service
+agreement, the provider window and the design system. One implementation, shared
+by Fidj's own console, every generated app and mleweb.
+
+Read the [workspace README](../README.md) for the product target and
+[AGENTS.md](../AGENTS.md) for the working rules. The flow these screens
+implement is [Entry: one flow, the same everywhere](../README.md#entry-one-flow-the-same-everywhere).
+
+## Why it exists
+
+These files used to live only in `generator-fidj`'s template, which meant the
+only way to ship them was to generate an app. Fidj's own console was therefore
+generated too — `fidj-app` built as a module, wrapped by the generator, published
+from `.gen/fidj/www` — and you could not tell from `fidj-app/src` what
+`fidj.ovh` actually draws. The alternative, keeping a second Angular copy in
+step by hand, is what produced four unguarded copies of the service agreement.
+
+A package is the third answer: the console imports the same code a generated app
+renders, so there is one implementation and no hand-porting.
+
+## Use it
+
+```sh
+npm install @ofidj/entry
+```
+
+```ts
+import { providerEntry, bindAgreement, acceptedAgreement } from "@ofidj/entry";
+import "@ofidj/entry/tokens.css";
+import "@ofidj/entry/style.css";
+```
+
+`tokens.css` defines every colour, family and radius the product paints with;
+nothing else may introduce a literal. `fonts.css` is shipped separately because
+each consumer serves its own font files and the `url()`s differ by one path
+prefix.
+
+## What is here, and what is not
+
+Moved, and covered by characterization tests in `test/`:
+
+| Module                                 | What it holds                                                                                                      |
+| -------------------------------------- | ------------------------------------------------------------------------------------------------------------------ |
+| `service-agreement.ts`                 | the agreement block and its loading, `providerEntry`'s three shapes, the remembered address, sign-in error wording |
+| `provider-window.ts`                   | the Fidj window and the answer it relays back                                                                      |
+| `version.ts`                           | the `fidj@<version>` badge                                                                                         |
+| `tokens.css`, `fonts.css`, `style.css` | the design system                                                                                                  |
+
+Still in `generator-fidj`'s template, and next to move: the screens inside
+`content.ts` — the sign-in entry, `#/forgot`, `#/reset`, `#/verify`, `#/account`
+and the Fidj-hosted OIDC interaction page. They import `app.config.json`
+directly, so they move behind a config argument rather than verbatim.
+
+**The generator has not switched over yet.** Its template still carries its own
+copies and builds from them, so a change made here reaches nobody until that
+lands. `test/no-drift-from-the-generator.test.mjs` fails while the two disagree,
+and is deleted in the same change that deletes the generator's copies.
+
+## Release
+
+This package joins [the one release series](../README.md#one-release-series-for-every-ofidj-package)
+and publishes from `./dist` when its `package` branch is pushed. It sits after
+`@ofidj/contracts` and `@ofidj/node` and before `@ofidj/generator-fidj` in the
+dependency chain, because the generator and the console both consume it.

package/fonts.css

@@ -0,0 +1,92 @@
+/* The design system's typefaces, self-hosted.
+ *
+ * A generated site has to stay statically hostable, and an app that sells
+ * privacy should not hand a third party a request log on every sign-in. Latin
+ * and latin-ext only; other scripts fall back to the stack in tokens.css.
+ *
+ * The url()s are runtime paths relative to the built main.css, not bundle
+ * inputs — the files ride along in public/ and esbuild leaves them external.
+ * A consumer that serves the same tokens from somewhere else (fidj-app mounts
+ * its console under /module/) writes its own @font-face block instead.
+ */
+
+@font-face {
+  font-family: "IBM Plex Sans";
+  font-style: normal;
+  font-weight: 400 600;
+  font-display: swap;
+  src: url("fonts/IBMPlexSans-400_600-latin.woff2") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "IBM Plex Sans";
+  font-style: normal;
+  font-weight: 400 600;
+  font-display: swap;
+  src: url("fonts/IBMPlexSans-400_600-latin-ext.woff2") format("woff2");
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7,
+    U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "IBM Plex Mono";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url("fonts/IBMPlexMono-400-latin.woff2") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "IBM Plex Mono";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url("fonts/IBMPlexMono-400-latin-ext.woff2") format("woff2");
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7,
+    U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "IBM Plex Mono";
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url("fonts/IBMPlexMono-500-latin.woff2") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "IBM Plex Mono";
+  font-style: normal;
+  font-weight: 500;
+  font-display: swap;
+  src: url("fonts/IBMPlexMono-500-latin-ext.woff2") format("woff2");
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7,
+    U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}
+@font-face {
+  font-family: "Instrument Serif";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url("fonts/InstrumentSerif-400-latin.woff2") format("woff2");
+  unicode-range: U+0000-00FF, U+0131, U+0152-0153, U+02BB-02BC, U+02C6, U+02DA,
+    U+02DC, U+0304, U+0308, U+0329, U+2000-206F, U+20AC, U+2122, U+2191, U+2193,
+    U+2212, U+2215, U+FEFF, U+FFFD;
+}
+@font-face {
+  font-family: "Instrument Serif";
+  font-style: normal;
+  font-weight: 400;
+  font-display: swap;
+  src: url("fonts/InstrumentSerif-400-latin-ext.woff2") format("woff2");
+  unicode-range: U+0100-02BA, U+02BD-02C5, U+02C7-02CC, U+02CE-02D7,
+    U+02DD-02FF, U+0304, U+0308, U+0329, U+1D00-1DBF, U+1E00-1E9F, U+1EF2-1EFF,
+    U+2020, U+20A0-20AB, U+20AD-20C0, U+2113, U+2C60-2C7F, U+A720-A7FF;
+}

package/index.d.ts

@@ -0,0 +1,3 @@
+export { agreementMarkup, acceptedAgreement, signInErrorMessage, bindAgreement, providerEntry, signInHint, rememberSignIn, forgetSignIn, showEmailEntry, type SigninShape, } from "./service-agreement.js";
+export { openProviderWindow, relayProviderAnswer, type ProviderWindow, } from "./provider-window.js";
+export { showVersionBadge } from "./version.js";

package/index.js

@@ -0,0 +1,11 @@
+// The Fidj entry, in one place.
+//
+// Everything here was lifted verbatim out of generator-fidj's template, where
+// it could only ship by being generated. It is a package now so that the
+// console can import the same screens a generated app renders, instead of the
+// two being kept in step by hand — which is how the service agreement ended up
+// existing in four copies that no test could diff.
+export { agreementMarkup, acceptedAgreement, signInErrorMessage, bindAgreement, providerEntry, signInHint, rememberSignIn, forgetSignIn, showEmailEntry, } from "./service-agreement.js";
+export { openProviderWindow, relayProviderAnswer, } from "./provider-window.js";
+export { showVersionBadge } from "./version.js";
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoiaW5kZXguanMiLCJzb3VyY2VSb290IjoiIiwic291cmNlcyI6WyIuLi9zcmMvaW5kZXgudHMiXSwibmFtZXMiOltdLCJtYXBwaW5ncyI6IkFBQUEsZ0NBQWdDO0FBQ2hDLEVBQUU7QUFDRiw4RUFBOEU7QUFDOUUseUVBQXlFO0FBQ3pFLDhFQUE4RTtBQUM5RSwrRUFBK0U7QUFDL0UsbURBQW1EO0FBQ25ELE9BQU8sRUFDTCxlQUFlLEVBQ2YsaUJBQWlCLEVBQ2pCLGtCQUFrQixFQUNsQixhQUFhLEVBQ2IsYUFBYSxFQUNiLFVBQVUsRUFDVixjQUFjLEVBQ2QsWUFBWSxFQUNaLGNBQWMsR0FFZixNQUFNLHdCQUF3QixDQUFDO0FBQ2hDLE9BQU8sRUFDTCxrQkFBa0IsRUFDbEIsbUJBQW1CLEdBRXBCLE1BQU0sc0JBQXNCLENBQUM7QUFDOUIsT0FBTyxFQUFFLGdCQUFnQixFQUFFLE1BQU0sY0FBYyxDQUFDIn0=

package/package.json

@@ -0,0 +1,35 @@
+{
+  "name": "@ofidj/entry",
+  "version": "3.10.0",
+  "description": "The Fidj entry: sign-in, account recovery, the service agreement and the design system, shared verbatim by Fidj, the generated apps and the console.",
+  "license": "MIT",
+  "publishConfig": {
+    "access": "public"
+  },
+  "type": "module",
+  "main": "./index.js",
+  "types": "./index.d.ts",
+  "exports": {
+    ".": {
+      "types": "./index.d.ts",
+      "default": "./index.js"
+    },
+    "./tokens.css": "./tokens.css",
+    "./fonts.css": "./fonts.css",
+    "./style.css": "./style.css"
+  },
+  "scripts": {
+    "build": "rm -rf dist && tsc --project tsconfig.json && cp src/*.css dist/ && cp *.md LICENSE dist/ && cp package.json dist/",
+    "test": "npm run build && node --test test/*.test.mjs",
+    "bp:style:fix": "prettier --write \"src/**/*.ts\" \"test/**/*.mjs\" --no-error-on-unmatched-pattern"
+  },
+  "devDependencies": {
+    "jsdom": "^25.0.1",
+    "prettier": "^3.3.3",
+    "typescript": "^5.6.3"
+  },
+  "repository": {
+    "type": "git",
+    "url": "git+https://github.com/ofidj/fidj-entry.git"
+  }
+}

package/provider-window.d.ts

@@ -0,0 +1,9 @@
+export type ProviderWindow = {
+    show(url: string): void;
+    isOpen(): boolean;
+    focus(): void;
+    giveUp(): void;
+    answer(): Promise<URL | null>;
+};
+export declare function openProviderWindow(): ProviderWindow | null;
+export declare function relayProviderAnswer(): boolean;

package/provider-window.js

@@ -0,0 +1,165 @@
+// Signing in happens in a window of its own.
+//
+// Fidj's screens are served from another origin — Fidj's front end, or the API
+// itself, depending on the deployment — and that origin refuses to be framed,
+// so no dialog drawn inside this page can hold them. A window can, and it keeps
+// the page the person was already on: they come back to what they were reading,
+// not to a shell that reloaded underneath them and forgot where they were.
+//
+// The window is opened empty and synchronously, before anything is awaited. A
+// window opened after an await is a window the browser no longer connects to
+// the click that asked for it, and every popup blocker refuses it — so the
+// authorization URL, which takes a discovery round-trip to build, is fetched
+// afterwards and navigated into a window that already exists.
+// One window per page, not one per browser.
+//
+// Naming it is what lets a second press reuse the window instead of stacking
+// another one on top, and that much is wanted. Sharing the name across tabs is
+// not: the answer comes back to whichever page opened the window, so a second
+// tab reusing the first tab's window would hand that tab's sign-in to a page
+// that never asked, and leave the one that did waiting forever. Stable for this
+// document, unique to it.
+const WINDOW_NAME = "fidj-signin-" + Math.random().toString(36).slice(2, 10);
+const CALLBACK = "fidj:oidc-callback";
+// Comfortable rather than minimal: the provider asks for a password, states who
+// is asking and where the person is going back to, and a cramped window turns
+// that into scrolling. Clamped to the screen so a small display still gets a
+// window it can show whole, and centred on the display the opener is on.
+function features() {
+    const width = Math.min(560, Math.max(320, window.screen.availWidth - 80));
+    const height = Math.min(760, Math.max(480, window.screen.availHeight - 80));
+    const left = Math.round((window.screenX || 0) + Math.max(0, (window.outerWidth - width) / 2));
+    const top = Math.round((window.screenY || 0) + Math.max(0, (window.outerHeight - height) / 3));
+    return `popup=yes,width=${width},height=${height},left=${left},top=${top},resizable=yes,scrollbars=yes`;
+}
+export function openProviderWindow() {
+    let opened = null;
+    try {
+        opened = window.open("", WINDOW_NAME, features());
+    }
+    catch {
+        opened = null;
+    }
+    // Blocked, or a browser that refuses named windows. The caller falls back to
+    // leaving this page, which is the flow this one replaced.
+    if (!opened)
+        return null;
+    try {
+        opened.document.write('<!doctype html><meta charset="utf-8"><title>Signing in with Fidj</title><body style="margin:0;font:15px/1.5 system-ui;color:#4a4540;display:grid;place-items:center;height:100vh">Opening Fidj…</body>');
+        opened.document.close();
+    }
+    catch { }
+    return {
+        show(url) {
+            // `replace`, so the blank placeholder is not a history entry the person
+            // can press Back into.
+            try {
+                opened.location.replace(url);
+            }
+            catch {
+                opened.location.href = url;
+            }
+        },
+        isOpen() {
+            try {
+                return !opened.closed;
+            }
+            catch {
+                return false;
+            }
+        },
+        focus() {
+            try {
+                opened.focus();
+            }
+            catch { }
+        },
+        giveUp() {
+            try {
+                opened.close();
+            }
+            catch { }
+        },
+        answer() {
+            return new Promise((resolve) => {
+                let done = false;
+                const finish = (result) => {
+                    if (done)
+                        return;
+                    done = true;
+                    window.removeEventListener("message", onMessage);
+                    window.clearInterval(watch);
+                    try {
+                        opened.close();
+                    }
+                    catch { }
+                    resolve(result);
+                };
+                const onMessage = (event) => {
+                    // Only this origin, and only the window this entry opened: the
+                    // callback carries a single-use authorization code, and anything else
+                    // posting into this page is not part of this conversation.
+                    if (event.origin !== window.location.origin)
+                        return;
+                    if (event.source !== opened)
+                        return;
+                    const data = event.data;
+                    if (!data || data.fidj !== CALLBACK || typeof data.href !== "string")
+                        return;
+                    let callback;
+                    try {
+                        callback = new URL(data.href);
+                    }
+                    catch {
+                        return;
+                    }
+                    if (callback.origin !== window.location.origin)
+                        return;
+                    finish(callback);
+                };
+                window.addEventListener("message", onMessage);
+                // A window closed by hand answers nothing, and nothing is what this
+                // page would wait for forever otherwise. `closed` is the only signal a
+                // cross-origin window gives, so it is polled.
+                const watch = window.setInterval(() => {
+                    if (opened.closed)
+                        finish(null);
+                }, 400);
+            });
+        },
+    };
+}
+// The other half, running in that window: the provider has just answered into
+// it, and its only remaining job is to hand the answer back and get out of the
+// way. It never completes the sign-in itself — the transaction that has to
+// match the answer was written by the page that opened it, and session storage
+// is copied into a new window, not shared with it.
+//
+// Answering `true` means the hand-off was made and this window asked to close;
+// the caller shows one line and, if the browser refuses to close a window it
+// did not see scripted open, finishes the sign-in here after all.
+export function relayProviderAnswer() {
+    let opener = null;
+    try {
+        opener = window.opener;
+    }
+    catch {
+        return false;
+    }
+    if (!opener || opener === window || opener.closed)
+        return false;
+    if (!new URL(window.location.href).searchParams.has("state"))
+        return false;
+    try {
+        opener.postMessage({ fidj: CALLBACK, href: window.location.href }, window.location.origin);
+    }
+    catch {
+        return false;
+    }
+    try {
+        window.close();
+    }
+    catch { }
+    return true;
+}
+//# sourceMappingURL=data:application/json;base64,eyJ2ZXJzaW9uIjozLCJmaWxlIjoicHJvdmlkZXItd2luZG93LmpzIiwic291cmNlUm9vdCI6IiIsInNvdXJjZXMiOlsiLi4vc3JjL3Byb3ZpZGVyLXdpbmRvdy50cyJdLCJuYW1lcyI6W10sIm1hcHBpbmdzIjoiQUFBQSw2Q0FBNkM7QUFDN0MsRUFBRTtBQUNGLCtFQUErRTtBQUMvRSw4RUFBOEU7QUFDOUUsZ0ZBQWdGO0FBQ2hGLGdGQUFnRjtBQUNoRiwyRUFBMkU7QUFDM0UsRUFBRTtBQUNGLDhFQUE4RTtBQUM5RSw2RUFBNkU7QUFDN0UsMkVBQTJFO0FBQzNFLDZFQUE2RTtBQUM3RSw4REFBOEQ7QUFFOUQsNENBQTRDO0FBQzVDLEVBQUU7QUFDRiw2RUFBNkU7QUFDN0UsK0VBQStFO0FBQy9FLDhFQUE4RTtBQUM5RSw2RUFBNkU7QUFDN0UsZ0ZBQWdGO0FBQ2hGLDBCQUEwQjtBQUMxQixNQUFNLFdBQVcsR0FBRyxjQUFjLEdBQUcsSUFBSSxDQUFDLE1BQU0sRUFBRSxDQUFDLFFBQVEsQ0FBQyxFQUFFLENBQUMsQ0FBQyxLQUFLLENBQUMsQ0FBQyxFQUFFLEVBQUUsQ0FBQyxDQUFDO0FBQzdFLE1BQU0sUUFBUSxHQUFHLG9CQUFvQixDQUFDO0FBRXRDLGdGQUFnRjtBQUNoRiw4RUFBOEU7QUFDOUUsNkVBQTZFO0FBQzdFLHlFQUF5RTtBQUN6RSxTQUFTLFFBQVE7SUFDZixNQUFNLEtBQUssR0FBRyxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxJQUFJLENBQUMsR0FBRyxDQUFDLEdBQUcsRUFBRSxNQUFNLENBQUMsTUFBTSxDQUFDLFVBQVUsR0FBRyxFQUFFLENBQUMsQ0FBQyxDQUFDO0lBQzFFLE1BQU0sTUFBTSxHQUFHLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLElBQUksQ0FBQyxHQUFHLENBQUMsR0FBRyxFQUFFLE1BQU0sQ0FBQyxNQUFNLENBQUMsV0FBVyxHQUFHLEVBQUUsQ0FBQyxDQUFDLENBQUM7SUFDNUUsTUFBTSxJQUFJLEdBQUcsSUFBSSxDQUFDLEtBQUssQ0FD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

package/service-agreement.d.ts

@@ -0,0 +1,13 @@
+export declare function agreementMarkup(): string;
+export declare function acceptedAgreement(form: HTMLFormElement): {
+    termsAccepted: boolean;
+    termsVersion: string;
+} | null;
+export declare function signInErrorMessage(error: unknown): "Too many attempts. Please wait before trying again." | "We could not sign in to this account. Check the email and password." | "An account already uses this email. Check the password or sign in instead." | "We cannot reach Fidj right now. Please try again." | "We could not sign in to this account. Please try again.";
+export declare function bindAgreement(form: HTMLFormElement | null, title: string, endpoint: string, appId: string, checked?: boolean): Promise<void>;
+export declare function signInHint(appId: string): string;
+export declare function rememberSignIn(appId: string, label: string): void;
+export declare function forgetSignIn(appId: string): void;
+export type SigninShape = "button" | "inline" | "both";
+export declare function providerEntry(title: string, appId: string, credentials: string, isFidjItself?: boolean, shape?: SigninShape): string;
+export declare function showEmailEntry(open: boolean, focus?: boolean): void;

package/service-agreement.js

@@ -0,0 +1,184 @@
+export function agreementMarkup() {
+    return `<div class="signin-agreement"><label class="agreement-choice"><input id="service-agreement" type="checkbox" aria-required="true" disabled><span id="agreement-label">I accept the service agreement for this app.</span></label><button type="button" id="read-agreement" disabled>Read service agreement</button><p id="agreement-status" class="fineprint" role="status">Loading service agreement…</p><button type="button" id="retry-agreement" hidden>Retry</button></div><dialog id="agreement-dialog" aria-labelledby="agreement-heading"><h2 id="agreement-heading">Service agreement</h2><p id="agreement-version"></p><p id="agreement-text"></p><button type="button" id="close-agreement">Close agreement</button></dialog>`;
+}
+export function acceptedAgreement(form) {
+    const checkbox = form.querySelector("#service-agreement");
+    if (!checkbox?.checked || checkbox.disabled || !checkbox.dataset.version)
+        return null;
+    return { termsAccepted: true, termsVersion: checkbox.dataset.version };
+}
+export function signInErrorMessage(error) {
+    const detail = error;
+    const reason = typeof detail?.reason === "string" ? detail.reason : typeof detail?.message === "string" ? detail.message : "";
+    if (detail?.code === 429)
+        return "Too many attempts. Please wait before trying again.";
+    if (reason === "unknown-user")
+        return "We could not sign in to this account. Check the email and password.";
+    if (reason === "already exists - inconsistent request")
+        return "An account already uses this email. Check the password or sign in instead.";
+    if (/ECONNREFUSED|ENOTFOUND|ETIMEDOUT|ECONNRESET|EHOSTUNREACH|network/i.test(reason))
+        return "We cannot reach Fidj right now. Please try again.";
+    return "We could not sign in to this account. Please try again.";
+}
+export async function bindAgreement(form, title, endpoint, appId, checked = false) {
+    if (!form)
+        return;
+    // An app whose only door is Fidj carries no agreement block: Fidj asks for
+    // this app's agreement on the screen that names it, and records the version.
+    const checkbox = form.querySelector("#service-agreement");
+    if (!checkbox)
+        return;
+    const read = form.querySelector("#read-agreement");
+    const dialog = form.querySelector("#agreement-dialog");
+    const status = form.querySelector("#agreement-status");
+    const retry = form.querySelector("#retry-agreement");
+    // What this agreement gates is the app's own door, and only that one. The
+    // Fidj door is about to be asked the same question on the screen that names
+    // the app, where the answer is recorded with its version — so an agreement
+    // that is still loading, or that could not be loaded at all, must not be what
+    // stands between a person and the door that does not need it.
+    const gated = form.querySelector("#email-entry") || form;
+    const submitButtons = gated.querySelectorAll('button[type="submit"]');
+    const update = () => submitButtons.forEach(button => { button.disabled = checkbox.disabled; });
+    form.querySelector("#agreement-label").textContent = `I accept the service agreement for ${title}.`;
+    update();
+    checkbox.addEventListener("change", update);
+    read.addEventListener("click", () => dialog.showModal());
+    form.querySelector("#close-agreement").addEventListener("click", () => dialog.close());
+    const load = async () => {
+        retry.hidden = true;
+        status.textContent = "Loading service agreement…";
+        try {
+            const response = await fetch(`${endpoint}/apps/${encodeURIComponent(appId)}`, { signal: AbortSignal.timeout(10000) });
+            if (!response.ok)
+                throw new Error(response.status === 404 ? "missing" : "unreachable");
+            const agreement = (await response.json()).app?.agreement;
+            if (!agreement || typeof agreement.version !== "string" || !agreement.version || typeof agreement.text !== "string" || !agreement.text)
+                throw new Error("missing");
+            if (!form.isConnected)
+                return;
+            checkbox.dataset.version = agreement.version;
+            checkbox.disabled = false;
+            checkbox.checked = checked;
+            read.disabled = false;
+            dialog.querySelector("#agreement-version").textContent = `Version ${agreement.version}`;
+            dialog.querySelector("#agreement-text").textContent = agreement.text;
+            status.textContent = "Required to sign in. Optional data choices stay separate.";
+            update();
+        }
+        catch (error) {
+            if (!form.isConnected)
+                return;
+            status.textContent = error instanceof Error && error.message === "missing"
+                ? "This app has no service agreement available."
+                : "We cannot reach Fidj right now. Try again.";
+            retry.hidden = false;
+        }
+    };
+    retry.addEventListener("click", load);
+    await load();
+}
+// The entry every app that delegates to the provider renders, in one place
+// because both app shapes render it and they had drifted apart.
+//
+// "Continue with Fidj" alone borrows the grammar of an optional social login —
+// that button always sits next to an email and a password — so on an app whose
+// accounts *are* Fidj accounts, the missing form reads as something broken. The
+// explanation therefore comes before the button, not as reassurance after it,
+// and nothing presupposes an account the person may not have yet.
+const hintKey = (appId) => "fidj.entry." + appId;
+export function signInHint(appId) {
+    try {
+        return localStorage.getItem(hintKey(appId)) || "";
+    }
+    catch {
+        return "";
+    }
+}
+// Remembered on this app's own origin, about this app's own member: no
+// cross-site question is asked, and none is answered. Signing out forgets, so a
+// shared browser does not show the next person an address.
+export function rememberSignIn(appId, label) {
+    try {
+        if (label)
+            localStorage.setItem(hintKey(appId), label);
+    }
+    catch { }
+}
+export function forgetSignIn(appId) {
+    try {
+        localStorage.removeItem(hintKey(appId));
+    }
+    catch { }
+}
+export function providerEntry(title, appId, credentials, isFidjItself = false, shape = "button") {
+    const escapeText = (value) => String(value ?? "").replace(/[&<>"']/g, (char) => ({ "&": "&amp;", "<": "&lt;", ">": "&gt;", '"': "&quot;", "'": "&#39;" })[char]);
+    const hint = signInHint(appId);
+    const both = shape === "both" && Boolean(credentials);
+    // The app's own form and nothing else. Nothing is folded away because there is
+    // no second way in to fold it under, and the trade-off is stated plainly:
+    // on this path it is this site that holds the password.
+    if (shape === "inline")
+        return (`<p class="signin-lead">${isFidjItself
+            ? "One account across every app that uses Fidj, and a separate set of choices for each one."
+            : `${escapeText(title)} accounts are Fidj accounts. Sign in below — ${escapeText(title)} handles your password itself on this page.`}</p>` +
+            agreementMarkup() +
+            credentials);
+    const lead = hint
+        ? `<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. Fidj asks in a window of its own, 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. Fidj asks in a window of its own; this page stays where it is.</p>`
+                : `<p class="signin-lead">${escapeText(title)} accounts are Fidj accounts. You will sign in — or create yours — in a Fidj window, so this site never sees your password.</p>`;
+    // The accent is the Fidj mark, and this is the one control on the screen that
+    // is Fidj's rather than the app's. It is also the door the app would rather
+    // people took, and those two happen to want the same thing.
+    const fidj = hint
+        ? `<button class="primary fidj-entry" 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="primary fidj-entry" type="submit" name="entry" value="fidj">${isFidjItself ? "Sign in" : "Sign in with Fidj"}</button>`;
+    // Fidj is the only door: it collects the agreement itself, a moment later, on
+    // the screen that names the app — and records it with its version. Collecting
+    // it here first recorded nothing and asked the same question twice.
+    if (shape !== "both" || !both)
+        return lead + fidj;
+    // Both doors. The app's own one is a second thought for the person who wants
+    // it, which is what a disclosure is for: it costs one click and takes nothing
+    // away, where a second button of equal weight cost everybody a decision.
+    return (lead +
+        fidj +
+        `<div class="signin-alternate"><button type="button" id="use-email" class="signin-toggle" aria-expanded="false" aria-controls="email-entry"><span class="signin-toggle-label">Inline form<span class="caret" aria-hidden="true"></span></span></button>
+  <div id="email-entry" hidden>${agreementMarkup()}${credentials}</div></div>`);
+}
+// Opening the app's own form takes the space the Fidj door was using.
+//
+// The two are alternatives, not a list, and watching one fold away as the other
+// arrives is what says so — where a form appearing underneath a button that is
+// still there reads as "and also". The toggle stays put through both states, so
+// it ends up labelling whichever one is on screen: a caret pointing down at a
+// form that is not here yet, and up at the one it would put away.
+//
+// Shared, because both app shapes render the same entry.
+export function showEmailEntry(open, focus = false) {
+    const fields = document.getElementById("email-entry");
+    const toggle = document.getElementById("use-email");
+    if (!fields || !toggle)
+        return;
+    toggle.setAttribute("aria-expanded", String(open));
+    fields.hidden = !open;
+    const door = document.querySelector(".fidj-entry");
+    if (door) {
+        door.classList.toggle("is-folded", open);
+        // Out of the tab order and out of the accessibility tree the moment it
+        // starts leaving: something mid-fold is not something to press, and an
+        // animation is not what decides that.
+        if (open)
+            door.setAttribute("aria-hidden", "true");
+        else
+            door.removeAttribute("aria-hidden");
+        door.tabIndex = open ? -1 : 0;
+    }
+    if (open && focus)
+        document.getElementById("email")?.focus();
+}
+//# sourceMappingURL=data:application/json;base64,{"version":3,"file":"service-agreement.js","sourceRoot":"","sources":["../src/service-agreement.ts"],"names":[],"mappings":"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"}