@spinajs/session-provider-db 2.0.481 → 2.0.484

package/lib/cjs/index.d.ts

@@ -1,17 +1,38 @@
-import { SessionProvider, ISession, User } from '@spinajs/rbac';
+import { SessionProvider, ISession } from '@spinajs/rbac';
 import { Log } from '@spinajs/log';
 export * from './models/DbSession.js';
 export * from './migrations/UserSessionDBSqlMigration_2022_06_28_01_01_01.js';
+/**
+ * Relational-db backed session store. Conforms to the `@spinajs/rbac`
+ * `SessionProvider` contract: ownership is the numeric `UserId`, expiration is
+ * owned by the injected strategy (`this.Expiration`) and persisted verbatim, and
+ * `Data` is (de)serialized with the shared session codec.
+ */
 export declare class DbSessionStore extends SessionProvider {
     protected Log: Log;
-    protected CleanupInterval: any;
-    protected DefaultExpirationTime: number;
+    /**
+     * How often expired rows are swept, in milliseconds. Reads the correctly
+     * spelled `rbac.session.db.cleanupInterval` key (fixes B2 — the historic typo
+     * `cleanupInteval` meant the configured value was ignored).
+     */
+    protected CleanupInterval: number;
     resolve(): Promise<void>;
+    /**
+     * Removes every session whose expiration has passed.
+     *
+     * Extracted from the cleanup timer so it can be exercised directly.
+     *
+     * @returns how many sessions were removed
+     */
+    cleanupExpired(): Promise<number>;
     restore(sessionId: string): Promise<ISession | null>;
+    save(session: ISession): Promise<void>;
+    touch(session: ISession): Promise<boolean>;
     delete(sessionId: string): Promise<void>;
-    save(sessionOrId: string | ISession, data?: object): Promise<void>;
-    touch(session: ISession): Promise<void>;
-    logsOut(user: User): Promise<void>;
+    deleteByUser(userId: number): Promise<void>;
+    listByUser(userId: number): Promise<ISession[]>;
     truncate(): Promise<void>;
+    private toSession;
+    private expirationEquals;
 }
 //# sourceMappingURL=index.d.ts.map

package/lib/cjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAQ3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,+DAA+D,CAAC;AAE9E,qBACa,cAAe,SAAQ,eAAe;IAEjD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAKnB,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;IAG/B,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAE3B,OAAO;IAQP,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAuBpD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlE,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAqD,MAAM,eAAe,CAAC;AAE7G,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAM3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,+DAA+D,CAAC;AAE9E;;;;;GAKG;AACH,qBACa,cAAe,SAAQ,eAAe;IAEjD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;;;OAIG;IAIH,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAErB,OAAO;IAWpB;;;;;;OAMG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAgBjC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAmBpD,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtC,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB1C,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc3C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAM/C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,gBAAgB;CAMzB"}

package/lib/cjs/index.js

@@ -22,9 +22,6 @@ var __exportStar = (this && this.__exportStar) || function(m, exports) {
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
-var __importDefault = (this && this.__importDefault) || function (mod) {
-    return (mod && mod.__esModule) ? mod : { "default": mod };
-};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.DbSessionStore = void 0;
 const rbac_1 = require("@spinajs/rbac");
@@ -34,67 +31,122 @@ const DbSession_js_1 = require("./models/DbSession.js");
 const orm_1 = require("@spinajs/orm");
 const configuration_1 = require("@spinajs/configuration");
 const luxon_1 = require("luxon");
-const lodash_1 = __importDefault(require("lodash"));
-const util_1 = require("@spinajs/util");
 __exportStar(require("./models/DbSession.js"), exports);
 __exportStar(require("./migrations/UserSessionDBSqlMigration_2022_06_28_01_01_01.js"), exports);
+/**
+ * Relational-db backed session store. Conforms to the `@spinajs/rbac`
+ * `SessionProvider` contract: ownership is the numeric `UserId`, expiration is
+ * owned by the injected strategy (`this.Expiration`) and persisted verbatim, and
+ * `Data` is (de)serialized with the shared session codec.
+ */
 let DbSessionStore = class DbSessionStore extends rbac_1.SessionProvider {
     async resolve() {
-        setInterval(async () => {
-            const c = await DbSession_js_1.DbSession.destroy().where('Expiration', '<=', luxon_1.DateTime.now());
-            this.Log.info(`Cleaned up expired session, count: ${c.RowsAffected}`);
+        const timer = setInterval(async () => {
+            const count = await this.cleanupExpired();
+            this.Log.info(`Cleaned up expired session, count: ${count}`);
         }, this.CleanupInterval);
+        // do not keep the process alive solely for the cleanup timer
+        timer.unref?.();
+    }
+    /**
+     * Removes every session whose expiration has passed.
+     *
+     * Extracted from the cleanup timer so it can be exercised directly.
+     *
+     * @returns how many sessions were removed
+     */
+    async cleanupExpired() {
+        // NOTE: same reason as in deleteByUser — destroy() only builds a DELETE
+        // bounded by primary keys, so the expired rows are looked up first.
+        // `destroy().where(...)` threw on every tick and no session was ever
+        // cleaned up.
+        const expired = await DbSession_js_1.DbSession.where('Expiration', '<=', luxon_1.DateTime.now());
+        if (expired.length === 0) {
+            return 0;
+        }
+        await DbSession_js_1.DbSession.destroy(expired.map((s) => s.SessionId));
+        return expired.length;
     }
     async restore(sessionId) {
-        const session = await DbSession_js_1.DbSession.where({
+        const row = await DbSession_js_1.DbSession.where({
             SessionId: sessionId,
         }).first();
-        if (!session) {
+        if (!row) {
             return null;
         }
-        if (session.Expiration < luxon_1.DateTime.now()) {
+        const session = this.toSession(row);
+        // an expired row is treated as absent
+        if (this.isExpired(session)) {
             return null;
         }
-        const sData = JSON.parse(session.Data);
-        return new rbac_1.UserSession({
-            SessionId: session.SessionId,
-            Creation: session.CreatedAt,
-            Data: new Map(Object.entries(sData)),
-            Expiration: session.Expiration,
-        });
+        return session;
     }
-    async delete(sessionId) {
-        await DbSession_js_1.DbSession.destroy(sessionId);
-    }
-    async save(sessionOrId, data) {
-        const sessionId = lodash_1.default.isString(sessionOrId) ? sessionOrId : sessionOrId.SessionId;
-        const userId = lodash_1.default.isString(sessionOrId) ? null : sessionOrId.UserId;
-        const sData = lodash_1.default.isString(sessionOrId) ? data : sessionOrId.Data;
-        let sCreationTime = luxon_1.DateTime.now();
-        let sExpirationTime = luxon_1.DateTime.now().plus({ minutes: this.DefaultExpirationTime });
+    async save(session) {
+        // Persist `Expiration` verbatim (fixes B3). Only a brand-new session with no
+        // scheduled expiration is given its initial expiry via the strategy.
+        if (session.Expiration === undefined) {
+            this.applyInitialExpiration(session);
+        }
         const s = await DbSession_js_1.DbSession.getOrNew({
-            SessionId: sessionId,
-            CreatedAt: sCreationTime,
-            Expiration: sExpirationTime,
-            UserId: userId
+            SessionId: session.SessionId,
         });
-        s.Data = JSON.stringify(Object.fromEntries(sData), util_1.replacer);
+        s.SessionId = session.SessionId;
+        s.CreatedAt = session.Creation;
+        // column is nullable; a never-expiring session persists a NULL Expiration
+        s.Expiration = (session.Expiration ?? null);
+        s.UserId = session.UserId;
+        s.Data = (0, rbac_1.encodeSessionData)(session.Data);
         await s.insert(orm_1.InsertBehaviour.InsertOrUpdate);
     }
     async touch(session) {
+        const current = session.Expiration;
+        const renewed = this.Expiration.renew(session);
+        // unchanged (e.g. AbsoluteExpiration) — skip the write, report false
+        if (this.expirationEquals(current, renewed)) {
+            return false;
+        }
+        session.Expiration = renewed;
         await DbSession_js_1.DbSession.update({
-            Expiration: session.Expiration,
+            Expiration: renewed,
         }).where('SessionId', session.SessionId);
+        return true;
     }
-    async logsOut(user) {
-        const sessionsToDelete = await DbSession_js_1.DbSession.where('UserId', user.Id);
-        if (sessionsToDelete.length > 0) {
-            await DbSession_js_1.DbSession.destroy(sessionsToDelete.map((x) => x.SessionId));
+    async delete(sessionId) {
+        await DbSession_js_1.DbSession.destroy(sessionId);
+    }
+    async deleteByUser(userId) {
+        // NOTE: destroy() refuses to build an unbounded DELETE, so the sessions of
+        // the user are resolved to their primary keys first. `destroy().where(...)`
+        // threw "Cannot destroy without primary keys", which broke every forced
+        // logout ( admin "log out user" route included ).
+        const sessions = await DbSession_js_1.DbSession.where('UserId', userId);
+        if (sessions.length === 0) {
+            return;
         }
+        await DbSession_js_1.DbSession.destroy(sessions.map((s) => s.SessionId));
+    }
+    async listByUser(userId) {
+        const rows = await DbSession_js_1.DbSession.where('UserId', userId);
+        return rows.map((r) => this.toSession(r)).filter((s) => !this.isExpired(s));
     }
     async truncate() {
         await DbSession_js_1.DbSession.truncate();
     }
+    toSession(row) {
+        return new rbac_1.UserSession({
+            SessionId: row.SessionId,
+            UserId: row.UserId,
+            Creation: row.CreatedAt,
+            Expiration: row.Expiration ?? undefined,
+            Data: (0, rbac_1.decodeSessionData)(row.Data),
+        });
+    }
+    expirationEquals(a, b) {
+        if (a === undefined || b === undefined) {
+            return a === b;
+        }
+        return a.toMillis() === b.toMillis();
+    }
 };
 exports.DbSessionStore = DbSessionStore;
 __decorate([
@@ -102,15 +154,11 @@ __decorate([
     __metadata("design:type", log_1.Log)
 ], DbSessionStore.prototype, "Log", void 0);
 __decorate([
-    (0, configuration_1.Config)('rbac.session.db.cleanupInteval', {
+    (0, configuration_1.Config)('rbac.session.db.cleanupInterval', {
         defaultValue: 100000,
     }),
-    __metadata("design:type", Object)
-], DbSessionStore.prototype, "CleanupInterval", void 0);
-__decorate([
-    (0, configuration_1.Config)('rbac.session.expiration'),
     __metadata("design:type", Number)
-], DbSessionStore.prototype, "DefaultExpirationTime", void 0);
+], DbSessionStore.prototype, "CleanupInterval", void 0);
 exports.DbSessionStore = DbSessionStore = __decorate([
     (0, di_1.Injectable)(rbac_1.SessionProvider)
 ], DbSessionStore);

package/lib/cjs/index.js.map

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

package/lib/mjs/index.d.ts

@@ -1,17 +1,38 @@
-import { SessionProvider, ISession, User } from '@spinajs/rbac';
+import { SessionProvider, ISession } from '@spinajs/rbac';
 import { Log } from '@spinajs/log';
 export * from './models/DbSession.js';
 export * from './migrations/UserSessionDBSqlMigration_2022_06_28_01_01_01.js';
+/**
+ * Relational-db backed session store. Conforms to the `@spinajs/rbac`
+ * `SessionProvider` contract: ownership is the numeric `UserId`, expiration is
+ * owned by the injected strategy (`this.Expiration`) and persisted verbatim, and
+ * `Data` is (de)serialized with the shared session codec.
+ */
 export declare class DbSessionStore extends SessionProvider {
     protected Log: Log;
-    protected CleanupInterval: any;
-    protected DefaultExpirationTime: number;
+    /**
+     * How often expired rows are swept, in milliseconds. Reads the correctly
+     * spelled `rbac.session.db.cleanupInterval` key (fixes B2 — the historic typo
+     * `cleanupInteval` meant the configured value was ignored).
+     */
+    protected CleanupInterval: number;
     resolve(): Promise<void>;
+    /**
+     * Removes every session whose expiration has passed.
+     *
+     * Extracted from the cleanup timer so it can be exercised directly.
+     *
+     * @returns how many sessions were removed
+     */
+    cleanupExpired(): Promise<number>;
     restore(sessionId: string): Promise<ISession | null>;
+    save(session: ISession): Promise<void>;
+    touch(session: ISession): Promise<boolean>;
     delete(sessionId: string): Promise<void>;
-    save(sessionOrId: string | ISession, data?: object): Promise<void>;
-    touch(session: ISession): Promise<void>;
-    logsOut(user: User): Promise<void>;
+    deleteByUser(userId: number): Promise<void>;
+    listByUser(userId: number): Promise<ISession[]>;
     truncate(): Promise<void>;
+    private toSession;
+    private expirationEquals;
 }
 //# sourceMappingURL=index.d.ts.map

package/lib/mjs/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAe,IAAI,EAAE,MAAM,eAAe,CAAC;AAE7E,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAQ3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,+DAA+D,CAAC;AAE9E,qBACa,cAAe,SAAQ,eAAe;IAEjD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAKnB,SAAS,CAAC,eAAe,EAAE,GAAG,CAAC;IAG/B,SAAS,CAAC,qBAAqB,EAAE,MAAM,CAAC;IAE3B,OAAO;IAQP,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAuBpD,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,IAAI,CAAC,WAAW,EAAE,MAAM,GAAG,QAAQ,EAAE,IAAI,CAAC,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAkBlE,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAMvC,OAAO,CAAC,IAAI,EAAE,IAAI,GAAG,OAAO,CAAC,IAAI,CAAC;IAQlC,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;CAGvC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAqD,MAAM,eAAe,CAAC;AAE7G,OAAO,EAAU,GAAG,EAAE,MAAM,cAAc,CAAC;AAM3C,cAAc,uBAAuB,CAAC;AACtC,cAAc,+DAA+D,CAAC;AAE9E;;;;;GAKG;AACH,qBACa,cAAe,SAAQ,eAAe;IAEjD,SAAS,CAAC,GAAG,EAAE,GAAG,CAAC;IAEnB;;;;OAIG;IAIH,SAAS,CAAC,eAAe,EAAE,MAAM,CAAC;IAErB,OAAO;IAWpB;;;;;;OAMG;IACU,cAAc,IAAI,OAAO,CAAC,MAAM,CAAC;IAgBjC,OAAO,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,GAAG,IAAI,CAAC;IAmBpD,IAAI,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,IAAI,CAAC;IAqBtC,KAAK,CAAC,OAAO,EAAE,QAAQ,GAAG,OAAO,CAAC,OAAO,CAAC;IAiB1C,MAAM,CAAC,SAAS,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAIxC,YAAY,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,IAAI,CAAC;IAc3C,UAAU,CAAC,MAAM,EAAE,MAAM,GAAG,OAAO,CAAC,QAAQ,EAAE,CAAC;IAM/C,QAAQ,IAAI,OAAO,CAAC,IAAI,CAAC;IAItC,OAAO,CAAC,SAAS;IAUjB,OAAO,CAAC,gBAAgB;CAMzB"}

package/lib/mjs/index.js

@@ -7,89 +7,140 @@ 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 { SessionProvider, UserSession } from '@spinajs/rbac';
+import { SessionProvider, UserSession, encodeSessionData, decodeSessionData } from '@spinajs/rbac';
 import { Injectable } from '@spinajs/di';
 import { Logger, Log } from '@spinajs/log';
 import { DbSession } from './models/DbSession.js';
 import { InsertBehaviour } from '@spinajs/orm';
 import { Config } from '@spinajs/configuration';
 import { DateTime } from 'luxon';
-import _ from 'lodash';
-import { replacer } from '@spinajs/util';
 export * from './models/DbSession.js';
 export * from './migrations/UserSessionDBSqlMigration_2022_06_28_01_01_01.js';
+/**
+ * Relational-db backed session store. Conforms to the `@spinajs/rbac`
+ * `SessionProvider` contract: ownership is the numeric `UserId`, expiration is
+ * owned by the injected strategy (`this.Expiration`) and persisted verbatim, and
+ * `Data` is (de)serialized with the shared session codec.
+ */
 let DbSessionStore = class DbSessionStore extends SessionProvider {
     async resolve() {
-        setInterval(async () => {
-            const c = await DbSession.destroy().where('Expiration', '<=', DateTime.now());
-            this.Log.info(`Cleaned up expired session, count: ${c.RowsAffected}`);
+        const timer = setInterval(async () => {
+            const count = await this.cleanupExpired();
+            this.Log.info(`Cleaned up expired session, count: ${count}`);
         }, this.CleanupInterval);
+        // do not keep the process alive solely for the cleanup timer
+        timer.unref?.();
+    }
+    /**
+     * Removes every session whose expiration has passed.
+     *
+     * Extracted from the cleanup timer so it can be exercised directly.
+     *
+     * @returns how many sessions were removed
+     */
+    async cleanupExpired() {
+        // NOTE: same reason as in deleteByUser — destroy() only builds a DELETE
+        // bounded by primary keys, so the expired rows are looked up first.
+        // `destroy().where(...)` threw on every tick and no session was ever
+        // cleaned up.
+        const expired = await DbSession.where('Expiration', '<=', DateTime.now());
+        if (expired.length === 0) {
+            return 0;
+        }
+        await DbSession.destroy(expired.map((s) => s.SessionId));
+        return expired.length;
     }
     async restore(sessionId) {
-        const session = await DbSession.where({
+        const row = await DbSession.where({
             SessionId: sessionId,
         }).first();
-        if (!session) {
+        if (!row) {
             return null;
         }
-        if (session.Expiration < DateTime.now()) {
+        const session = this.toSession(row);
+        // an expired row is treated as absent
+        if (this.isExpired(session)) {
             return null;
         }
-        const sData = JSON.parse(session.Data);
-        return new UserSession({
-            SessionId: session.SessionId,
-            Creation: session.CreatedAt,
-            Data: new Map(Object.entries(sData)),
-            Expiration: session.Expiration,
-        });
-    }
-    async delete(sessionId) {
-        await DbSession.destroy(sessionId);
+        return session;
     }
-    async save(sessionOrId, data) {
-        const sessionId = _.isString(sessionOrId) ? sessionOrId : sessionOrId.SessionId;
-        const userId = _.isString(sessionOrId) ? null : sessionOrId.UserId;
-        const sData = _.isString(sessionOrId) ? data : sessionOrId.Data;
-        let sCreationTime = DateTime.now();
-        let sExpirationTime = DateTime.now().plus({ minutes: this.DefaultExpirationTime });
+    async save(session) {
+        // Persist `Expiration` verbatim (fixes B3). Only a brand-new session with no
+        // scheduled expiration is given its initial expiry via the strategy.
+        if (session.Expiration === undefined) {
+            this.applyInitialExpiration(session);
+        }
         const s = await DbSession.getOrNew({
-            SessionId: sessionId,
-            CreatedAt: sCreationTime,
-            Expiration: sExpirationTime,
-            UserId: userId
+            SessionId: session.SessionId,
         });
-        s.Data = JSON.stringify(Object.fromEntries(sData), replacer);
+        s.SessionId = session.SessionId;
+        s.CreatedAt = session.Creation;
+        // column is nullable; a never-expiring session persists a NULL Expiration
+        s.Expiration = (session.Expiration ?? null);
+        s.UserId = session.UserId;
+        s.Data = encodeSessionData(session.Data);
         await s.insert(InsertBehaviour.InsertOrUpdate);
     }
     async touch(session) {
+        const current = session.Expiration;
+        const renewed = this.Expiration.renew(session);
+        // unchanged (e.g. AbsoluteExpiration) — skip the write, report false
+        if (this.expirationEquals(current, renewed)) {
+            return false;
+        }
+        session.Expiration = renewed;
         await DbSession.update({
-            Expiration: session.Expiration,
+            Expiration: renewed,
         }).where('SessionId', session.SessionId);
+        return true;
     }
-    async logsOut(user) {
-        const sessionsToDelete = await DbSession.where('UserId', user.Id);
-        if (sessionsToDelete.length > 0) {
-            await DbSession.destroy(sessionsToDelete.map((x) => x.SessionId));
+    async delete(sessionId) {
+        await DbSession.destroy(sessionId);
+    }
+    async deleteByUser(userId) {
+        // NOTE: destroy() refuses to build an unbounded DELETE, so the sessions of
+        // the user are resolved to their primary keys first. `destroy().where(...)`
+        // threw "Cannot destroy without primary keys", which broke every forced
+        // logout ( admin "log out user" route included ).
+        const sessions = await DbSession.where('UserId', userId);
+        if (sessions.length === 0) {
+            return;
         }
+        await DbSession.destroy(sessions.map((s) => s.SessionId));
+    }
+    async listByUser(userId) {
+        const rows = await DbSession.where('UserId', userId);
+        return rows.map((r) => this.toSession(r)).filter((s) => !this.isExpired(s));
     }
     async truncate() {
         await DbSession.truncate();
     }
+    toSession(row) {
+        return new UserSession({
+            SessionId: row.SessionId,
+            UserId: row.UserId,
+            Creation: row.CreatedAt,
+            Expiration: row.Expiration ?? undefined,
+            Data: decodeSessionData(row.Data),
+        });
+    }
+    expirationEquals(a, b) {
+        if (a === undefined || b === undefined) {
+            return a === b;
+        }
+        return a.toMillis() === b.toMillis();
+    }
 };
 __decorate([
     Logger('db-session-store'),
     __metadata("design:type", Log)
 ], DbSessionStore.prototype, "Log", void 0);
 __decorate([
-    Config('rbac.session.db.cleanupInteval', {
+    Config('rbac.session.db.cleanupInterval', {
         defaultValue: 100000,
     }),
-    __metadata("design:type", Object)
-], DbSessionStore.prototype, "CleanupInterval", void 0);
-__decorate([
-    Config('rbac.session.expiration'),
     __metadata("design:type", Number)
-], DbSessionStore.prototype, "DefaultExpirationTime", void 0);
+], DbSessionStore.prototype, "CleanupInterval", void 0);
 DbSessionStore = __decorate([
     Injectable(SessionProvider)
 ], DbSessionStore);

package/lib/mjs/index.js.map

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