@furystack/rest-service 11.0.6 → 12.0.0

package/esm/http-authentication-settings.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-authentication-settings.d.ts","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,iBAAiB,CAAA;AAClE,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mBAAmB,CAAA;AAEtD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AACH,qBACa,0BAA0B,CAAC,KAAK,SAAS,IAAI,EAAE,QAAQ,SAAS,cAAc;IAClF,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAA+B;IAE1D,YAAY,GAAI,IAAI,YAAY,iGAAqC;IAErE,eAAe,EAAE,CAAC,YAAY,EAAE,YAAY,KAAK,aAAa,CAAC,QAAQ,EAAE,MAAM,QAAQ,CAAC,CACI;IAE5F,UAAU,SAAQ;IAClB,eAAe,UAAO;CAC9B"}
+{"version":3,"file":"http-authentication-settings.d.ts","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AACtC,OAAO,KAAK,EAAE,aAAa,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAEhE,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,uBAAuB,CAAA;AAEpD,OAAO,KAAK,EAAE,sBAAsB,EAAE,MAAM,uDAAuD,CAAA;AACnG,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AACH,qBACa,0BAA0B,CAAC,KAAK,SAAS,IAAI,EAAE,QAAQ,SAAS,cAAc;IAClF,KAAK,EAAE,aAAa,CAAC,KAAK,CAAC,CAA+B;IAE1D,cAAc,GAAI,UAAU,QAAQ,2FAA8C;IAElF,iBAAiB,EAAE,CAAC,QAAQ,EAAE,QAAQ,KAAK,OAAO,CAAC,QAAQ,EAAE,MAAM,QAAQ,CAAC,CACmB;IAE/F,UAAU,SAAQ;IAClB,eAAe,UAAO;IAE7B;;;;OAIG;IACI,uBAAuB,EAAE,sBAAsB,EAAE,CAAK;CAC9D"}

package/esm/http-authentication-settings.js

@@ -6,16 +6,23 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 };
 import { User } from '@furystack/core';
 import { Injectable } from '@furystack/inject';
+import { getDataSetFor } from '@furystack/repository';
 import { DefaultSession } from './models/default-session.js';
 /**
  * Authentication settings object for FuryStack HTTP Api
  */
 let HttpAuthenticationSettings = class HttpAuthenticationSettings {
     model = User;
-    getUserStore = (sm) => sm.getStoreFor(User, 'username');
-    getSessionStore = (sm) => sm.getStoreFor(DefaultSession, 'sessionId');
+    getUserDataSet = (injector) => getDataSetFor(injector, User, 'username');
+    getSessionDataSet = (injector) => getDataSetFor(injector, DefaultSession, 'sessionId');
     cookieName = 'fss';
     enableBasicAuth = true;
+    /**
+     * Ordered list of authentication providers. Populated by {@link useHttpAuthentication}
+     * and extended by `useJwtAuthentication()` or other auth plugins.
+     * Safe to mutate only during setup, before the first request is served.
+     */
+    authenticationProviders = [];
 };
 HttpAuthenticationSettings = __decorate([
     Injectable({ lifetime: 'singleton' })

package/esm/http-authentication-settings.js.map

@@ -1 +1 @@
-{"version":3,"file":"http-authentication-settings.js","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":";;;;;;AACA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAC9C,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAC9B,KAAK,GAAyB,IAA4B,CAAA;IAE1D,YAAY,GAAG,CAAC,EAAgB,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,EAAE,UAAU,CAAC,CAAA;IAErE,eAAe,GAA4E,CAAC,EAAE,EAAE,EAAE,CACvG,EAAE,CAAC,WAAW,CAAC,cAAc,EAAE,WAAW,CAAuD,CAAA;IAE5F,UAAU,GAAG,KAAK,CAAA;IAClB,eAAe,GAAG,IAAI,CAAA;CAC9B,CAAA;AAVY,0BAA0B;IADtC,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,0BAA0B,CAUtC"}
+{"version":3,"file":"http-authentication-settings.js","sourceRoot":"","sources":["../src/http-authentication-settings.ts"],"names":[],"mappings":";;;;;;AAAA,OAAO,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAEtC,OAAO,EAAE,UAAU,EAAE,MAAM,mBAAmB,CAAA;AAE9C,OAAO,EAAE,aAAa,EAAE,MAAM,uBAAuB,CAAA;AAErD,OAAO,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAE5D;;GAEG;AAEI,IAAM,0BAA0B,GAAhC,MAAM,0BAA0B;IAC9B,KAAK,GAAyB,IAA4B,CAAA;IAE1D,cAAc,GAAG,CAAC,QAAkB,EAAE,EAAE,CAAC,aAAa,CAAC,QAAQ,EAAE,IAAI,EAAE,UAAU,CAAC,CAAA;IAElF,iBAAiB,GAA8D,CAAC,QAAQ,EAAE,EAAE,CACjG,aAAa,CAAC,QAAQ,EAAE,cAAc,EAAE,WAAW,CAAiD,CAAA;IAE/F,UAAU,GAAG,KAAK,CAAA;IAClB,eAAe,GAAG,IAAI,CAAA;IAE7B;;;;OAIG;IACI,uBAAuB,GAA6B,EAAE,CAAA;CAC9D,CAAA;AAjBY,0BAA0B;IADtC,UAAU,CAAC,EAAE,QAAQ,EAAE,WAAW,EAAE,CAAC;GACzB,0BAA0B,CAiBtC"}

package/esm/http-user-context.d.ts

@@ -6,10 +6,9 @@ import type { DefaultSession } from './models/default-session.js';
  * Injectable UserContext for FuryStack HTTP Api
  */
 export declare class HttpUserContext {
-    getUserStore: () => import("@furystack/core").PhysicalStore<User, "username", import("@furystack/core").WithOptionalId<User, "username">>;
-    getSessionStore: () => import("@furystack/core").PhysicalStore<DefaultSession, keyof DefaultSession, import("@furystack/core").WithOptionalId<DefaultSession, keyof DefaultSession>>;
+    getUserDataSet: () => import("@furystack/repository").DataSet<User, "username", import("@furystack/core").WithOptionalId<User, "username">>;
+    getSessionDataSet: () => import("@furystack/repository").DataSet<DefaultSession, keyof DefaultSession, import("@furystack/core").WithOptionalId<DefaultSession, keyof DefaultSession>>;
     private getUserByName;
-    private getSessionById;
     private user?;
     /**
      * @param request The request to be authenticated
@@ -32,6 +31,12 @@ export declare class HttpUserContext {
     authenticateUser(userName: string, password: string): Promise<import("@furystack/core").PartialResult<User, (keyof User)[]>>;
     getCurrentUser(request: Pick<IncomingMessage, 'headers'>): Promise<User>;
     getSessionIdFromRequest(request: Pick<IncomingMessage, 'headers'>): string | null;
+    /**
+     * Iterates registered authentication providers in order.
+     * - A provider returning `User` means authentication succeeded.
+     * - A provider returning `null` means it does not apply; try the next one.
+     * - A provider throwing means it owns the request but auth failed; propagate the error.
+     */
     authenticateRequest(request: Pick<IncomingMessage, 'headers'>): Promise<User>;
     /**
      * Creates and sets up a cookie-based session for the provided user
@@ -46,7 +51,7 @@ export declare class HttpUserContext {
         setHeader: (header: string, value: string) => void;
     }): Promise<void>;
     readonly authentication: HttpAuthenticationSettings<User, DefaultSession>;
-    private readonly storeManager;
+    private readonly systemInjector;
     private readonly authenticator;
     init(): void;
 }

package/esm/http-user-context.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAK3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAC3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;GAEG;AACH,qBACa,eAAe;IACnB,YAAY,8HAA4D;IAExE,eAAe,sKAA+D;IAErF,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,cAAc,CAOrB;IAED,OAAO,CAAC,IAAI,CAAC,CAAM;IAEnB;;;OAGG;IACU,eAAe,CAAC,OAAO,EAAE,eAAe;IASrD;;;;;OAKG;IACU,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzF;;;;;OAKG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAanD,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC;IAQ9D,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI;IAkB3E,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAuB1F;;;;;OAKG;IACU,WAAW,CACtB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,GACrE,OAAO,CAAC,IAAI,CAAC;IAQH,YAAY,CACvB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EACzC,QAAQ,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;IAalE,SACwB,cAAc,EAAE,0BAA0B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAExF,iBACyB,YAAY,CAAc;IAEnD,iBACyB,aAAa,CAAuB;IAEtD,IAAI;CAiBZ"}
+{"version":3,"file":"http-user-context.d.ts","sourceRoot":"","sources":["../src/http-user-context.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,IAAI,EAAE,MAAM,iBAAiB,CAAA;AAM3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,MAAM,CAAA;AAE3C,OAAO,EAAE,0BAA0B,EAAE,MAAM,mCAAmC,CAAA;AAC9E,OAAO,KAAK,EAAE,cAAc,EAAE,MAAM,6BAA6B,CAAA;AAEjE;;GAEG;AACH,qBACa,eAAe;IACnB,cAAc,8HAAgE;IAE9E,iBAAiB,sKAAmE;IAE3F,OAAO,CAAC,aAAa,CAOpB;IAED,OAAO,CAAC,IAAI,CAAC,CAAM;IAEnB;;;OAGG;IACU,eAAe,CAAC,OAAO,EAAE,eAAe;IASrD;;;;;OAKG;IACU,YAAY,CAAC,OAAO,EAAE,eAAe,EAAE,GAAG,KAAK,EAAE,MAAM,EAAE,GAAG,OAAO,CAAC,OAAO,CAAC;IAUzF;;;;;OAKG;IACU,gBAAgB,CAAC,QAAQ,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM;IAanD,cAAc,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC;IAQ9D,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,MAAM,GAAG,IAAI;IAIxF;;;;;OAKG;IACU,mBAAmB,CAAC,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,GAAG,OAAO,CAAC,IAAI,CAAC;IAQ1F;;;;;OAKG;IACU,WAAW,CACtB,IAAI,EAAE,IAAI,EACV,cAAc,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE,GACrE,OAAO,CAAC,IAAI,CAAC;IAQH,YAAY,CACvB,OAAO,EAAE,IAAI,CAAC,eAAe,EAAE,SAAS,CAAC,EACzC,QAAQ,EAAE;QAAE,SAAS,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,KAAK,IAAI,CAAA;KAAE;IAalE,SACwB,cAAc,EAAE,0BAA0B,CAAC,IAAI,EAAE,cAAc,CAAC,CAAA;IAExF,iBACyB,cAAc,CAAU;IAEjD,iBACyB,aAAa,CAAuB;IAEtD,IAAI;CAiBZ"}

package/esm/http-user-context.js

@@ -7,33 +7,26 @@ var __decorate = (this && this.__decorate) || function (decorators, target, key,
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-import { StoreManager } from '@furystack/core';
+import { useSystemIdentityContext } from '@furystack/core';
 import { Injectable, Injected } from '@furystack/inject';
 import { PasswordAuthenticator, UnauthenticatedError } from '@furystack/security';
 import { randomBytes } from 'crypto';
+import { extractSessionIdFromCookies } from './authentication-providers/helpers.js';
 import { HttpAuthenticationSettings } from './http-authentication-settings.js';
 /**
  * Injectable UserContext for FuryStack HTTP Api
  */
 let HttpUserContext = class HttpUserContext {
-    getUserStore = () => this.authentication.getUserStore(this.storeManager);
-    getSessionStore = () => this.authentication.getSessionStore(this.storeManager);
+    getUserDataSet = () => this.authentication.getUserDataSet(this.systemInjector);
+    getSessionDataSet = () => this.authentication.getSessionDataSet(this.systemInjector);
     getUserByName = async (userName) => {
-        const userStore = this.getUserStore();
-        const users = await userStore.find({ filter: { username: { $eq: userName } }, top: 2 });
+        const userDataSet = this.getUserDataSet();
+        const users = await userDataSet.find(this.systemInjector, { filter: { username: { $eq: userName } }, top: 2 });
         if (users.length !== 1) {
             throw new UnauthenticatedError();
         }
         return users[0];
     };
-    getSessionById = async (sessionId) => {
-        const sessionStore = this.getSessionStore();
-        const sessions = await sessionStore.find({ filter: { sessionId: { $eq: sessionId } }, top: 2 });
-        if (sessions.length !== 1) {
-            throw new UnauthenticatedError();
-        }
-        return sessions[0];
-    };
     user;
     /**
      * @param request The request to be authenticated
@@ -88,39 +81,19 @@ let HttpUserContext = class HttpUserContext {
         return this.user;
     }
     getSessionIdFromRequest(request) {
-        if (request.headers.cookie) {
-            const cookies = request.headers.cookie
-                .toString()
-                .split(';')
-                .filter((val) => val.length > 0)
-                .map((val) => {
-                const [name, value] = val.split('=');
-                return { name: name?.trim(), value: value?.trim() };
-            });
-            const sessionCookie = cookies.find((c) => c.name === this.authentication.cookieName);
-            if (sessionCookie) {
-                return sessionCookie.value;
-            }
-        }
-        return null;
+        return extractSessionIdFromCookies(request, this.authentication.cookieName);
     }
+    /**
+     * Iterates registered authentication providers in order.
+     * - A provider returning `User` means authentication succeeded.
+     * - A provider returning `null` means it does not apply; try the next one.
+     * - A provider throwing means it owns the request but auth failed; propagate the error.
+     */
     async authenticateRequest(request) {
-        // Basic auth
-        if (this.authentication.enableBasicAuth && request.headers.authorization) {
-            const authData = Buffer.from(request.headers.authorization.toString().split(' ')[1], 'base64');
-            const [userName, password] = authData.toString().split(':');
-            return await this.authenticateUser(userName, password);
-        }
-        // Cookie auth
-        const sessionId = this.getSessionIdFromRequest(request);
-        if (sessionId) {
-            const session = await this.getSessionById(sessionId);
-            if (session) {
-                const user = await this.getUserByName(session.username);
-                if (user) {
-                    return user;
-                }
-            }
+        for (const provider of this.authentication.authenticationProviders) {
+            const user = await provider.authenticate(request);
+            if (user)
+                return user;
         }
         throw new UnauthenticatedError();
     }
@@ -132,7 +105,7 @@ let HttpUserContext = class HttpUserContext {
      */
     async cookieLogin(user, serverResponse) {
         const sessionId = randomBytes(32).toString('hex');
-        await this.getSessionStore().add({ sessionId, username: user.username });
+        await this.getSessionDataSet().add(this.systemInjector, { sessionId, username: user.username });
         serverResponse.setHeader('Set-Cookie', `${this.authentication.cookieName}=${sessionId}; Path=/; HttpOnly`);
         this.user = user;
         return user;
@@ -142,24 +115,24 @@ let HttpUserContext = class HttpUserContext {
         const sessionId = this.getSessionIdFromRequest(request);
         response.setHeader('Set-Cookie', `${this.authentication.cookieName}=; Path=/; HttpOnly`);
         if (sessionId) {
-            const sessionStore = this.getSessionStore();
-            const sessions = await sessionStore.find({ filter: { sessionId: { $eq: sessionId } } });
-            await this.getSessionStore().remove(...sessions.map((s) => s[sessionStore.primaryKey]));
+            const sessionDataSet = this.getSessionDataSet();
+            const sessions = await sessionDataSet.find(this.systemInjector, { filter: { sessionId: { $eq: sessionId } } });
+            await sessionDataSet.remove(this.systemInjector, ...sessions.map((s) => s[sessionDataSet.primaryKey]));
         }
     }
     init() {
-        this.getUserStore().addListener('onEntityUpdated', ({ id, change }) => {
+        this.getUserDataSet().addListener('onEntityUpdated', ({ id, change }) => {
             if (this.user?.username === id) {
                 this.user = { ...this.user, ...change };
             }
         });
-        this.getUserStore().addListener('onEntityRemoved', ({ key }) => {
+        this.getUserDataSet().addListener('onEntityRemoved', ({ key }) => {
             if (this.user?.username === key) {
                 this.user = undefined;
             }
         });
-        this.getSessionStore().addListener('onEntityRemoved', () => {
-            this.user = undefined; // as user cannot be determined by the session id anymore
+        this.getSessionDataSet().addListener('onEntityRemoved', () => {
+            this.user = undefined;
         });
     }
 };
@@ -168,9 +141,9 @@ __decorate([
     __metadata("design:type", HttpAuthenticationSettings)
 ], HttpUserContext.prototype, "authentication", void 0);
 __decorate([
-    Injected(StoreManager),
-    __metadata("design:type", StoreManager)
-], HttpUserContext.prototype, "storeManager", void 0);
+    Injected((injector) => useSystemIdentityContext({ injector, username: 'HttpUserContext' })),
+    __metadata("design:type", Function)
+], HttpUserContext.prototype, "systemInjector", void 0);
 __decorate([
     Injected(PasswordAuthenticator),
     __metadata("design:type", PasswordAuthenticator)

package/esm/http-user-context.js.map

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

package/esm/http-user-context.spec.d.ts

@@ -1,3 +1,5 @@
 import { Injector } from '@furystack/inject';
-export declare const prepareInjector: (i: Injector) => Promise<void>;
+export declare const prepareInjector: (i: Injector, options?: {
+    enableBasicAuth?: boolean;
+}) => Promise<void>;
 //# sourceMappingURL=http-user-context.spec.d.ts.map

package/esm/http-user-context.spec.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"http-user-context.spec.d.ts","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAS5C,eAAO,MAAM,eAAe,GAAU,GAAG,QAAQ,kBAMhD,CAAA"}
+{"version":3,"file":"http-user-context.spec.d.ts","sourceRoot":"","sources":["../src/http-user-context.spec.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,QAAQ,EAAE,MAAM,mBAAmB,CAAA;AAgB5C,eAAO,MAAM,eAAe,GAAU,GAAG,QAAQ,EAAE,UAAU;IAAE,eAAe,CAAC,EAAE,OAAO,CAAA;CAAE,kBAczF,CAAA"}

package/esm/http-user-context.spec.js

@@ -1,17 +1,25 @@
 /* eslint-disable @typescript-eslint/ban-ts-comment */
-import { InMemoryStore, StoreManager, User, addStore } from '@furystack/core';
+import { InMemoryStore, StoreManager, User, addStore, useSystemIdentityContext } from '@furystack/core';
 import { Injector } from '@furystack/inject';
-import { PasswordAuthenticator, PasswordCredential, UnauthenticatedError } from '@furystack/security';
+import { getDataSetFor, getRepository } from '@furystack/repository';
+import { PasswordAuthenticator, PasswordCredential, PasswordResetToken, UnauthenticatedError, usePasswordPolicy, } from '@furystack/security';
 import { usingAsync } from '@furystack/utils';
 import { describe, expect, it, vi } from 'vitest';
 import { useHttpAuthentication } from './helpers.js';
 import { HttpUserContext } from './http-user-context.js';
 import { DefaultSession } from './models/default-session.js';
-export const prepareInjector = async (i) => {
+export const prepareInjector = async (i, options) => {
     addStore(i, new InMemoryStore({ model: User, primaryKey: 'username' }))
         .addStore(new InMemoryStore({ model: DefaultSession, primaryKey: 'sessionId' }))
-        .addStore(new InMemoryStore({ model: PasswordCredential, primaryKey: 'userName' }));
-    useHttpAuthentication(i);
+        .addStore(new InMemoryStore({ model: PasswordCredential, primaryKey: 'userName' }))
+        .addStore(new InMemoryStore({ model: PasswordResetToken, primaryKey: 'token' }));
+    const repo = getRepository(i);
+    repo.createDataSet(User, 'username');
+    repo.createDataSet(DefaultSession, 'sessionId');
+    repo.createDataSet(PasswordCredential, 'userName');
+    repo.createDataSet(PasswordResetToken, 'token');
+    usePasswordPolicy(i);
+    useHttpAuthentication(i, { enableBasicAuth: options?.enableBasicAuth ?? true });
 };
 const setupUser = async (i, userName, password) => {
     const sm = i.getInstance(StoreManager);
@@ -155,28 +163,25 @@ describe('HttpUserContext', () => {
         });
     });
     describe('authenticateRequest', () => {
-        it('Should try to authenticate with Basic, if enabled', async () => {
+        it('Should authenticate with Basic Auth when enabled and valid credentials provided', async () => {
             await usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
+                await setupUser(i, 'testuser', 'password');
                 const ctx = i.getInstance(HttpUserContext);
-                ctx.authenticateUser = vi.fn(async () => testUser);
                 const result = await ctx.authenticateRequest({
                     headers: { authorization: `Basic dGVzdHVzZXI6cGFzc3dvcmQ=` },
                 });
-                expect(ctx.authenticateUser).toBeCalledWith('testuser', 'password');
-                expect(result).toBe(testUser);
+                expect(result.username).toBe('testuser');
             });
         });
-        it('Should NOT try to authenticate with Basic, if disabled', async () => {
+        it('Should NOT try to authenticate with Basic when disabled', async () => {
             await usingAsync(new Injector(), async (i) => {
-                await prepareInjector(i);
+                await prepareInjector(i, { enableBasicAuth: false });
+                await setupUser(i, 'testuser', 'password');
                 const ctx = i.getInstance(HttpUserContext);
-                ctx.authentication.enableBasicAuth = false;
-                ctx.authenticateUser = vi.fn(async () => testUser);
                 await expect(ctx.authenticateRequest({
                     headers: { authorization: `Basic dGVzdHVzZXI6cGFzc3dvcmQ=` },
                 })).rejects.toThrowError(UnauthenticatedError);
-                expect(ctx.authenticateUser).not.toBeCalled();
             });
         });
         it('Should fail with no session in the store', async () => {
@@ -192,9 +197,10 @@ describe('HttpUserContext', () => {
             await usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
-                await ctx.authentication
-                    .getSessionStore(i.getInstance(StoreManager))
-                    .add({ sessionId: '666', username: testUser.username });
+                await i.getInstance(StoreManager).getStoreFor(DefaultSession, 'sessionId').add({
+                    sessionId: '666',
+                    username: testUser.username,
+                });
                 await expect(ctx.authenticateRequest({
                     headers: { cookie: `${ctx.authentication.cookieName}=666;a=3` },
                 })).rejects.toThrowError(UnauthenticatedError);
@@ -204,16 +210,60 @@ describe('HttpUserContext', () => {
             await usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
-                await ctx.authentication
-                    .getSessionStore(i.getInstance(StoreManager))
-                    .add({ sessionId: '666', username: testUser.username });
-                await ctx.authentication.getUserStore(i.getInstance(StoreManager)).add({ ...testUser });
+                await i.getInstance(StoreManager).getStoreFor(DefaultSession, 'sessionId').add({
+                    sessionId: '666',
+                    username: testUser.username,
+                });
+                await i
+                    .getInstance(StoreManager)
+                    .getStoreFor(User, 'username')
+                    .add({ ...testUser });
                 const result = await ctx.authenticateRequest({
                     headers: { cookie: `${ctx.authentication.cookieName}=666;a=3` },
                 });
                 expect(result).toEqual(testUser);
             });
         });
+        it('Should iterate providers and return null results pass to next', async () => {
+            await usingAsync(new Injector(), async (i) => {
+                await prepareInjector(i);
+                const ctx = i.getInstance(HttpUserContext);
+                const provider1 = vi.fn(async () => null);
+                const provider2 = vi.fn(async () => testUser);
+                ctx.authentication.authenticationProviders = [
+                    { name: 'test-1', authenticate: provider1 },
+                    { name: 'test-2', authenticate: provider2 },
+                ];
+                const result = await ctx.authenticateRequest(request);
+                expect(provider1).toHaveBeenCalledOnce();
+                expect(provider2).toHaveBeenCalledOnce();
+                expect(result).toBe(testUser);
+            });
+        });
+        it('Should throw if provider throws (skipping remaining providers)', async () => {
+            await usingAsync(new Injector(), async (i) => {
+                await prepareInjector(i);
+                const ctx = i.getInstance(HttpUserContext);
+                const provider1 = vi.fn(async () => {
+                    throw new UnauthenticatedError();
+                });
+                const provider2 = vi.fn(async () => testUser);
+                ctx.authentication.authenticationProviders = [
+                    { name: 'test-1', authenticate: provider1 },
+                    { name: 'test-2', authenticate: provider2 },
+                ];
+                await expect(ctx.authenticateRequest(request)).rejects.toThrowError(UnauthenticatedError);
+                expect(provider2).not.toHaveBeenCalled();
+            });
+        });
+        it('Should throw UnauthenticatedError if no provider returns a user', async () => {
+            await usingAsync(new Injector(), async (i) => {
+                await prepareInjector(i);
+                const ctx = i.getInstance(HttpUserContext);
+                ctx.authentication.authenticationProviders = [{ name: 'test-1', authenticate: async () => null }];
+                await expect(ctx.authenticateRequest(request)).rejects.toThrowError(UnauthenticatedError);
+            });
+        });
     });
     describe('getCurrentUser', () => {
         it('Should return the current user from authenticateRequest() once per request', async () => {
@@ -235,14 +285,13 @@ describe('HttpUserContext', () => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
                 const setHeader = vi.fn();
+                const addMock = vi.fn(async () => ({}));
                 // @ts-expect-error
-                ctx.getSessionStore().add = vi.fn(async () => {
-                    return {};
-                });
+                ctx.getSessionDataSet = vi.fn(() => ({ add: addMock }));
                 const authResult = await ctx.cookieLogin(testUser, { setHeader });
                 expect(authResult).toBe(testUser);
                 expect(setHeader).toBeCalled();
-                expect(ctx.getSessionStore().add).toBeCalled();
+                expect(addMock).toBeCalled();
             });
         });
     });
@@ -252,18 +301,22 @@ describe('HttpUserContext', () => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
                 const setHeader = vi.fn();
+                const removeMock = vi.fn(async () => undefined);
+                const sessionDataSetMock = {
+                    add: vi.fn(async () => ({})),
+                    find: vi.fn(async () => [{ sessionId: 'example-session-id' }]),
+                    remove: removeMock,
+                    primaryKey: 'sessionId',
+                };
                 // @ts-expect-error
-                ctx.getSessionStore().add = vi.fn(async () => {
-                    return {};
-                });
+                ctx.getSessionDataSet = vi.fn(() => sessionDataSetMock);
                 ctx.authenticateRequest = vi.fn(async () => testUser);
-                ctx.getSessionStore().remove = vi.fn(async () => undefined);
                 ctx.getSessionIdFromRequest = () => 'example-session-id';
                 response.setHeader = vi.fn(() => response);
                 await ctx.cookieLogin(testUser, { setHeader });
                 await ctx.cookieLogout(request, response);
                 expect(response.setHeader).toBeCalledWith('Set-Cookie', 'fss=; Path=/; HttpOnly');
-                expect(ctx.getSessionStore().remove).toBeCalled();
+                expect(removeMock).toBeCalled();
             });
         });
     });
@@ -272,18 +325,20 @@ describe('HttpUserContext', () => {
             return usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
-                const userStore = i.getInstance(StoreManager).getStoreFor(User, 'username');
-                await userStore.add(testUser);
+                const sm = i.getInstance(StoreManager);
+                await sm.getStoreFor(User, 'username').add(testUser);
                 const pw = await i.getInstance(PasswordAuthenticator).hasher.createCredential(testUser.username, 'test');
-                await i.getInstance(StoreManager).getStoreFor(PasswordCredential, 'userName').add(pw);
+                await sm.getStoreFor(PasswordCredential, 'userName').add(pw);
                 await ctx.cookieLogin(testUser, { setHeader: vi.fn() });
                 const originalUser = await ctx.getCurrentUser(request);
                 expect(originalUser).toEqual(testUser);
+                const systemInjector = useSystemIdentityContext({ injector: i, username: 'test' });
+                const userDataSet = getDataSetFor(systemInjector, User, 'username');
                 const updatedUser = { ...testUser, roles: ['newFancyRole'] };
-                await userStore.update(testUser.username, updatedUser);
+                await userDataSet.update(systemInjector, testUser.username, updatedUser);
                 const updatedUserFromContext = await ctx.getCurrentUser(request);
                 expect(updatedUserFromContext.roles).toEqual(['newFancyRole']);
-                await userStore.update(testUser.username, { ...updatedUser, roles: [] });
+                await userDataSet.update(systemInjector, testUser.username, { ...updatedUser, roles: [] });
                 const reloadedUserFromContext = await ctx.getCurrentUser(request);
                 expect(reloadedUserFromContext.roles).toEqual([]);
             });
@@ -292,14 +347,16 @@ describe('HttpUserContext', () => {
             return usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
-                const userStore = i.getInstance(StoreManager).getStoreFor(User, 'username');
-                await userStore.add(testUser);
+                const sm = i.getInstance(StoreManager);
+                await sm.getStoreFor(User, 'username').add(testUser);
                 const pw = await i.getInstance(PasswordAuthenticator).hasher.createCredential(testUser.username, 'test');
-                await i.getInstance(StoreManager).getStoreFor(PasswordCredential, 'userName').add(pw);
+                await sm.getStoreFor(PasswordCredential, 'userName').add(pw);
                 await ctx.cookieLogin(testUser, { setHeader: vi.fn() });
                 const originalUser = await ctx.getCurrentUser(request);
                 expect(originalUser).toEqual(testUser);
-                await userStore.remove(testUser.username);
+                const systemInjector = useSystemIdentityContext({ injector: i, username: 'test' });
+                const userDataSet = getDataSetFor(systemInjector, User, 'username');
+                await userDataSet.remove(systemInjector, testUser.username);
                 await expect(() => ctx.getCurrentUser(request)).rejects.toThrowError(UnauthenticatedError);
             });
         });
@@ -307,21 +364,22 @@ describe('HttpUserContext', () => {
             return usingAsync(new Injector(), async (i) => {
                 await prepareInjector(i);
                 const ctx = i.getInstance(HttpUserContext);
-                const userStore = i.getInstance(StoreManager).getStoreFor(User, 'username');
-                await userStore.add(testUser);
+                const sm = i.getInstance(StoreManager);
+                await sm.getStoreFor(User, 'username').add(testUser);
                 let sessionId = '';
                 const pw = await i.getInstance(PasswordAuthenticator).hasher.createCredential(testUser.username, 'test');
-                await i.getInstance(StoreManager).getStoreFor(PasswordCredential, 'userName').add(pw);
+                await sm.getStoreFor(PasswordCredential, 'userName').add(pw);
                 await ctx.cookieLogin(testUser, {
                     setHeader: (_headerName, headerValue) => {
-                        sessionId = headerValue;
+                        sessionId = headerValue.split('=')[1].split(';')[0];
                         return {};
                     },
                 });
                 const originalUser = await ctx.getCurrentUser(request);
                 expect(originalUser).toEqual(testUser);
-                const sessionStore = ctx.getSessionStore();
-                await sessionStore.remove(sessionId);
+                const systemInjector = useSystemIdentityContext({ injector: i, username: 'test' });
+                const sessionDataSet = getDataSetFor(systemInjector, DefaultSession, 'sessionId');
+                await sessionDataSet.remove(systemInjector, sessionId);
                 await expect(() => ctx.getCurrentUser(request)).rejects.toThrowError(UnauthenticatedError);
             });
         });