@owlmeans/web-client 0.1.18-rc.2 → 0.1.18-rc.21

package/build/login/surrogate.js

@@ -0,0 +1,144 @@
+import { adoptToken, clearSurrogate, markSurrogate, revokeToken, surrogatePath, LoginIntent, LoginOutcome, LOGIN_LOGOUT_MESSAGE, LOGIN_SURROGATE_FEATURES, LOGIN_SURROGATE_NAME, LOGIN_TOKEN_MESSAGE, } from '@owlmeans/client-auth/login';
+import { SURROGATE_LOGIN, SURROGATE_LOGIN_PRIORITY } from './consts.js';
+import { awaitSurrogate } from './pump.js';
+/**
+ * Login for a document that cannot complete the flow where it is.
+ *
+ * An app embedded in a frame cannot redirect to an identity provider: the provider refuses to be
+ * embedded (`frame-ancestors`), and its session cookies are third-party there. So the flow runs
+ * one window up, in a surrogate window that is top-level and first-party on this application's own
+ * origin — where the very same flow completes normally — and the token is passed back to the
+ * document that asked for it.
+ *
+ * This plugin is deliberately not OIDC-specific. The mechanic is "run the login route one window
+ * up and hand the token back", and the adoption is the plain auth service, so any relying party
+ * that renders a login route gets it by registering nothing.
+ *
+ * `match` covers BOTH halves of the lifecycle — the framed opener and the surrogate itself, where
+ * `embedded` is false. Inside the surrogate the redirect plugin must not win: that window IS
+ * top-level, so it authorizes by an ordinary redirect and differs only in what it does with the
+ * token at the end.
+ */
+export const makeSurrogateLoginPlugin = () => {
+    /**
+     * Give the token to whoever is entitled to it, and get out of the way.
+     *
+     * Shared by `complete` (a token was just issued here) and `resume` (one was already here),
+     * because what happens to it is the same in both cases and only the question differs.
+     */
+    const handBack = async (token, env) => {
+        if (!env.surrogate) {
+            // This document started the flow and finished it in place — it already has what it needs.
+            return LoginOutcome.Passed;
+        }
+        if (!env.hasOpener) {
+            // Authenticated with nowhere to send it. `Cross-Origin-Opener-Policy: same-origin` from the
+            // provider severs `window.opener` permanently, so this is not a timing problem to retry.
+            return LoginOutcome.Orphaned;
+        }
+        clearSurrogate();
+        // Both windows are the same origin (the surrogate is this application's own login route), so
+        // the origin is pinned rather than passed as `*` — the message carries a bearer token.
+        window.opener.postMessage({ type: LOGIN_TOKEN_MESSAGE, token }, window.location.origin);
+        window.close();
+        return LoginOutcome.Handled;
+    };
+    const plugin = {
+        alias: SURROGATE_LOGIN,
+        priority: SURROGATE_LOGIN_PRIORITY,
+        mode: 'surrogate',
+        match: env => env.hasWindow && (env.embedded || env.surrogate),
+        enter: () => { markSurrogate(); },
+        begin: (ctx, request, env) => {
+            // Already one window up — nothing to open, just run the flow.
+            if (env.surrogate) {
+                window.location.href = request.url;
+                return Promise.resolve(LoginOutcome.Redirected);
+            }
+            // Opened FIRST and synchronously: `window.open` escapes the popup blocker only while the
+            // user gesture is still being handled, so nothing may be awaited before this line. That is
+            // why this function is not `async`.
+            //
+            // The window opens on the surrogate route rather than on the dispatcher, so its very first
+            // paint is a bare "signing you in" panel instead of the application with its navigation. The
+            // dispatcher address travels as `next`, because the provider's callback still lands there and
+            // whatever flow parameters the caller's URL carried must survive the hop.
+            const path = surrogatePath(ctx, {
+                intent: LoginIntent.Login, next: request.url,
+            });
+            const surrogate = window.open(path ?? request.url, LOGIN_SURROGATE_NAME, LOGIN_SURROGATE_FEATURES);
+            if (surrogate == null) {
+                return Promise.resolve(LoginOutcome.Failed);
+            }
+            return awaitSurrogate(surrogate, LOGIN_TOKEN_MESSAGE, async (data) => {
+                if (data.token == null || data.token === '') {
+                    return LoginOutcome.Failed;
+                }
+                await adoptToken(ctx, data.token);
+                // Adopting the token is not the end of the flow — running the caller's continuation is,
+                // exactly as the redirect plugin does before it reports `Handled`. Without it the token
+                // lands in the auth service and nothing else happens: the framed app keeps rendering its
+                // signed-out tree, and the user watches the login window close over a preview that never
+                // changes. `Handled` promises the caller there is nothing left to do.
+                await request.navigate?.();
+                return LoginOutcome.Handled;
+            });
+        },
+        authorize: async (_ctx, url, env) => {
+            // The surrogate is top-level, so it redirects like any ordinary tab.
+            if (env.surrogate) {
+                window.location.href = url;
+                return LoginOutcome.Redirected;
+            }
+            // Framed, and not yet one window up. A redirect from here would land in the frame and be
+            // refused, and the window that would fix it cannot be opened without a user gesture — so the
+            // caller is told to render a control rather than to navigate.
+            return LoginOutcome.Gesture;
+        },
+        complete: async (_ctx, token, env) => await handBack(token, env),
+        // A session that was already here is worth exactly as much as one just issued — to the window
+        // that asked for it. Without this the surrogate would render the signed-in application to
+        // itself and the framed app would stay signed out, which is the whole reported defect.
+        resume: async (_ctx, token, env) => await handBack(token, env),
+        logout: (ctx, request, env) => {
+            // Already one window up — end the session here and tell the opener.
+            if (env.surrogate) {
+                return revokeToken(ctx)
+                    .then(async () => await plugin.logoutComplete(ctx, env));
+            }
+            const path = surrogatePath(ctx, { intent: LoginIntent.Logout });
+            // Opened first and synchronously, for the same reason `begin` does.
+            const surrogate = path != null
+                ? window.open(path, LOGIN_SURROGATE_NAME, LOGIN_SURROGATE_FEATURES)
+                : null;
+            // The local session goes next, and UNCONDITIONALLY. A blocked window, a severed opener or a
+            // user who closes the popup must never leave THIS document signed in: a logout that only
+            // half happened is bad, and one that did not happen at all is worse.
+            const local = revokeToken(ctx);
+            if (surrogate == null) {
+                return local.then(async () => {
+                    await request.navigate?.();
+                    return LoginOutcome.Failed;
+                });
+            }
+            return local.then(async () => await awaitSurrogate(surrogate, LOGIN_LOGOUT_MESSAGE, async () => {
+                await request.navigate?.();
+                return LoginOutcome.Handled;
+            }));
+        },
+        logoutComplete: async (_ctx, env) => {
+            if (!env.surrogate) {
+                return LoginOutcome.Passed;
+            }
+            if (!env.hasOpener) {
+                return LoginOutcome.Orphaned;
+            }
+            clearSurrogate();
+            window.opener.postMessage({ type: LOGIN_LOGOUT_MESSAGE, ok: true }, window.location.origin);
+            window.close();
+            return LoginOutcome.Handled;
+        },
+    };
+    return plugin;
+};
+//# sourceMappingURL=surrogate.js.map

package/build/login/surrogate.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"surrogate.js","sourceRoot":"","sources":["../../src/login/surrogate.ts"],"names":[],"mappings":"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"}

package/build/login/view.d.ts

@@ -0,0 +1,26 @@
+import type { FC } from 'react';
+import { LoginIntent } from '@owlmeans/client-auth/login';
+/** What the surrogate window is doing, from the point of view of the person watching it. */
+export declare enum SurrogateStage {
+    /** Working. No control — there is nothing for the user to do but wait. */
+    Working = "working",
+    /** Needs a click: the flow cannot continue without a fresh gesture. */
+    Gesture = "gesture",
+    /** Done here; handing the result back and closing. */
+    Handing = "handing",
+    /** Acted, but with no channel back to the window that asked. */
+    Orphaned = "orphaned",
+    /** Ended with nothing. */
+    Failed = "failed",
+    /** Not a surrogate at all — someone opened this address directly. */
+    Standalone = "standalone"
+}
+export interface SurrogateViewProps {
+    stage: SurrogateStage;
+    intent: LoginIntent;
+    onAction?: () => void;
+    error?: string;
+    translate?: (key: string, defaultValue: string) => string;
+}
+export declare const LoginSurrogateView: FC<SurrogateViewProps>;
+//# sourceMappingURL=view.d.ts.map

package/build/login/view.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.d.ts","sourceRoot":"","sources":["../../src/login/view.tsx"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAiB,EAAE,EAAE,MAAM,OAAO,CAAA;AAC9C,OAAO,EAAE,WAAW,EAAE,MAAM,6BAA6B,CAAA;AAEzD,4FAA4F;AAC5F,oBAAY,cAAc;IACxB,0EAA0E;IAC1E,OAAO,YAAY;IACnB,uEAAuE;IACvE,OAAO,YAAY;IACnB,sDAAsD;IACtD,OAAO,YAAY;IACnB,gEAAgE;IAChE,QAAQ,aAAa;IACrB,0BAA0B;IAC1B,MAAM,WAAW;IACjB,qEAAqE;IACrE,UAAU,eAAe;CAC1B;AAED,MAAM,WAAW,kBAAkB;IACjC,KAAK,EAAE,cAAc,CAAA;IACrB,MAAM,EAAE,WAAW,CAAA;IACnB,QAAQ,CAAC,EAAE,MAAM,IAAI,CAAA;IACrB,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,SAAS,CAAC,EAAE,CAAC,GAAG,EAAE,MAAM,EAAE,YAAY,EAAE,MAAM,KAAK,MAAM,CAAA;CAC1D;AAoDD,eAAO,MAAM,kBAAkB,EAAE,EAAE,CAAC,kBAAkB,CAgBrD,CAAA"}

package/build/login/view.js

@@ -0,0 +1,73 @@
+import { jsx as _jsx, jsxs as _jsxs } from "react/jsx-runtime";
+import { LoginIntent } from '@owlmeans/client-auth/login';
+/** What the surrogate window is doing, from the point of view of the person watching it. */
+export var SurrogateStage;
+(function (SurrogateStage) {
+    /** Working. No control — there is nothing for the user to do but wait. */
+    SurrogateStage["Working"] = "working";
+    /** Needs a click: the flow cannot continue without a fresh gesture. */
+    SurrogateStage["Gesture"] = "gesture";
+    /** Done here; handing the result back and closing. */
+    SurrogateStage["Handing"] = "handing";
+    /** Acted, but with no channel back to the window that asked. */
+    SurrogateStage["Orphaned"] = "orphaned";
+    /** Ended with nothing. */
+    SurrogateStage["Failed"] = "failed";
+    /** Not a surrogate at all — someone opened this address directly. */
+    SurrogateStage["Standalone"] = "standalone";
+})(SurrogateStage || (SurrogateStage = {}));
+/**
+ * The whole of what a login window shows.
+ *
+ * Plain elements and inline styles on purpose. This renders in a popup opened by a `web-panel` app,
+ * a `mui-panel` app and a generated Tailwind app alike, and none of their stylesheets is loaded
+ * here — a class name would simply do nothing. It is also the reason this component carries no
+ * dependency on a UI family at all.
+ */
+const box = {
+    maxWidth: '22rem', margin: '15vh auto', padding: '1.5rem', textAlign: 'center',
+    fontFamily: 'system-ui, sans-serif', lineHeight: 1.5,
+};
+const action = {
+    marginTop: '1rem', padding: '.625rem 1.25rem', fontSize: '1rem',
+    cursor: 'pointer', borderRadius: '.375rem', border: '1px solid currentColor',
+};
+const COPY = {
+    [SurrogateStage.Working]: { key: 'working', en: 'Signing you in…' },
+    [SurrogateStage.Gesture]: {
+        key: 'gesture.title', en: 'Continue to sign in.', action: ['gesture.action', 'Sign in'],
+    },
+    [SurrogateStage.Handing]: { key: 'handing', en: 'Done. Returning to the application…' },
+    [SurrogateStage.Orphaned]: {
+        key: 'orphaned', en: 'Signed in. You can close this window and continue in the application.',
+        action: ['close', 'Close'],
+    },
+    [SurrogateStage.Failed]: {
+        key: 'failed', en: 'That did not complete. You can close this window and try again.',
+        action: ['close', 'Close'],
+    },
+    [SurrogateStage.Standalone]: {
+        key: 'standalone.title', en: 'This page is used to sign in from another window.',
+        action: ['standalone.action', 'Open the application'],
+    },
+};
+const LOGOUT_COPY = {
+    [SurrogateStage.Working]: { key: 'working', en: 'Signing you out…' },
+    [SurrogateStage.Gesture]: { key: 'gesture.title', en: 'Continue to sign out.' },
+    [SurrogateStage.Handing]: { key: 'handing', en: 'Signed out. Returning to the application…' },
+    [SurrogateStage.Orphaned]: {
+        key: 'orphaned', en: 'Signed out. You can close this window.',
+    },
+    [SurrogateStage.Failed]: {
+        key: 'failed', en: 'Sign-out did not complete here. You can close this window.',
+    },
+};
+export const LoginSurrogateView = ({ stage, intent, onAction, error, translate }) => {
+    const t = translate ?? ((_key, defaultValue) => defaultValue);
+    const scope = intent === LoginIntent.Logout ? 'logout' : 'login';
+    const base = COPY[stage];
+    const copy = (intent === LoginIntent.Logout ? LOGOUT_COPY[stage] : undefined) ?? base;
+    return _jsxs("div", { style: box, "data-surrogate-stage": stage, "data-surrogate-intent": intent, children: [_jsx("p", { children: t(`surrogate.${scope}.${copy.key}`, copy.en) }), error != null && error !== '' &&
+                _jsx("p", { style: { color: '#b00', fontSize: '.875rem' }, role: "alert", children: error }), base.action != null && onAction != null && _jsx("button", { type: "button", style: action, onClick: onAction, children: t(`surrogate.${scope}.${base.action[0]}`, base.action[1]) })] });
+};
+//# sourceMappingURL=view.js.map

package/build/login/view.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"view.js","sourceRoot":"","sources":["../../src/login/view.tsx"],"names":[],"mappings":"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"}

package/build/main.d.ts

@@ -1,5 +1,13 @@
 import type { ReactNode } from 'react';
 import type { AppConfig, AppContext, RenderOptions } from './types.js';
 export declare const render: (node: ReactNode, opts?: RenderOptions) => void;
-export declare const renderApp: <C extends AppConfig, T extends AppContext<C>>(context: T, opts?: RenderOptions) => void;
+/**
+ * Mount the application.
+ *
+ * `children` are rendered inside the context provider and BEFORE the router, which makes them the
+ * app's global overlay slot: a consent dialog, a toast surface, anything that must exist on every
+ * route and outlive navigation. A component mounted inside a route instead is torn down and
+ * rebuilt on every navigation, which for a dialog means it closes itself.
+ */
+export declare const renderApp: <C extends AppConfig, T extends AppContext<C>>(context: T, opts?: RenderOptions, children?: ReactNode) => void;
 //# sourceMappingURL=main.d.ts.map

package/build/main.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGtE,eAAO,MAAM,MAAM,SAAU,SAAS,SAAS,aAAa,SAkB3D,CAAA;AAED,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,WAAW,CAAC,SAAS,aAAa,SAC5D,CAAA"}
+{"version":3,"file":"main.d.ts","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,OAAO,CAAA;AAGtC,OAAO,KAAK,EAAE,SAAS,EAAE,UAAU,EAAE,aAAa,EAAE,MAAM,YAAY,CAAA;AAGtE,eAAO,MAAM,MAAM,GAAI,MAAM,SAAS,EAAE,OAAO,aAAa,SAkB3D,CAAA;AAED;;;;;;;GAOG;AACH,eAAO,MAAM,SAAS,GAAI,CAAC,SAAS,SAAS,EAAE,CAAC,SAAS,UAAU,CAAC,CAAC,CAAC,EACpE,SAAS,CAAC,EAAE,OAAO,aAAa,EAAE,WAAW,SAAS,SACQ,CAAA"}

package/build/main.js

@@ -21,5 +21,13 @@ export const render = (node, opts) => {
     };
     opts?.onReady ?? true ? window.addEventListener('DOMContentLoaded', _callback) : _callback();
 };
-export const renderApp = (context, opts) => render(_jsx(WebApp, { context: context }), opts);
+/**
+ * Mount the application.
+ *
+ * `children` are rendered inside the context provider and BEFORE the router, which makes them the
+ * app's global overlay slot: a consent dialog, a toast surface, anything that must exist on every
+ * route and outlive navigation. A component mounted inside a route instead is torn down and
+ * rebuilt on every navigation, which for a dialog means it closes itself.
+ */
+export const renderApp = (context, opts, children) => render(_jsx(WebApp, { context: context, children: children }), opts);
 //# sourceMappingURL=main.js.map

package/build/main.js.map

@@ -1 +1 @@
-{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAe,EAAE,IAAoB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,EAAE,KAAK,IAAI,YAAY,CAAA;QACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAA;QAC3D,CAAC;QACD,IAAI,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA;IAED,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;AAC9F,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,SAAS,GAAG,CAA+C,OAAU,EAAE,IAAoB,EAAE,EAAE,CAC1G,MAAM,CAAC,KAAC,MAAM,IAAC,OAAO,EAAE,OAAO,GAAI,EAAE,IAAI,CAAC,CAAA"}
+{"version":3,"file":"main.js","sourceRoot":"","sources":["../src/main.tsx"],"names":[],"mappings":";AAEA,OAAO,EAAE,UAAU,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAA;AAC1D,OAAO,EAAE,YAAY,EAAE,MAAM,aAAa,CAAA;AAE1C,OAAO,EAAE,MAAM,EAAE,MAAM,uBAAuB,CAAA;AAE9C,MAAM,CAAC,MAAM,MAAM,GAAG,CAAC,IAAe,EAAE,IAAoB,EAAE,EAAE;IAC9D,MAAM,SAAS,GAAG,GAAG,EAAE;QACrB,MAAM,GAAG,GAAG,IAAI,EAAE,KAAK,IAAI,YAAY,CAAA;QACvC,MAAM,IAAI,GAAG,QAAQ,CAAC,cAAc,CAAC,GAAG,CAAC,CAAA;QACzC,IAAI,IAAI,EAAE,KAAK,EAAE,CAAC;YAChB,OAAO,CAAC,KAAK,CAAC,uBAAuB,GAAG,EAAE,CAAC,CAAA;QAC7C,CAAC;QACD,IAAI,IAAI,IAAI,IAAI,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,mCAAmC,GAAG,EAAE,CAAC,CAAA;QAC3D,CAAC;QACD,IAAI,IAAI,EAAE,OAAO,KAAK,IAAI,EAAE,CAAC;YAC3B,WAAW,CAAC,IAAI,EAAE,IAAI,CAAC,CAAA;QACzB,CAAC;aAAM,CAAC;YACN,UAAU,CAAC,IAAI,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,CAAA;QAC/B,CAAC;IACH,CAAC,CAAA;IAED,IAAI,EAAE,OAAO,IAAI,IAAI,CAAC,CAAC,CAAC,MAAM,CAAC,gBAAgB,CAAC,kBAAkB,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC,SAAS,EAAE,CAAA;AAC9F,CAAC,CAAA;AAED;;;;;;;GAOG;AACH,MAAM,CAAC,MAAM,SAAS,GAAG,CACvB,OAAU,EAAE,IAAoB,EAAE,QAAoB,EACtD,EAAE,CAAC,MAAM,CAAC,KAAC,MAAM,IAAC,OAAO,EAAE,OAAO,YAAG,QAAQ,GAAU,EAAE,IAAI,CAAC,CAAA"}

package/build/middleware.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAQnD,eAAO,MAAM,gBAAgB,EAAE,UAsC9B,CAAA"}
+{"version":3,"file":"middleware.d.ts","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAQnD,eAAO,MAAM,gBAAgB,EAAE,UAuC9B,CAAA"}

package/build/middleware.js

@@ -7,18 +7,19 @@ export const logoutMiddleware = {
     stage: MiddlewareStage.Loading,
     apply: async (context) => {
         context.entrypoints().forEach(module => {
-            if (module.route.route.type === AppType.Backend && module.call != null) {
+            if (module.route.route.type === AppType.Backend && module.invoke != null) {
                 const guards = module.getGuards();
                 if (guards.length > 0) {
                     if (module._auth_web_middleware_applied === true) {
                         return;
                     }
                     module._auth_web_middleware_applied = true;
-                    // const auth = context.service<GuardService>(service)
-                    const call = module.call;
-                    module.call = async (req, res) => {
+                    // Wrapping `invoke` covers `call` too: `call` reads `invoke` off the entrypoint at the
+                    // moment it runs, so a rejected session is caught whichever verb the caller used.
+                    const invoke = module.invoke;
+                    module.invoke = (async (req) => {
                         try {
-                            return await call(req, res);
+                            return await invoke(req);
                         }
                         catch (e) {
                             if (e instanceof Error) {
@@ -35,7 +36,7 @@ export const logoutMiddleware = {
                             }
                             throw e;
                         }
-                    };
+                    });
                 }
             }
         });

package/build/middleware.js.map

@@ -1 +1 @@
-{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGrD,MAAM,CAAC,MAAM,gBAAgB,GAAe;IAC1C,IAAI,EAAE,cAAc,CAAC,OAAO;IAC5B,KAAK,EAAE,eAAe,CAAC,OAAO;IAC9B,KAAK,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;QACrB,OAAO,CAAC,WAAW,EAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,IAAI,IAAI,IAAI,EAAE,CAAC;gBACvE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;gBACjC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACtB,IAAI,MAAM,CAAC,4BAA4B,KAAK,IAAI,EAAE,CAAC;wBACjD,OAAM;oBACR,CAAC;oBACD,MAAM,CAAC,4BAA4B,GAAG,IAAI,CAAA;oBAC1C,sDAAsD;oBACtD,MAAM,IAAI,GAAG,MAAM,CAAC,IAAI,CAAA;oBACxB,MAAM,CAAC,IAAI,GAAG,KAAK,EAAE,GAAG,EAAE,GAAG,EAAE,EAAE;wBAC/B,IAAI,CAAC;4BACH,OAAO,MAAM,IAAI,CAAC,GAAG,EAAE,GAAG,CAAC,CAAA;wBAC7B,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gCACvB,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gCACpC,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;oCAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wCACrC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;4CAClC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,aAAa,CAAC,CAAA;4CACxD,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;4CAC5B,MAAM,GAAG,CAAA;wCACX,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,MAAM,CAAC,CAAA;wBACT,CAAC;oBACH,CAAC,CAAA;gBAEH,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}
+{"version":3,"file":"middleware.js","sourceRoot":"","sources":["../src/middleware.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,cAAc,EAAE,eAAe,EAAE,OAAO,EAAE,MAAM,mBAAmB,CAAA;AAE5E,OAAO,EAAE,WAAW,EAAE,MAAM,gBAAgB,CAAA;AAC5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAA;AAChD,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAGrD,MAAM,CAAC,MAAM,gBAAgB,GAAe;IAC1C,IAAI,EAAE,cAAc,CAAC,OAAO;IAC5B,KAAK,EAAE,eAAe,CAAC,OAAO;IAC9B,KAAK,EAAE,KAAK,EAAC,OAAO,EAAC,EAAE;QACrB,OAAO,CAAC,WAAW,EAAU,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;YAC7C,IAAI,MAAM,CAAC,KAAK,CAAC,KAAK,CAAC,IAAI,KAAK,OAAO,CAAC,OAAO,IAAI,MAAM,CAAC,MAAM,IAAI,IAAI,EAAE,CAAC;gBACzE,MAAM,MAAM,GAAG,MAAM,CAAC,SAAS,EAAE,CAAA;gBACjC,IAAI,MAAM,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;oBACtB,IAAI,MAAM,CAAC,4BAA4B,KAAK,IAAI,EAAE,CAAC;wBACjD,OAAM;oBACR,CAAC;oBACD,MAAM,CAAC,4BAA4B,GAAG,IAAI,CAAA;oBAC1C,uFAAuF;oBACvF,kFAAkF;oBAClF,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAA;oBAC5B,MAAM,CAAC,MAAM,GAAG,CAAC,KAAK,EAAC,GAAG,EAAC,EAAE;wBAC3B,IAAI,CAAC;4BACH,OAAO,MAAM,MAAM,CAAC,GAAG,CAAC,CAAA;wBAC1B,CAAC;wBAAC,OAAO,CAAC,EAAE,CAAC;4BACX,IAAI,CAAC,YAAY,KAAK,EAAE,CAAC;gCACvB,MAAM,GAAG,GAAG,cAAc,CAAC,MAAM,CAAC,CAAC,CAAC,CAAA;gCACpC,IAAI,GAAG,YAAY,WAAW,EAAE,CAAC;oCAC/B,IAAI,GAAG,CAAC,OAAO,CAAC,QAAQ,CAAC,UAAU,CAAC,EAAE,CAAC;wCACrC,IAAI,OAAO,MAAM,KAAK,WAAW,EAAE,CAAC;4CAClC,MAAM,IAAI,GAAG,OAAO,CAAC,OAAO,CAAc,aAAa,CAAC,CAAA;4CACxD,MAAM,IAAI,CAAC,MAAM,CAAC,SAAS,CAAC,CAAA;4CAC5B,MAAM,GAAG,CAAA;wCACX,CAAC;oCACH,CAAC;gCACH,CAAC;4BACH,CAAC;4BACD,MAAM,CAAC,CAAA;wBACT,CAAC;oBACH,CAAC,CAAyB,CAAA;gBAE5B,CAAC;YACH,CAAC;QACH,CAAC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA"}

package/build/service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAI3E,eAAO,MAAM,kBAAkB,WAAW,MAAM,KAAmB,WAclE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,OAChF,CAAC,UAAS,MAAM,KACpB,CAAC,GAAG,iBAaN,CAAA"}
+{"version":3,"file":"service.d.ts","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AAEA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,uBAAuB,CAAA;AAExD,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAE9D,OAAO,KAAK,EAAE,YAAY,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAA;AAI3E,eAAO,MAAM,kBAAkB,GAAI,QAAO,MAAsB,KAAG,WAclE,CAAA;AAED,eAAO,MAAM,oBAAoB,GAAI,CAAC,SAAS,YAAY,EAAE,CAAC,SAAS,aAAa,CAAC,CAAC,CAAC,EACrF,KAAK,CAAC,EAAE,QAAO,MAAsB,KACpC,CAAC,GAAG,iBAaN,CAAA"}

package/build/service.js

@@ -9,7 +9,7 @@ export const makeAuthWebService = (alias = DEFAULT_ALIAS) => {
         await update(token);
         if (token == null) {
             const module = service.assertCtx().entrypoint(DISPATCHER);
-            const [url] = await module.call();
+            const url = await module.url();
             document.location.href = url;
         }
     };

package/build/service.js.map

@@ -1 +1 @@
-{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,KAAK,GAAW,aAAa,EAAe,EAAE;IAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,OAAO,CAAC,MAAM,GAAG,KAAK,EAAC,KAAK,EAAC,EAAE;QAC7B,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,CAA2B,UAAU,CAAC,CAAA;YACnF,MAAM,CAAC,GAAG,CAAC,GAAG,MAAM,MAAM,CAAC,IAAI,EAAE,CAAA;YACjC,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAA;QAC9B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAM,EAAE,KAAK,GAAW,aAAa,EACd,EAAE;IACzB,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAEzC,MAAM,OAAO,GAAG,GAA4B,CAAA;IAE5C,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEhC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAC1C,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;IAE5C,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE/C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}
+{"version":3,"file":"service.js","sourceRoot":"","sources":["../src/service.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAE,MAAM,gBAAgB,CAAA;AAE3C,OAAO,EAAE,cAAc,EAAE,MAAM,uBAAuB,CAAA;AAEtD,OAAO,EAAE,aAAa,EAAE,eAAe,EAAE,MAAM,uBAAuB,CAAA;AAGtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,iBAAiB,CAAA;AAElD,MAAM,CAAC,MAAM,kBAAkB,GAAG,CAAC,QAAgB,aAAa,EAAe,EAAE;IAC/E,MAAM,OAAO,GAAG,eAAe,CAAC,KAAK,CAAC,CAAA;IAEtC,MAAM,MAAM,GAAG,OAAO,CAAC,MAAM,CAAA;IAC7B,OAAO,CAAC,MAAM,GAAG,KAAK,EAAC,KAAK,EAAC,EAAE;QAC7B,MAAM,MAAM,CAAC,KAAK,CAAC,CAAA;QACnB,IAAI,KAAK,IAAI,IAAI,EAAE,CAAC;YAClB,MAAM,MAAM,GAAG,OAAO,CAAC,SAAS,EAAE,CAAC,UAAU,CAA2B,UAAU,CAAC,CAAA;YACnF,MAAM,GAAG,GAAG,MAAM,MAAM,CAAC,GAAG,EAAE,CAAA;YAC9B,QAAQ,CAAC,QAAQ,CAAC,IAAI,GAAG,GAAG,CAAA;QAC9B,CAAC;IACH,CAAC,CAAA;IAED,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA;AAED,MAAM,CAAC,MAAM,oBAAoB,GAAG,CAClC,GAAM,EAAE,QAAgB,aAAa,EACd,EAAE;IACzB,MAAM,OAAO,GAAG,kBAAkB,CAAC,KAAK,CAAC,CAAA;IAEzC,MAAM,OAAO,GAAG,GAA4B,CAAA;IAE5C,OAAO,CAAC,eAAe,CAAC,OAAO,CAAC,CAAA;IAEhC,OAAO,CAAC,kBAAkB,CAAC,cAAc,CAAC,CAAA;IAC1C,OAAO,CAAC,kBAAkB,CAAC,gBAAgB,CAAC,CAAA;IAE5C,OAAO,CAAC,IAAI,GAAG,GAAG,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,KAAK,CAAC,CAAA;IAE/C,OAAO,OAAO,CAAA;AAChB,CAAC,CAAA"}

package/build/types.d.ts

@@ -1,4 +1,5 @@
 import type { AuthServiceAppend } from '@owlmeans/client-auth';
+import type { LoginServiceAppend } from '@owlmeans/client-auth/login';
 import type { ClientConfig } from '@owlmeans/client-context';
 import type { ClientContext } from '@owlmeans/client';
 export interface RenderOptions {
@@ -9,6 +10,6 @@ export interface RenderOptions {
 }
 export interface AppConfig extends ClientConfig {
 }
-export interface AppContext<C extends AppConfig = AppConfig> extends ClientContext<C>, AuthServiceAppend {
+export interface AppContext<C extends AppConfig = AppConfig> extends ClientContext<C>, AuthServiceAppend, LoginServiceAppend {
 }
 //# sourceMappingURL=types.d.ts.map

package/build/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,SAAU,SAAQ,YAAY;CAC9C;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC,EACnF,iBAAiB;CAClB"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../src/types.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,uBAAuB,CAAA;AAC9D,OAAO,KAAK,EAAE,kBAAkB,EAAE,MAAM,6BAA6B,CAAA;AACrE,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,0BAA0B,CAAA;AAC5D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,kBAAkB,CAAA;AAErD,MAAM,WAAW,aAAa;IAC5B,KAAK,CAAC,EAAE,MAAM,CAAA;IACd,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,OAAO,CAAC,EAAE,OAAO,CAAA;IACjB,KAAK,CAAC,EAAE,OAAO,CAAA;CAChB;AAED,MAAM,WAAW,SAAU,SAAQ,YAAY;CAC9C;AAED,MAAM,WAAW,UAAU,CAAC,CAAC,SAAS,SAAS,GAAG,SAAS,CAAE,SAAQ,aAAa,CAAC,CAAC,CAAC,EACnF,iBAAiB,EAAE,kBAAkB;CACtC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@owlmeans/web-client",
-  "version": "0.1.18-rc.2",
+  "version": "0.1.18-rc.21",
   "license": "MIT",
   "type": "module",
   "scripts": {
@@ -21,22 +21,22 @@
     }
   },
   "dependencies": {
-    "@owlmeans/auth": "^0.1.18-rc.2",
-    "@owlmeans/auth-common": "^0.1.18-rc.2",
-    "@owlmeans/client": "^0.1.18-rc.2",
-    "@owlmeans/client-auth": "^0.1.18-rc.2",
-    "@owlmeans/client-context": "^0.1.18-rc.2",
-    "@owlmeans/client-i18n": "^0.1.18-rc.2",
-    "@owlmeans/client-entrypoint": "^0.1.18-rc.2",
-    "@owlmeans/client-resource": "^0.1.18-rc.2",
-    "@owlmeans/client-route": "^0.1.18-rc.2",
-    "@owlmeans/config": "^0.1.18-rc.2",
-    "@owlmeans/context": "^0.1.18-rc.2",
-    "@owlmeans/error": "^0.1.18-rc.2",
-    "@owlmeans/i18n": "^0.1.18-rc.2",
-    "@owlmeans/route": "^0.1.18-rc.2",
-    "@owlmeans/web-db": "^0.1.18-rc.2",
-    "@owlmeans/web-router": "^0.1.18-rc.2",
+    "@owlmeans/auth": "^0.1.18-rc.8",
+    "@owlmeans/auth-common": "^0.1.18-rc.11",
+    "@owlmeans/client": "^0.1.18-rc.13",
+    "@owlmeans/client-auth": "^0.1.18-rc.17",
+    "@owlmeans/client-context": "^0.1.18-rc.11",
+    "@owlmeans/client-i18n": "^0.1.18-rc.12",
+    "@owlmeans/client-entrypoint": "^0.1.18-rc.11",
+    "@owlmeans/client-resource": "^0.1.18-rc.11",
+    "@owlmeans/client-route": "^0.1.18-rc.11",
+    "@owlmeans/config": "^0.1.18-rc.10",
+    "@owlmeans/context": "^0.1.18-rc.7",
+    "@owlmeans/error": "^0.1.18-rc.7",
+    "@owlmeans/i18n": "^0.1.18-rc.7",
+    "@owlmeans/route": "^0.1.18-rc.7",
+    "@owlmeans/web-db": "^0.1.18-rc.12",
+    "@owlmeans/web-router": "^0.1.18-rc.12",
     "react-dropzone": "^14.3.5"
   },
   "peerDependencies": {

package/src/components/dispatcher/component.tsx

@@ -1,16 +1,33 @@
 import { DispatcherHOC } from '@owlmeans/client-auth'
-import { useEffect } from 'react'
+import { useEffect, useState } from 'react'
 import { useI18nLib } from '@owlmeans/client-i18n'
 import { AUTH_QUERY } from '@owlmeans/auth'
+import {
+  FallbackLoginScreen, LoginIntent, LoginOutcome, ResumeAction, resumeAction,
+} from '@owlmeans/client-auth/login'
+import { LoginSurrogateView, SurrogateStage } from '../../login/view.js'
 import { useContext } from '../../context.js'
 
-export const Dispatcher = DispatcherHOC(({ provideToken }) => {
+export const Dispatcher = DispatcherHOC(({ provideToken, navigate }) => {
   const context = useContext()
   const [query] = context.router().useSearchParams()
 
   const t = useI18nLib('auth', 'dispatcher')
+  const tAuth = useI18nLib('auth')
+
+  // Read in the component body, not in the effect: `window.name` is set by `window.open` before
+  // this document loads and `sessionStorage` carries the marker across the provider round trip, so
+  // the answer is already correct at first paint — and a first paint that showed the application
+  // before an effect corrected it is the defect this exists to prevent.
+  const [env] = useState(() => context.login().env())
+  const [outcome, setOutcome] = useState<LoginOutcome | null>(null)
+  // Nothing to return from and nobody signed in: offer the choice rather than starting a flow.
+  const [choose, setChoose] = useState(false)
 
   useEffect(() => {
+    // First statement of the effect on purpose: everything below can navigate this window away.
+    context.login().enter()
+
     const token = query.get(AUTH_QUERY)
     if (token != null) {
       const params: Record<string, string> = {}
@@ -21,15 +38,62 @@ export const Dispatcher = DispatcherHOC(({ provideToken }) => {
       })
 
       provideToken({ token }, params)
-    } else {
-      context.auth().authenticated().then(authzToken => {
-        if (authzToken == null) {
-          provideToken({ token: '' }, undefined)
-        }
-      })
+
+      return
     }
+
+    void context.auth().authenticated().then(async authzToken => {
+      if (authzToken == null || authzToken === '') {
+        setChoose(true)
+
+        return
+      }
+      // A session already exists in THIS document. Whether it is useful here, or belongs to the
+      // window that opened this one, is the plugin's call — the dispatcher reads no environment.
+      const settled = await context.login().resume(authzToken)
+      switch (resumeAction(settled)) {
+        case ResumeAction.Stop:
+          return
+        case ResumeAction.Render:
+          setOutcome(settled)
+
+          return
+        default:
+          await navigate()
+      }
+    })
   }, [])
 
+  // A surrogate window never renders the application, whatever else is true. Checked ahead of
+  // every other return for exactly that reason.
+  //
+  // `choose` is the one state this must NOT mask, and it is not an exception to the rule: the
+  // login chooser is not the application. A login window with nothing to return from and nobody
+  // signed in has exactly one thing left that can move it forward, and that is asking which
+  // provider. The surrogate URL normally carries `?method=` so the question is already settled,
+  // but a window opened from a bare "Log in" — the framed application's own header button — has no
+  // method to send. Returning the "working" panel there left the popup on "Signing you in…"
+  // permanently, because nothing was ever going to start.
+  if (env.surrogate && !choose) {
+    return <LoginSurrogateView
+      intent={LoginIntent.Login}
+      stage={
+        outcome === LoginOutcome.Orphaned ? SurrogateStage.Orphaned
+          : outcome === LoginOutcome.Failed ? SurrogateStage.Failed
+            : outcome === LoginOutcome.Gesture ? SurrogateStage.Gesture
+              : SurrogateStage.Working
+      }
+      onAction={() => window.close()}
+      translate={(key, defaultValue) => tAuth(key, { defaultValue })}
+    />
+  }
+
+  if (choose) {
+    const Screen = context.login().screen() ?? FallbackLoginScreen
+
+    return <Screen translate={(key, defaultValue) => tAuth(key, { defaultValue })} />
+  }
+
   return query.has(AUTH_QUERY) ? <div style={{
     width: '100%', // Makes the div occupy the full width
     display: 'flex', // Enables flexbox layout

package/src/components/dispatcher/types.ts

@@ -1,6 +1,6 @@
-import type { ModuleContextParams } from "@owlmeans/client"
+import type { EntrypointContextParams } from "@owlmeans/client"
 import type { DispatcherProps } from "@owlmeans/client-auth"
 import type { PropsWithChildren } from "react"
 
-export interface ParametrisedProps extends PropsWithChildren<ModuleContextParams & DispatcherProps> {
+export interface ParametrisedProps extends PropsWithChildren<EntrypointContextParams & DispatcherProps> {
 }

package/src/context.ts

@@ -8,6 +8,7 @@ import { useContext as useCtx } from '@owlmeans/client'
 import { extractPrimaryHost } from './helper.js'
 import { appendWebAuthService } from './service.js'
 import { appendWebRouter } from '@owlmeans/web-router'
+import { appendWebLogin } from './login/service.js'
 
 export const makeContext = <C extends AppConfig = AppConfig, T extends AppContext<C> = AppContext<C>>(
   cfg: C
@@ -19,8 +20,7 @@ export const makeContext = <C extends AppConfig = AppConfig, T extends AppContex
   appendWebDbService<C, T>(context)
   appendClientResource<C, T>(context, AUTH_RESOURCE)
   appendWebRouter<C, T>(context)
-
-  context.makeContext = makeContext as typeof context.makeContext
+  appendWebLogin<C, T>(context)
 
   return context
 }

package/src/entrypoints.ts

@@ -0,0 +1,20 @@
+import { DISPATCHER, DISPATCHER_SURROGATE } from '@owlmeans/auth'
+import { entrypoints as list } from '@owlmeans/client-auth'
+import { elevate } from '@owlmeans/client-entrypoint'
+import { handler } from '@owlmeans/client'
+import { Dispatcher } from './components/dispatcher/component.js'
+import { SurrogateScreen } from './login/screen.js'
+
+elevate(list, DISPATCHER, handler(Dispatcher))
+
+/**
+ * Elevated here rather than in a relying-party package on purpose.
+ *
+ * The surrogate mechanic is not OIDC-specific — it is "run the login route one window up and hand
+ * the result back" — and every web application already spreads this list. Putting the screen here
+ * means `web-panel`, `mui-panel` and every generated target gain a working login window with no
+ * edit of their own, which is the only way an application that is already deployed can get it.
+ */
+elevate(list, DISPATCHER_SURROGATE, handler(SurrogateScreen))
+
+export const entrypoints = list

package/src/exports.ts

@@ -5,5 +5,6 @@ export { service } from '@owlmeans/config'
 export { AppType, HOME, ROOT, BASE, GUEST } from '@owlmeans/context'
 export { entrypoint, elevate, provideRequest, stab } from '@owlmeans/client-entrypoint'
 export { route, frontend } from '@owlmeans/route'
+export type { ClientEntrypoint } from '@owlmeans/client-entrypoint'
 export type { ClientEntrypoint as Module } from '@owlmeans/client-entrypoint'
 export type { ClientRoute as Route } from '@owlmeans/client-route'