@fluixi/oauth2 1.0.0-alpha.1 → 1.0.0-alpha.100

package/dist/index.mjs

@@ -1,7 +1,8 @@
-/*! @fluixi/oauth2 v1.0.0-alpha.1 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
-import "./chunk-25WE6UWI.mjs";
+/*! @fluixi/oauth2 v1.0.0-alpha.100 | (c) 2026 Ibrahima Touré and Fluixi contributors | MIT */
+import "./chunk-KTGVSZE6.mjs";
 
 // src/service.ts
+import { createSignal, markReactiveScope, openReactiveScope, withReactiveScope } from "@fluixi/reactive/signal";
 import { createSession } from "@fluixi/session";
 import { createAuthHooks } from "@fluixi/auth/client";
 
@@ -111,7 +112,7 @@ function resolveMethod(auth) {
 }
 async function loadJose() {
   try {
-    return await import("./browser-ONMHX3Z3.mjs");
+    return await import("./browser-TV25RBLT.mjs");
   } catch {
     throw new OAuthError(
       "private_key_jwt needs `jose`. Install it: npm i jose. It is an optional peer, so a client using a secret does not carry it.",
@@ -151,7 +152,7 @@ async function applyClientAuth(auth, endpoint, headers, form) {
 // src/dpop.ts
 async function loadJose2() {
   try {
-    return await import("./browser-ONMHX3Z3.mjs");
+    return await import("./browser-TV25RBLT.mjs");
   } catch {
     throw new OAuthError(
       "DPoP needs `jose`. Install it: npm i jose. It is an optional peer, so a client not using DPoP does not carry it.",
@@ -159,9 +160,11 @@ async function loadJose2() {
     );
   }
 }
-async function createDpopKey(alg = "ES256") {
+async function createDpopKey(alg = "ES256", options = {}) {
   const jose = await loadJose2();
-  const { privateKey, publicKey } = await jose.generateKeyPair(alg, { extractable: false });
+  const { privateKey, publicKey } = await jose.generateKeyPair(alg, {
+    extractable: options.extractable ?? false
+  });
   const publicJwk = { ...await jose.exportJWK(publicKey) };
   return {
     privateKey,
@@ -307,8 +310,12 @@ async function discover(issuer, fetcher = fetch) {
     try {
       response = await fetcher(documentUrl(issuer));
     } catch (cause) {
+      const why = cause instanceof Error ? cause.message : String(cause);
       throw new OAuthError(
-        `Could not read the discovery document at ${documentUrl(issuer)}. In a browser this is usually the provider refusing a cross-origin read: give \`endpoints\` directly, or resolve them on a server. (${cause instanceof Error ? cause.message : String(cause)})`,
+        typeof window === "undefined" ? (
+          // On a server nothing blocks the read: the provider is down, or the address is wrong.
+          `Could not reach the provider at ${documentUrl(issuer)}: is it running, and is the issuer right? (${why})`
+        ) : `Could not read the discovery document at ${documentUrl(issuer)}. In a browser this is usually the provider refusing a cross-origin read: give \`endpoints\` directly, or resolve them on a server. (${why})`,
         "discovery_unreachable"
       );
     }
@@ -333,6 +340,7 @@ async function discover(issuer, fetcher = fetch) {
       jwks: doc.jwks_uri,
       introspection: doc.introspection_endpoint,
       revocation: doc.revocation_endpoint,
+      checkSession: doc.check_session_iframe,
       issuer: doc.issuer ?? issuer
     };
   })();
@@ -791,6 +799,81 @@ function createServerClient(config, fetcher = fetch) {
   };
 }
 
+// src/session-monitor.ts
+var SETTLE_MS = 15e3;
+var GUARD_KEY = "fx-session-check";
+function recentlyActed() {
+  try {
+    return Date.now() - Number(sessionStorage.getItem(GUARD_KEY) ?? 0) < SETTLE_MS;
+  } catch {
+    return false;
+  }
+}
+function markActed() {
+  try {
+    sessionStorage.setItem(GUARD_KEY, String(Date.now()));
+  } catch {
+  }
+}
+function watchProviderSession(options = {}) {
+  if (typeof window === "undefined" || typeof document === "undefined") return () => {
+  };
+  const base = (options.basePath ?? "/auth").replace(/\/$/, "");
+  const fetcher = options.fetcher ?? fetch;
+  const onChange = options.onChange ?? (() => {
+    const login = new URLSearchParams({ prompt: "none", returnTo: location.pathname + location.search });
+    location.assign(`${base}/login?${login}`);
+  });
+  let stopped = false;
+  const cleanups = [];
+  const stop = () => {
+    stopped = true;
+    for (const cleanup of cleanups.splice(0)) cleanup();
+  };
+  void (async () => {
+    const check = await fetcher(`${base}/session-check`, { credentials: "same-origin" }).then((response) => response.ok ? response.json() : null).catch(() => null);
+    if (stopped || !check?.frame || !check.state) return;
+    const origin = new URL(check.frame).origin;
+    const frame = document.createElement("iframe");
+    frame.src = check.frame;
+    frame.title = "session check";
+    frame.setAttribute("aria-hidden", "true");
+    frame.tabIndex = -1;
+    frame.style.cssText = "position:absolute;width:0;height:0;border:0;visibility:hidden";
+    const message = `${check.clientId} ${check.state}`;
+    const ask = () => {
+      if (!stopped && document.visibilityState === "visible") frame.contentWindow?.postMessage(message, origin);
+    };
+    let confirmed = false;
+    const answer = (event) => {
+      if (event.origin !== origin || event.source !== frame.contentWindow) return;
+      if (event.data === "unchanged") confirmed = true;
+      else if (event.data === "changed") {
+        stop();
+        if (!confirmed && recentlyActed()) return;
+        markActed();
+        onChange();
+      } else if (event.data === "error") {
+        stop();
+      }
+    };
+    window.addEventListener("message", answer);
+    frame.addEventListener("load", ask);
+    document.addEventListener("visibilitychange", ask);
+    window.addEventListener("focus", ask);
+    const timer = setInterval(ask, options.intervalMs ?? 3e3);
+    document.body.appendChild(frame);
+    cleanups.push(() => {
+      window.removeEventListener("message", answer);
+      document.removeEventListener("visibilitychange", ask);
+      window.removeEventListener("focus", ask);
+      clearInterval(timer);
+      frame.remove();
+    });
+  })();
+  return stop;
+}
+
 // src/service.ts
 function paramsFromUrl(url) {
   const href = url ?? (typeof location === "undefined" ? null : location.href);
@@ -808,18 +891,28 @@ function clientFor(options) {
   return options.config.tokens === "server" ? createServerClient(options.config) : createBrowserClient(options.config);
 }
 function createAuthService(options) {
+  const tokens = options.config.tokens;
+  const scope = openReactiveScope({ kind: "service", name: "AuthService", ...tokens ? { detail: `tokens: ${tokens}` } : {} });
+  const service = withReactiveScope(scope, () => buildAuthService(options));
+  markReactiveScope(service, scope);
+  return service;
+}
+function buildAuthService(options) {
   const client = clientFor(options);
   let latest = null;
+  const fetchUserFor = async (token) => {
+    if (options.fetchUser) return options.fetchUser(token);
+    return client.fetchUser(token === COOKIE_SESSION ? void 0 : token);
+  };
+  const resumesFromCookie = options.config.tokens === "server" && typeof window !== "undefined";
+  const [ready, setReady] = createSignal(!resumesFromCookie);
   const session = createSession({
     /** The credential is the callback, so this is the code exchange. */
     async login(params) {
       latest = await client.handleCallback(params);
       return { token: latest.accessToken, expiresAt: latest.expiresAt };
     },
-    async fetchUser(token) {
-      if (options.fetchUser) return options.fetchUser(token);
-      return client.fetchUser(token === COOKIE_SESSION ? void 0 : token);
-    },
+    fetchUser: fetchUserFor,
     async refresh() {
       latest = await client.refresh();
       return { token: latest.accessToken, expiresAt: latest.expiresAt };
@@ -842,11 +935,27 @@ function createAuthService(options) {
   });
   const hooks = createAuthHooks({
     session,
+    ready,
     navigate: options.navigate,
     loginPath: options.loginPath ?? "/login",
     homePath: options.homePath ?? "/",
     forbiddenPath: options.forbiddenPath ?? "/403"
   });
+  if (resumesFromCookie && options.config.tokens === "server" && options.config.watchSession !== false) {
+    watchProviderSession({ basePath: options.config.basePath });
+  }
+  const renderedSignedOut = hooks.store.seeded && hooks.store.value().user == null;
+  if (resumesFromCookie && renderedSignedOut) setReady(true);
+  else if (resumesFromCookie) {
+    void (async () => {
+      try {
+        await session.adopt(COOKIE_SESSION, await fetchUserFor(COOKIE_SESSION));
+      } catch {
+      } finally {
+        setReady(true);
+      }
+    })();
+  }
   return Object.assign(session, {
     client,
     protectedRoute: hooks.protectedRoute,
@@ -882,14 +991,29 @@ function createAuthService(options) {
 }
 
 // src/tokens.ts
-import { injectionToken } from "@fluixi/start/di";
+import { injectionToken } from "@fluixi/di";
 var AuthServiceToken = injectionToken("AuthService");
 var AuthClientToken = injectionToken("AuthClient");
+
+// src/module.ts
+import { defineModule } from "@fluixi/start/app";
+function authModule(auth) {
+  return defineModule({
+    name: "oauth2",
+    providers: [
+      // One instance for every request on the server. It holds no per-visitor state there:
+      // the signed-in user comes from request locals, which `sessionLocals` fills per request.
+      { provide: AuthServiceToken, useValue: auth },
+      { provide: AuthClientToken, useValue: auth.client }
+    ]
+  });
+}
 export {
   AuthClientToken,
   AuthServiceToken,
   COOKIE_SESSION,
   OAuthError,
+  authModule,
   boundKeyOf,
   clearDiscoveryCache,
   createAuthService,
@@ -905,5 +1029,6 @@ export {
   paramsFromUrl,
   proofFor,
   safeReturnTo,
-  thumbprintOf
+  thumbprintOf,
+  watchProviderSession
 };

package/dist/module.cjs

@@ -0,0 +1,44 @@
+"use strict";
+var __defProp = Object.defineProperty;
+var __getOwnPropDesc = Object.getOwnPropertyDescriptor;
+var __getOwnPropNames = Object.getOwnPropertyNames;
+var __hasOwnProp = Object.prototype.hasOwnProperty;
+var __export = (target, all) => {
+  for (var name in all)
+    __defProp(target, name, { get: all[name], enumerable: true });
+};
+var __copyProps = (to, from, except, desc) => {
+  if (from && typeof from === "object" || typeof from === "function") {
+    for (let key of __getOwnPropNames(from))
+      if (!__hasOwnProp.call(to, key) && key !== except)
+        __defProp(to, key, { get: () => from[key], enumerable: !(desc = __getOwnPropDesc(from, key)) || desc.enumerable });
+  }
+  return to;
+};
+var __toCommonJS = (mod) => __copyProps(__defProp({}, "__esModule", { value: true }), mod);
+
+// src/module.ts
+var module_exports = {};
+__export(module_exports, {
+  authModule: () => authModule
+});
+module.exports = __toCommonJS(module_exports);
+var import_app = require("@fluixi/start/app");
+
+// src/tokens.ts
+var import_di = require("@fluixi/di");
+var AuthServiceToken = (0, import_di.injectionToken)("AuthService");
+var AuthClientToken = (0, import_di.injectionToken)("AuthClient");
+
+// src/module.ts
+function authModule(auth) {
+  return (0, import_app.defineModule)({
+    name: "oauth2",
+    providers: [
+      // One instance for every request on the server. It holds no per-visitor state there:
+      // the signed-in user comes from request locals, which `sessionLocals` fills per request.
+      { provide: AuthServiceToken, useValue: auth },
+      { provide: AuthClientToken, useValue: auth.client }
+    ]
+  });
+}

package/dist/module.d.ts

@@ -0,0 +1,13 @@
+/**
+ * The app-module half of this package, listed in `src/app.config.ts`.
+ *
+ * Registers the app's service under `AuthServiceToken` and its client under
+ * `AuthClientToken` on both sides. Package code reaches the service through those tokens,
+ * `OAuthCallback` among it, because a package cannot import the app. The server half, the
+ * routes and session middleware of `tokens: 'server'`, is `authServerModule` in
+ * `@fluixi/oauth2/server`, for `app.config.server.ts`.
+ */
+import { type AppModule } from '@fluixi/start/app';
+import type { AuthService } from './service.js';
+export declare function authModule<U, P, Q>(auth: AuthService<U, P, Q>): AppModule;
+//# sourceMappingURL=module.d.ts.map

package/dist/module.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"module.d.ts","sourceRoot":"","sources":["../src/module.ts"],"names":[],"mappings":"AAAA;;;;;;;;GAQG;AACH,OAAO,EAAgB,KAAK,SAAS,EAAE,MAAM,mBAAmB,CAAC;AAEjE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAEhD,wBAAgB,UAAU,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAUzE"}

package/dist/module.js

@@ -0,0 +1,22 @@
+/**
+ * The app-module half of this package, listed in `src/app.config.ts`.
+ *
+ * Registers the app's service under `AuthServiceToken` and its client under
+ * `AuthClientToken` on both sides. Package code reaches the service through those tokens,
+ * `OAuthCallback` among it, because a package cannot import the app. The server half, the
+ * routes and session middleware of `tokens: 'server'`, is `authServerModule` in
+ * `@fluixi/oauth2/server`, for `app.config.server.ts`.
+ */
+import { defineModule } from '@fluixi/start/app';
+import { AuthServiceToken, AuthClientToken } from './tokens.js';
+export function authModule(auth) {
+    return defineModule({
+        name: 'oauth2',
+        providers: [
+            // One instance for every request on the server. It holds no per-visitor state there:
+            // the signed-in user comes from request locals, which `sessionLocals` fills per request.
+            { provide: AuthServiceToken, useValue: auth },
+            { provide: AuthClientToken, useValue: auth.client },
+        ],
+    });
+}

package/dist/module.mjs

@@ -0,0 +1,23 @@
+// src/module.ts
+import { defineModule } from "@fluixi/start/app";
+
+// src/tokens.ts
+import { injectionToken } from "@fluixi/di";
+var AuthServiceToken = injectionToken("AuthService");
+var AuthClientToken = injectionToken("AuthClient");
+
+// src/module.ts
+function authModule(auth) {
+  return defineModule({
+    name: "oauth2",
+    providers: [
+      // One instance for every request on the server. It holds no per-visitor state there:
+      // the signed-in user comes from request locals, which `sessionLocals` fills per request.
+      { provide: AuthServiceToken, useValue: auth },
+      { provide: AuthClientToken, useValue: auth.client }
+    ]
+  });
+}
+export {
+  authModule
+};