@spinajs/rbac-http-user 2.0.485 → 2.0.487

package/lib/cjs/controllers/UserController.js

@@ -1,43 +1,10 @@
 "use strict";
-var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    var desc = Object.getOwnPropertyDescriptor(m, k);
-    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
-      desc = { enumerable: true, get: function() { return m[k]; } };
-    }
-    Object.defineProperty(o, k2, desc);
-}) : (function(o, m, k, k2) {
-    if (k2 === undefined) k2 = k;
-    o[k2] = m[k];
-}));
-var __setModuleDefault = (this && this.__setModuleDefault) || (Object.create ? (function(o, v) {
-    Object.defineProperty(o, "default", { enumerable: true, value: v });
-}) : function(o, v) {
-    o["default"] = v;
-});
 var __decorate = (this && this.__decorate) || function (decorators, target, key, desc) {
     var c = arguments.length, r = c < 3 ? target : desc === null ? desc = Object.getOwnPropertyDescriptor(target, key) : desc, d;
     if (typeof Reflect === "object" && typeof Reflect.decorate === "function") r = Reflect.decorate(decorators, target, key, desc);
     else for (var i = decorators.length - 1; i >= 0; i--) if (d = decorators[i]) r = (c < 3 ? d(r) : c > 3 ? d(target, key, r) : d(target, key)) || r;
     return c > 3 && r && Object.defineProperty(target, key, r), r;
 };
-var __importStar = (this && this.__importStar) || (function () {
-    var ownKeys = function(o) {
-        ownKeys = Object.getOwnPropertyNames || function (o) {
-            var ar = [];
-            for (var k in o) if (Object.prototype.hasOwnProperty.call(o, k)) ar[ar.length] = k;
-            return ar;
-        };
-        return ownKeys(o);
-    };
-    return function (mod) {
-        if (mod && mod.__esModule) return mod;
-        var result = {};
-        if (mod != null) for (var k = ownKeys(mod), i = 0; i < k.length; i++) if (k[i] !== "default") __createBinding(result, mod, k[i]);
-        __setModuleDefault(result, mod);
-        return result;
-    };
-})();
 var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
@@ -51,10 +18,10 @@ const rbac_1 = require("@spinajs/rbac");
 const http_1 = require("@spinajs/http");
 const exceptions_1 = require("@spinajs/exceptions");
 const di_1 = require("@spinajs/di");
-const configuration_1 = require("@spinajs/configuration");
-const cs = __importStar(require("cookie-signature"));
 const rbac_http_1 = require("@spinajs/rbac-http");
 const util_1 = require("@spinajs/util");
+const grants_js_1 = require("../services/grants.js");
+const SessionCookies_js_1 = require("../services/SessionCookies.js");
 /**
  * Current user profile management.
  * Allows an authenticated user to read and modify their own account — refresh profile data,
@@ -75,10 +42,11 @@ let UserController = class UserController extends http_1.BaseController {
         // get user data from db
         await user.refresh();
         await user.Metadata.populate();
-        // refresh session data from DB
-        const sId = cs.unsign(ssid, this.CoockieSecret);
-        if (sId) {
-            const session = await this.SessionProvider.restore(sId);
+        // `@Cookie(true)` hands over the already-unsigned session id — the previous
+        // unsigned read plus a hand-rolled `cookie-signature` call duplicated what
+        // the framework's own extractor does, secret lookup included.
+        if (ssid) {
+            const session = await this.SessionProvider.restore(ssid);
             if (session) {
                 // Session stores the user UUID (see LoginController) — RbacUserFactory
                 // resolves the user from it on each request. Storing a dehydrated object
@@ -87,22 +55,28 @@ let UserController = class UserController extends http_1.BaseController {
                 await this.SessionProvider.save(session);
             }
         }
-        return new http_1.Ok(user.dehydrate());
+        // Same shape as every other user-bearing response ( login, whoami, 2FA
+        // verify ): relations included and DateTime rendered as ISO strings. Plain
+        // `dehydrate()` dropped Role/Metadata and emitted raw DateTime objects, so
+        // a client refreshing its profile got a different user than it logged in with.
+        return new http_1.Ok(user.dehydrateWithRelations({ dateTimeFormat: 'iso' }));
     }
     /**
      * Get current user grants
-     * Returns the flattened RBAC grants for the authenticated user, combining all roles
-     * the user is assigned to into a single permission map keyed by resource.
+     * Returns the flattened RBAC grants in effect for the authenticated user — those of
+     * the session's active role, resolved through its inheritance chain. Switching the
+     * active role (`POST /auth/active-role`) changes what this returns.
      * @security cookieAuth
-     * @returns {IGrantsMap} Combined RBAC grants map: resource → action → permission descriptor
+     * @returns {IGrantsMap} RBAC grants map for the active role: resource → action → permission descriptor
      * @response 401 Unauthorized — valid session required
      * @response 403 Forbidden — insufficient permissions
      */
-    async getGrants(user) {
-        const grants = this.AC.getGrants();
-        const userGrants = user.Role.map(r => (0, rbac_1._unwindGrants)(r, grants));
-        const combinedGrants = Object.assign({}, ...userGrants);
-        return new http_1.Ok(combinedGrants);
+    async getGrants(user, session) {
+        // Enforcement is bound to the session's ActiveRole, so reporting the union
+        // of every assigned role told clients about actions the server would then
+        // refuse — a user holding both 'admin' and 'user' saw admin grants while
+        // acting as 'user'. Resolve exactly what the middleware resolves.
+        return new http_1.Ok((0, grants_js_1.grantsFor)(this.AC, (0, grants_js_1.activeRoleOf)(user, session)));
     }
     /**
      * Change own password
@@ -113,13 +87,35 @@ let UserController = class UserController extends http_1.BaseController {
      * @response 401 Unauthorized — valid session required
      * @response 403 Forbidden — insufficient permissions
      */
-    async newPassword(user, pwd) {
+    async newPassword(user, pwd, session) {
         if (pwd.Password !== pwd.ConfirmPassword) {
             throw new exceptions_1.InvalidArgument('password does not match');
         }
-        return new http_1.Ok((0, util_1._chain)(user, (0, util_1._either)((0, rbac_1.passwordMatch)(pwd.OldPassword), (0, rbac_1.changePassword)(pwd.Password), () => {
+        await (0, util_1._chain)(user, (0, util_1._either)((0, rbac_1.passwordMatch)(pwd.OldPassword), (0, rbac_1.changePassword)(pwd.Password), () => {
             throw new exceptions_1.InvalidArgument('Old password is incorrect');
-        })));
+        }));
+        // `changePassword` destroys every session of this user — anyone who got in
+        // with the old password is out, which is the whole point. That includes the
+        // caller's own session, so it is replaced here with a brand new one ( a new
+        // id, not the old one revived ) and the client is handed the new cookie.
+        const replacement = new rbac_1.UserSession();
+        replacement.UserId = user.Id;
+        if (session) {
+            for (const [key, value] of session.Data) {
+                replacement.Data.set(key, value);
+            }
+        }
+        else {
+            replacement.Data.set('User', user.Uuid);
+            replacement.Data.set('Logged', true);
+            replacement.Data.set('Authorized', true);
+            replacement.Data.set('ActiveRole', user.Role?.[0]);
+        }
+        await this.SessionProvider.save(replacement);
+        return new http_1.Ok(null, {
+            Coockies: [this.SessionCookies.issue(replacement)],
+            Headers: [{ Name: 'Cache-Control', Value: 'no-store' }],
+        });
     }
 };
 exports.UserController = UserController;
@@ -127,10 +123,6 @@ __decorate([
     (0, di_1.Autoinject)(),
     __metadata("design:type", rbac_1.PasswordProvider)
 ], UserController.prototype, "PasswordProvider", void 0);
-__decorate([
-    (0, configuration_1.Config)('http.cookie.secret'),
-    __metadata("design:type", String)
-], UserController.prototype, "CoockieSecret", void 0);
 __decorate([
     (0, di_1.Autoinject)(),
     __metadata("design:type", rbac_1.SessionProvider)
@@ -139,11 +131,15 @@ __decorate([
     (0, di_1.Autoinject)(rbac_1.AccessControl),
     __metadata("design:type", rbac_1.AccessControl)
 ], UserController.prototype, "AC", void 0);
+__decorate([
+    (0, di_1.Autoinject)(SessionCookies_js_1.SessionCookieFactory),
+    __metadata("design:type", SessionCookies_js_1.SessionCookieFactory)
+], UserController.prototype, "SessionCookies", void 0);
 __decorate([
     (0, http_1.Get)(),
     (0, rbac_http_1.Permission)(['readOwn']),
     __param(0, (0, rbac_http_1.User)()),
-    __param(1, (0, http_1.Cookie)()),
+    __param(1, (0, rbac_http_1.SessionId)()),
     __metadata("design:type", Function),
     __metadata("design:paramtypes", [rbac_1.User, String]),
     __metadata("design:returntype", Promise)
@@ -152,8 +148,9 @@ __decorate([
     (0, http_1.Get)("grants"),
     (0, rbac_http_1.Permission)(['readOwn']),
     __param(0, (0, rbac_http_1.User)()),
+    __param(1, (0, rbac_http_1.Session)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [rbac_1.User]),
+    __metadata("design:paramtypes", [rbac_1.User, Object]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "getGrants", null);
 __decorate([
@@ -161,8 +158,9 @@ __decorate([
     (0, rbac_http_1.Permission)(["updateOwn"]),
     __param(0, (0, rbac_http_1.User)()),
     __param(1, (0, http_1.Body)()),
+    __param(2, (0, rbac_http_1.Session)()),
     __metadata("design:type", Function),
-    __metadata("design:paramtypes", [rbac_1.User, password_dto_js_1.PasswordDto]),
+    __metadata("design:paramtypes", [rbac_1.User, password_dto_js_1.PasswordDto, Object]),
     __metadata("design:returntype", Promise)
 ], UserController.prototype, "newPassword", null);
 exports.UserController = UserController = __decorate([

package/lib/cjs/controllers/UserController.js.map

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

package/lib/cjs/controllers/UserMetadataController.d.ts

@@ -3,14 +3,20 @@ import { User as UserModel, UserMetadata } from '@spinajs/rbac';
 import { PaginationDTO, OrderDTO, IFilterRequest } from '@spinajs/orm-http';
 import { UserMetadataDto } from '../dto/metadata-dto.js';
 import { FilterableUserMetadata } from '../models/FilterableUserMetadata.js';
+import { UserMetadataService } from '../services/UserMetadataService.js';
 /**
  * User metadata management.
  * Provides CRUD operations for key-value metadata entries attached to user accounts.
  * Admin routes operate on any user (identified by UUID), while own routes operate on the
  * currently authenticated user's metadata.
+ *
+ * Both families delegate to {@link UserMetadataService}, which owns the owner
+ * scoping — the only thing that ever differed between them is where the owner
+ * id comes from.
  * @tags User Metadata
  */
 export declare class UserMetadataController extends BaseController {
+    protected Metadata: UserMetadataService;
     /**
      * List metadata for a specific user (admin)
      * Returns a paginated, filtered, and ordered list of metadata entries for the given user.
@@ -74,18 +80,6 @@ export declare class UserMetadataController extends BaseController {
      * @response 404 User or metadata entry not found
      */
     deleteUserMetadata(user: UserModel, meta: number): Promise<Ok<any>>;
-    /**
-     * List own metadata
-     * Returns a paginated, filtered, and ordered list of metadata entries for the authenticated user.
-     * @security cookieAuth
-     * @param pagination.page Page number (zero-based)
-     * @param pagination.limit Number of entries per page
-     * @param order.column Column to sort by (default: Id)
-     * @param order.order Sort direction: ASC or DESC (default: DESC)
-     * @returns {IUserMetadataEntry[]} Paginated list of own metadata entries
-     * @response 401 Unauthorized — valid session required
-     * @response 403 Forbidden — readOwn permission required
-     */
     /**
      * List own metadata
      * Returns a paginated, filtered, and ordered list of metadata entries for the authenticated user.

package/lib/cjs/controllers/UserMetadataController.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"UserMetadataController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserMetadataController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,EAAE,EAAwC,cAAc,EAAS,MAAM,eAAe,CAAC;AAChH,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAEhE,OAAO,EAAW,aAAa,EAAE,QAAQ,EAAU,cAAc,EAAa,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AAEzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAS7E;;;;;;GAMG;AACH,qBAGa,sBAAuB,SAAQ,cAAc;IAEtD;;;;;;;;;;;;;OAaG;IAGU,YAAY,CACc,IAAI,EAAE,SAAS,EACzC,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAEzB,MAAM,CAAC,EAAE,cAAc;IAc3B;;;;;;;;;;OAUG;IAGU,WAAW,CACe,IAAI,EAAE,SAAS,EACzC,GAAG,EAAE,MAAM;IAOxB;;;;;;;;;OASG;IAGU,eAAe,CACW,IAAI,EAAE,SAAS,EACvC,QAAQ,EAAE,YAAY;IAOrC;;;;;;;;;;;OAWG;IAGU,kBAAkB,CAOxB,IAAI,EAAE,YAAY,EACc,KAAK,EAAE,SAAS,EAC3C,IAAI,EAAE,eAAe;IAUjC;;;;;;;;;;OAUG;IAGU,kBAAkB,CACQ,IAAI,EAAE,SAAS,EACzC,IAAI,EAAE,MAAM;IASzB;;;;;;;;;;;OAWG;IAIH;;;;;;;;;;;OAWG;IAGU,QAAQ,CACT,IAAI,EAAE,SAAS,EACd,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAEzB,MAAM,CAAC,EAAE,cAAc;IAe3B;;;;;;;;;OASG;IAGU,OAAO,CAAS,IAAI,EAAE,SAAS,EAAW,GAAG,EAAE,MAAM;IAOlE;;;;;;;OAOG;IAGU,WAAW,CAAS,IAAI,EAAE,SAAS,EAAa,QAAQ,EAAE,YAAY;IAQnF;;;;;;;;;;OAUG;IAGU,cAAc,CAAS,IAAI,EAAE,SAAS,EAAW,IAAI,EAAE,MAAM,EAAU,IAAI,EAAE,eAAe;IAkBzG;;;;;;;;;OASG;IAGU,cAAc,CAAS,IAAI,EAAE,SAAS,EAAW,IAAI,EAAE,MAAM;CAK7E"}
+{"version":3,"file":"UserMetadataController.d.ts","sourceRoot":"","sources":["../../../src/controllers/UserMetadataController.ts"],"names":[],"mappings":"AAAA,OAAO,EAAkB,EAAE,EAAwC,cAAc,EAAS,MAAM,eAAe,CAAC;AAChH,OAAO,EAAE,IAAI,IAAI,SAAS,EAAE,YAAY,EAAE,MAAM,eAAe,CAAC;AAGhE,OAAO,EAAW,aAAa,EAAE,QAAQ,EAAU,cAAc,EAAa,MAAM,mBAAmB,CAAC;AACxG,OAAO,EAAE,eAAe,EAAE,MAAM,wBAAwB,CAAC;AACzD,OAAO,EAAE,sBAAsB,EAAE,MAAM,qCAAqC,CAAC;AAC7E,OAAO,EAAE,mBAAmB,EAAE,MAAM,oCAAoC,CAAC;AAEzE;;;;;;;;;;GAUG;AACH,qBAGa,sBAAuB,SAAQ,cAAc;IAGtD,SAAS,CAAC,QAAQ,EAAE,mBAAmB,CAAC;IAExC;;;;;;;;;;;;;OAaG;IAGU,YAAY,CACc,IAAI,EAAE,SAAS,EACzC,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAEzB,MAAM,CAAC,EAAE,cAAc;IAM3B;;;;;;;;;;OAUG;IAGU,WAAW,CACe,IAAI,EAAE,SAAS,EACzC,GAAG,EAAE,MAAM;IAIxB;;;;;;;;;OASG;IAGU,eAAe,CACW,IAAI,EAAE,SAAS,EACvC,QAAQ,EAAE,YAAY;IAMrC;;;;;;;;;;;OAWG;IAGU,kBAAkB,CAOxB,IAAI,EAAE,YAAY,EACc,KAAK,EAAE,SAAS,EAC3C,IAAI,EAAE,eAAe;IAUjC;;;;;;;;;;OAUG;IAGU,kBAAkB,CACQ,IAAI,EAAE,SAAS,EACzC,IAAI,EAAE,MAAM;IAMzB;;;;;;;;;;;OAWG;IAGU,QAAQ,CACT,IAAI,EAAE,SAAS,EACd,UAAU,CAAC,EAAE,aAAa,EAC1B,KAAK,CAAC,EAAE,QAAQ,EAEzB,MAAM,CAAC,EAAE,cAAc;IAK3B;;;;;;;;;OASG;IAGU,OAAO,CAAS,IAAI,EAAE,SAAS,EAAW,GAAG,EAAE,MAAM;IAIlE;;;;;;;OAOG;IAGU,WAAW,CAAS,IAAI,EAAE,SAAS,EAAa,QAAQ,EAAE,YAAY;IAKnF;;;;;;;;;;OAUG;IAGU,cAAc,CAAS,IAAI,EAAE,SAAS,EAAW,IAAI,EAAE,MAAM,EAAU,IAAI,EAAE,eAAe;IAMzG;;;;;;;;;OASG;IAGU,cAAc,CAAS,IAAI,EAAE,SAAS,EAAW,IAAI,EAAE,MAAM;CAK7E"}

package/lib/cjs/controllers/UserMetadataController.js

@@ -15,22 +15,21 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.UserMetadataController = void 0;
 const http_1 = require("@spinajs/http");
 const rbac_1 = require("@spinajs/rbac");
+const di_1 = require("@spinajs/di");
 const rbac_http_1 = require("@spinajs/rbac-http");
 const orm_http_1 = require("@spinajs/orm-http");
 const metadata_dto_js_1 = require("../dto/metadata-dto.js");
-const orm_1 = require("@spinajs/orm");
 const FilterableUserMetadata_js_1 = require("../models/FilterableUserMetadata.js");
-/**
- * Fallback page size. A request without a `limit` used to reach `take(0)`,
- * which the query builder rejects ( "take count should be a positive number" ),
- * so plain listing requests failed instead of returning the first page.
- */
-const DEFAULT_PAGE_SIZE = 10;
+const UserMetadataService_js_1 = require("../services/UserMetadataService.js");
 /**
  * User metadata management.
  * Provides CRUD operations for key-value metadata entries attached to user accounts.
  * Admin routes operate on any user (identified by UUID), while own routes operate on the
  * currently authenticated user's metadata.
+ *
+ * Both families delegate to {@link UserMetadataService}, which owns the owner
+ * scoping — the only thing that ever differed between them is where the owner
+ * id comes from.
  * @tags User Metadata
  */
 let UserMetadataController = class UserMetadataController extends http_1.BaseController {
@@ -49,13 +48,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 User not found
      */
     async readUserMeta(user, pagination, order, filter) {
-        const limit = pagination?.limit || DEFAULT_PAGE_SIZE;
-        return new http_1.Ok(FilterableUserMetadata_js_1.FilterableUserMetadata.select().where({
-            user_id: user.Id
-        }).filter(filter?.filters ?? [], filter?.op)
-            .take(limit)
-            .skip(limit * (pagination?.page ?? 0))
-            .order(order?.column ?? 'Id', order?.order ?? orm_1.SortOrder.DESC));
+        return new http_1.Ok(this.Metadata.list(user.Id, pagination, order, filter));
     }
     /**
      * Get a single metadata entry for a specific user (admin)
@@ -69,10 +62,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 User or metadata key not found
      */
     async getUserMeta(user, key) {
-        return new http_1.Ok(rbac_1.UserMetadata.where({
-            Key: key,
-            user_id: user.Id
-        }).firstOrFail());
+        return new http_1.Ok(this.Metadata.getByKey(user.Id, key));
     }
     /**
      * Add or update metadata for a specific user (admin)
@@ -85,8 +75,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 User not found
      */
     async addUserMetadata(user, metadata) {
-        metadata.User.attach(user);
-        await metadata.insert(orm_1.InsertBehaviour.InsertOrUpdate);
+        await this.Metadata.upsert(user.Id, metadata);
         return new http_1.Ok();
     }
     /**
@@ -102,11 +91,10 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 User or metadata entry not found
      */
     async updateUserMetadata(meta, _user, data) {
-        await meta.update({
-            Key: data.Key,
-            Value: data.Value,
-            Type: data.Type
-        });
+        // @FromModel already resolved the entry within the addressed user's
+        // scope ( so a miss is a 404 ); the write still goes through the
+        // owner-scoped service so the predicate is not restated here.
+        await this.Metadata.update(_user.Id, meta.Id, data);
         return new http_1.Ok();
     }
     /**
@@ -121,24 +109,9 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 User or metadata entry not found
      */
     async deleteUserMetadata(user, meta) {
-        // NOTE: destroy() refuses to build an unbounded DELETE, so the entry id
-        // goes in as the primary key and ownership is AND-ed on top of it —
-        // deleting by id alone would let any user id delete anybody's entry.
-        await rbac_1.UserMetadata.destroy(meta).andWhere('user_id', user.Id);
+        await this.Metadata.delete(user.Id, meta);
         return new http_1.Ok();
     }
-    /**
-     * List own metadata
-     * Returns a paginated, filtered, and ordered list of metadata entries for the authenticated user.
-     * @security cookieAuth
-     * @param pagination.page Page number (zero-based)
-     * @param pagination.limit Number of entries per page
-     * @param order.column Column to sort by (default: Id)
-     * @param order.order Sort direction: ASC or DESC (default: DESC)
-     * @returns {IUserMetadataEntry[]} Paginated list of own metadata entries
-     * @response 401 Unauthorized — valid session required
-     * @response 403 Forbidden — readOwn permission required
-     */
     /**
      * List own metadata
      * Returns a paginated, filtered, and ordered list of metadata entries for the authenticated user.
@@ -152,15 +125,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 403 Forbidden — readOwn permission required
      */
     async readMeta(user, pagination, order, filter) {
-        // Explicit owner scoping: the rbac query middleware does not enforce
-        // ownership for the metadata model (queries resolve to the unsafe base
-        // model without an @OrmResource), so every own-route filters by the
-        // authenticated user's id directly.
-        const limit = pagination?.limit || DEFAULT_PAGE_SIZE;
-        return new http_1.Ok(FilterableUserMetadata_js_1.FilterableUserMetadata.select().where('user_id', user.Id).filter(filter?.filters ?? [], filter?.op)
-            .take(limit)
-            .skip(limit * (pagination?.page ?? 0))
-            .order(order?.column ?? 'Id', order?.order ?? orm_1.SortOrder.DESC));
+        return new http_1.Ok(this.Metadata.list(user.Id, pagination, order, filter));
     }
     /**
      * Get own metadata entry by key
@@ -173,10 +138,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 Metadata key not found
      */
     async getMeta(user, key) {
-        return new http_1.Ok(rbac_1.UserMetadata.where({
-            Key: key,
-            user_id: user.Id,
-        }).firstOrFail());
+        return new http_1.Ok(this.Metadata.getByKey(user.Id, key));
     }
     /**
      * Add or update own metadata
@@ -187,10 +149,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 403 Forbidden — updateOwn permission required
      */
     async addMetadata(user, metadata) {
-        // force ownership to the authenticated user — never trust a user_id
-        // supplied in the request body
-        metadata.user_id = user.Id;
-        await metadata.insert(orm_1.InsertBehaviour.InsertOrUpdate);
+        await this.Metadata.upsert(user.Id, metadata);
         return new http_1.Ok();
     }
     /**
@@ -205,19 +164,7 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 Metadata entry not found
      */
     async updateMetadata(user, meta, data) {
-        // The Key/Id lookup is grouped and AND-ed with an explicit ownership
-        // filter. Without the grouping the flat "Key = ? OR Id = ? AND user_id = ?"
-        // binds as "Key = ? OR (Id = ? AND user_id = ?)", letting any user update
-        // another user's metadata by its Key. Scoping by user_id explicitly (not
-        // relying on the query middleware, which does not fire for this model)
-        // keeps the update owner-bound.
-        await rbac_1.UserMetadata.update({
-            Key: data.Key,
-            Value: data.Value,
-            Type: data.Type
-        }).where(function () {
-            this.where("Key", meta).orWhere("Id", meta);
-        }).andWhere('user_id', user.Id);
+        await this.Metadata.update(user.Id, meta, data);
         return new http_1.Ok();
     }
     /**
@@ -231,11 +178,15 @@ let UserMetadataController = class UserMetadataController extends http_1.BaseCon
      * @response 404 Metadata entry not found
      */
     async deleteMetadata(user, meta) {
-        await rbac_1.UserMetadata.destroy(meta).andWhere('user_id', user.Id);
+        await this.Metadata.delete(user.Id, meta);
         return new http_1.Ok();
     }
 };
 exports.UserMetadataController = UserMetadataController;
+__decorate([
+    (0, di_1.Autoinject)(UserMetadataService_js_1.UserMetadataService),
+    __metadata("design:type", UserMetadataService_js_1.UserMetadataService)
+], UserMetadataController.prototype, "Metadata", void 0);
 __decorate([
     (0, http_1.Get)(":user/metadata"),
     (0, rbac_http_1.Permission)(['readAny']),

package/lib/cjs/controllers/UserMetadataController.js.map

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

package/lib/cjs/dto/confirm-password-dto.d.ts

@@ -0,0 +1,23 @@
+export declare const ConfirmPasswordDtoSchema: {
+    $schema: string;
+    title: string;
+    type: string;
+    properties: {
+        Password: {
+            type: string;
+            maxLength: number;
+            description: string;
+        };
+    };
+    required: string[];
+};
+/**
+ * Re-authentication payload for sensitive self-service operations — enabling or
+ * disabling 2FA. A hijacked session alone must not be enough to weaken a
+ * user's second factor.
+ */
+export declare class ConfirmPasswordDto {
+    Password: string;
+    constructor(data: any);
+}
+//# sourceMappingURL=confirm-password-dto.d.ts.map

package/lib/cjs/dto/confirm-password-dto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"confirm-password-dto.d.ts","sourceRoot":"","sources":["../../../src/dto/confirm-password-dto.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,wBAAwB;;;;;;;;;;;;CAQpC,CAAC;AAEF;;;;GAIG;AACH,qBACa,kBAAkB;IACtB,QAAQ,EAAE,MAAM,CAAC;gBAEZ,IAAI,EAAE,GAAG;CAGtB"}

package/lib/cjs/dto/{restore-password-dto.js → confirm-password-dto.js}

@@ -9,26 +9,30 @@ var __metadata = (this && this.__metadata) || function (k, v) {
     if (typeof Reflect === "object" && typeof Reflect.metadata === "function") return Reflect.metadata(k, v);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.RestorePasswordDto = exports.RestorePasswordDtoSchema = void 0;
+exports.ConfirmPasswordDto = exports.ConfirmPasswordDtoSchema = void 0;
 const validation_1 = require("@spinajs/validation");
-exports.RestorePasswordDtoSchema = {
+exports.ConfirmPasswordDtoSchema = {
     $schema: 'http://json-schema.org/draft-07/schema#',
-    title: 'User password DTO',
+    title: 'Confirm password DTO',
     type: 'object',
     properties: {
-        Password: { type: 'string', maxLength: 32, minLength: 6 },
-        ConfirmPassword: { type: 'string', maxLength: 32, minLength: 6 },
+        Password: { type: 'string', maxLength: 32, description: 'Current password, re-entered to confirm a sensitive change' },
     },
-    required: ['Password', 'ConfirmPassword'],
+    required: ['Password'],
 };
-let RestorePasswordDto = class RestorePasswordDto {
+/**
+ * Re-authentication payload for sensitive self-service operations — enabling or
+ * disabling 2FA. A hijacked session alone must not be enough to weaken a
+ * user's second factor.
+ */
+let ConfirmPasswordDto = class ConfirmPasswordDto {
     constructor(data) {
         Object.assign(this, data);
     }
 };
-exports.RestorePasswordDto = RestorePasswordDto;
-exports.RestorePasswordDto = RestorePasswordDto = __decorate([
-    (0, validation_1.Schema)(exports.RestorePasswordDtoSchema),
+exports.ConfirmPasswordDto = ConfirmPasswordDto;
+exports.ConfirmPasswordDto = ConfirmPasswordDto = __decorate([
+    (0, validation_1.Schema)(exports.ConfirmPasswordDtoSchema),
     __metadata("design:paramtypes", [Object])
-], RestorePasswordDto);
-//# sourceMappingURL=restore-password-dto.js.map
+], ConfirmPasswordDto);
+//# sourceMappingURL=confirm-password-dto.js.map

package/lib/cjs/dto/confirm-password-dto.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"confirm-password-dto.js","sourceRoot":"","sources":["../../../src/dto/confirm-password-dto.ts"],"names":[],"mappings":";;;;;;;;;;;;AAAA,oDAA6C;AAEhC,QAAA,wBAAwB,GAAG;IACtC,OAAO,EAAE,yCAAyC;IAClD,KAAK,EAAE,sBAAsB;IAC7B,IAAI,EAAE,QAAQ;IACd,UAAU,EAAE;QACV,QAAQ,EAAE,EAAE,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,EAAE,EAAE,WAAW,EAAE,4DAA4D,EAAE;KACvH;IACD,QAAQ,EAAE,CAAC,UAAU,CAAC;CACvB,CAAC;AAEF;;;;GAIG;AAEI,IAAM,kBAAkB,GAAxB,MAAM,kBAAkB;IAG7B,YAAY,IAAS;QACnB,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC;IAC5B,CAAC;CACF,CAAA;AANY,gDAAkB;6BAAlB,kBAAkB;IAD9B,IAAA,mBAAM,EAAC,gCAAwB,CAAC;;GACpB,kBAAkB,CAM9B"}

package/lib/cjs/dto/password-reset-dto.d.ts

@@ -0,0 +1,58 @@
+export declare const PasswordResetRequestDtoSchema: {
+    $schema: string;
+    title: string;
+    type: string;
+    properties: {
+        Email: {
+            type: string;
+            format: string;
+            description: string;
+        };
+    };
+    required: string[];
+};
+/** Payload starting a password reset — identifies the account by email. */
+export declare class PasswordResetRequestDto {
+    Email: string;
+    constructor(data: any);
+}
+export declare const PasswordResetConfirmDtoSchema: {
+    $schema: string;
+    title: string;
+    type: string;
+    properties: {
+        Email: {
+            type: string;
+            format: string;
+            description: string;
+        };
+        Token: {
+            type: string;
+            maxLength: number;
+            minLength: number;
+            description: string;
+        };
+        Password: {
+            type: string;
+            maxLength: number;
+            minLength: number;
+            description: string;
+        };
+        ConfirmPassword: {
+            type: string;
+            maxLength: number;
+            minLength: number;
+            description: string;
+        };
+    };
+    required: string[];
+};
+/** Payload completing a password reset with the issued token. */
+export declare class PasswordResetConfirmDto {
+    Email: string;
+    Token: string;
+    Password: string;
+    ConfirmPassword: string;
+    constructor(data: any);
+}
+//# sourceMappingURL=password-reset-dto.d.ts.map

package/lib/cjs/dto/password-reset-dto.d.ts.map

@@ -0,0 +1 @@
+{"version":3,"file":"password-reset-dto.d.ts","sourceRoot":"","sources":["../../../src/dto/password-reset-dto.ts"],"names":[],"mappings":"AAEA,eAAO,MAAM,6BAA6B;;;;;;;;;;;;CAQzC,CAAC;AAEF,2EAA2E;AAC3E,qBACa,uBAAuB;IAC3B,KAAK,EAAE,MAAM,CAAC;gBAET,IAAI,EAAE,GAAG;CAGtB;AAED,eAAO,MAAM,6BAA6B;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAWzC,CAAC;AAEF,iEAAiE;AACjE,qBACa,uBAAuB;IAC3B,KAAK,EAAE,MAAM,CAAC;IAEd,KAAK,EAAE,MAAM,CAAC;IAEd,QAAQ,EAAE,MAAM,CAAC;IAEjB,eAAe,EAAE,MAAM,CAAC;gBAEnB,IAAI,EAAE,GAAG;CAGtB"}