@loomcore/api 0.2.50 → 0.2.52

package/dist/controllers/features.controller.js

@@ -1,9 +1,61 @@
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 import { FeatureModelSpec } from '@loomcore/common/models';
-import { FeaturesService } from '../services/features.service.js';
+import { Authorize } from '../decorators/authorize.decorator.js';
+import { FeatureService } from '../services/feature.service.js';
 import { ApiController } from './api.controller.js';
-export class FeaturesController extends ApiController {
-    constructor(app, database) {
-        const featureService = new FeaturesService(database);
-        super('features', app, featureService, 'feature', FeatureModelSpec);
-    }
-}
+let FeaturesController = (() => {
+    let _classDecorators = [Authorize('admin')];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = ApiController;
+    var FeaturesController = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            FeaturesController = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor(app, database) {
+            const featureService = new FeatureService(database);
+            super('features', app, featureService, 'feature', FeatureModelSpec);
+        }
+    };
+    return FeaturesController = _classThis;
+})();
+export { FeaturesController };

package/dist/controllers/organizations.controller.js

@@ -34,7 +34,7 @@ var __runInitializers = (this && this.__runInitializers) || function (thisArg, i
 };
 import { BadRequestError } from '../errors/index.js';
 import { OrganizationService } from '../services/index.js';
-import { apiUtils, authorizeMethod } from '../utils/index.js';
+import { apiUtils } from '../utils/index.js';
 import { ApiController } from './api.controller.js';
 import { Authorize } from '../decorators/authorize.decorator.js';
 let OrganizationsController = (() => {
@@ -60,9 +60,8 @@ let OrganizationsController = (() => {
         }
         mapRoutes(app) {
             super.mapRoutes(app);
-            const authorize = (method) => authorizeMethod(this, method);
-            app.get(`/api/${this.slug}/get-by-name/:name`, authorize('getByName'), this.getByName.bind(this));
-            app.get(`/api/${this.slug}/get-by-code/:code`, authorize('getByCode'), this.getByCode.bind(this));
+            app.get(`/api/${this.slug}/get-by-name/:name`, this.authorize('getByName'), this.getByName.bind(this));
+            app.get(`/api/${this.slug}/get-by-code/:code`, this.authorize('getByCode'), this.getByCode.bind(this));
         }
         async getByName(req, res, next) {
             const { name } = req.params;

package/dist/controllers/query-api.controller.d.ts

@@ -11,6 +11,7 @@ export declare abstract class QueryApiController<T extends IEntity> {
     protected publicSpec?: IModelSpec;
     protected idSchema: TSchema;
     protected constructor(slug: string, app: Application, service: IGenericQueryService<T>, resourceName?: string, modelSpec?: IModelSpec, publicSpec?: IModelSpec);
+    protected authorize(method: string): import("express").RequestHandler<import("express-serve-static-core").ParamsDictionary, any, any, import("qs").ParsedQs, Record<string, any>>;
     mapRoutes(app: Application): void;
     getAll(req: Request, res: Response, next: NextFunction): Promise<void>;
     get(req: Request, res: Response, next: NextFunction): Promise<void>;

package/dist/controllers/query-api.controller.js

@@ -20,12 +20,14 @@ export class QueryApiController {
         this.idSchema = getIdSchema();
         this.mapRoutes(app);
     }
+    authorize(method) {
+        return authorizeMethod(this, method);
+    }
     mapRoutes(app) {
-        const authorize = (method) => authorizeMethod(this, method);
-        app.get(`/api/${this.slug}`, authorize('get'), this.get.bind(this));
-        app.get(`/api/${this.slug}/all`, authorize('getAll'), this.getAll.bind(this));
-        app.get(`/api/${this.slug}/count`, authorize('getCount'), this.getCount.bind(this));
-        app.get(`/api/${this.slug}/:id`, authorize('getById'), this.getById.bind(this));
+        app.get(`/api/${this.slug}`, this.authorize('get'), this.get.bind(this));
+        app.get(`/api/${this.slug}/all`, this.authorize('getAll'), this.getAll.bind(this));
+        app.get(`/api/${this.slug}/count`, this.authorize('getCount'), this.getCount.bind(this));
+        app.get(`/api/${this.slug}/:id`, this.authorize('getById'), this.getById.bind(this));
     }
     async getAll(req, res, next) {
         res.set('Content-Type', 'application/json');

package/dist/controllers/roles.controller.js

@@ -1,9 +1,61 @@
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 import { RoleModelSpec } from '@loomcore/common/models';
-import { RolesService } from '../services/roles.service.js';
+import { Authorize } from '../decorators/authorize.decorator.js';
+import { RoleService } from '../services/role.service.js';
 import { ApiController } from './api.controller.js';
-export class RolesController extends ApiController {
-    constructor(app, database) {
-        const roleService = new RolesService(database);
-        super('roles', app, roleService, 'role', RoleModelSpec);
-    }
-}
+let RolesController = (() => {
+    let _classDecorators = [Authorize('admin')];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = ApiController;
+    var RolesController = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            RolesController = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor(app, database) {
+            const roleService = new RoleService(database);
+            super('roles', app, roleService, 'role', RoleModelSpec);
+        }
+    };
+    return RolesController = _classThis;
+})();
+export { RolesController };

package/dist/controllers/user-roles.controller.js

@@ -1,9 +1,61 @@
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
 import { UserRoleModelSpec } from '@loomcore/common/models';
-import { UserRolesService } from '../services/user-roles.service.js';
+import { Authorize } from '../decorators/authorize.decorator.js';
+import { UserRoleService } from '../services/user-role.service.js';
 import { ApiController } from './api.controller.js';
-export class UserRolesController extends ApiController {
-    constructor(app, database) {
-        const userRoleService = new UserRolesService(database);
-        super('user-roles', app, userRoleService, 'user-role', UserRoleModelSpec);
-    }
-}
+let UserRolesController = (() => {
+    let _classDecorators = [Authorize('admin')];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = ApiController;
+    var UserRolesController = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            UserRolesController = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        constructor(app, database) {
+            const userRoleService = new UserRoleService(database);
+            super('user-roles', app, userRoleService, 'user-role', UserRoleModelSpec);
+        }
+    };
+    return UserRolesController = _classThis;
+})();
+export { UserRolesController };

package/dist/controllers/users.controller.d.ts

@@ -1,5 +1,5 @@
 import { type IModelSpec, type IUser } from '@loomcore/common/models';
-import type { Application } from 'express';
+import type { Application, Request, Response } from 'express';
 import type { IDatabase } from '../databases/models/index.js';
 import { UserService } from '../services/index.js';
 import { ApiController } from './api.controller.js';
@@ -11,4 +11,7 @@ export interface UsersControllerOptions {
 export declare class UsersController extends ApiController<IUser> {
     userService: UserService;
     constructor(app: Application, database: IDatabase, options?: UsersControllerOptions);
+    mapRoutes(app: Application): void;
+    getSelf(req: Request, res: Response): Promise<void>;
+    partialUpdateSelf(req: Request, res: Response): Promise<void>;
 }

package/dist/controllers/users.controller.js

@@ -1,14 +1,90 @@
+var __runInitializers = (this && this.__runInitializers) || function (thisArg, initializers, value) {
+    var useValue = arguments.length > 2;
+    for (var i = 0; i < initializers.length; i++) {
+        value = useValue ? initializers[i].call(thisArg, value) : initializers[i].call(thisArg);
+    }
+    return useValue ? value : void 0;
+};
+var __esDecorate = (this && this.__esDecorate) || function (ctor, descriptorIn, decorators, contextIn, initializers, extraInitializers) {
+    function accept(f) { if (f !== void 0 && typeof f !== "function") throw new TypeError("Function expected"); return f; }
+    var kind = contextIn.kind, key = kind === "getter" ? "get" : kind === "setter" ? "set" : "value";
+    var target = !descriptorIn && ctor ? contextIn["static"] ? ctor : ctor.prototype : null;
+    var descriptor = descriptorIn || (target ? Object.getOwnPropertyDescriptor(target, contextIn.name) : {});
+    var _, done = false;
+    for (var i = decorators.length - 1; i >= 0; i--) {
+        var context = {};
+        for (var p in contextIn) context[p] = p === "access" ? {} : contextIn[p];
+        for (var p in contextIn.access) context.access[p] = contextIn.access[p];
+        context.addInitializer = function (f) { if (done) throw new TypeError("Cannot add initializers after decoration has completed"); extraInitializers.push(accept(f || null)); };
+        var result = (0, decorators[i])(kind === "accessor" ? { get: descriptor.get, set: descriptor.set } : descriptor[key], context);
+        if (kind === "accessor") {
+            if (result === void 0) continue;
+            if (result === null || typeof result !== "object") throw new TypeError("Object expected");
+            if (_ = accept(result.get)) descriptor.get = _;
+            if (_ = accept(result.set)) descriptor.set = _;
+            if (_ = accept(result.init)) initializers.unshift(_);
+        }
+        else if (_ = accept(result)) {
+            if (kind === "field") initializers.unshift(_);
+            else descriptor[key] = _;
+        }
+    }
+    if (target) Object.defineProperty(target, contextIn.name, descriptor);
+    done = true;
+};
 import { PublicUserSpec, UserSpec, } from '@loomcore/common/models';
+import { Authorize } from '../decorators/authorize.decorator.js';
 import { UserService } from '../services/index.js';
+import { apiUtils } from '../utils/index.js';
 import { ApiController } from './api.controller.js';
-export class UsersController extends ApiController {
-    userService;
-    constructor(app, database, options = {
-        userService: new UserService(database),
-        userSpec: UserSpec,
-        publicUserSpec: PublicUserSpec,
-    }) {
-        super('users', app, options.userService, 'user', options.userSpec, options.publicUserSpec);
-        this.userService = options.userService;
-    }
-}
+let UsersController = (() => {
+    let _classDecorators = [Authorize('admin')];
+    let _classDescriptor;
+    let _classExtraInitializers = [];
+    let _classThis;
+    let _classSuper = ApiController;
+    let _instanceExtraInitializers = [];
+    let _getSelf_decorators;
+    let _partialUpdateSelf_decorators;
+    var UsersController = class extends _classSuper {
+        static { _classThis = this; }
+        static {
+            const _metadata = typeof Symbol === "function" && Symbol.metadata ? Object.create(_classSuper[Symbol.metadata] ?? null) : void 0;
+            _getSelf_decorators = [Authorize()];
+            _partialUpdateSelf_decorators = [Authorize()];
+            __esDecorate(this, null, _getSelf_decorators, { kind: "method", name: "getSelf", static: false, private: false, access: { has: obj => "getSelf" in obj, get: obj => obj.getSelf }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(this, null, _partialUpdateSelf_decorators, { kind: "method", name: "partialUpdateSelf", static: false, private: false, access: { has: obj => "partialUpdateSelf" in obj, get: obj => obj.partialUpdateSelf }, metadata: _metadata }, null, _instanceExtraInitializers);
+            __esDecorate(null, _classDescriptor = { value: _classThis }, _classDecorators, { kind: "class", name: _classThis.name, metadata: _metadata }, null, _classExtraInitializers);
+            UsersController = _classThis = _classDescriptor.value;
+            if (_metadata) Object.defineProperty(_classThis, Symbol.metadata, { enumerable: true, configurable: true, writable: true, value: _metadata });
+            __runInitializers(_classThis, _classExtraInitializers);
+        }
+        userService = __runInitializers(this, _instanceExtraInitializers);
+        constructor(app, database, options = {
+            userService: new UserService(database),
+            userSpec: UserSpec,
+            publicUserSpec: PublicUserSpec,
+        }) {
+            super('users', app, options.userService, 'user', options.userSpec, options.publicUserSpec);
+            this.userService = options.userService;
+        }
+        mapRoutes(app) {
+            app.get(`/api/${this.slug}/me`, this.authorize('getSelf'), this.getSelf.bind(this));
+            app.patch(`/api/${this.slug}/me`, this.authorize('partialUpdateSelf'), this.partialUpdateSelf.bind(this));
+            super.mapRoutes(app);
+        }
+        async getSelf(req, res) {
+            res.set('Content-Type', 'application/json');
+            const user = await this.userService.getById(req.userContext, req.userContext.user._id);
+            apiUtils.apiResponse(res, 200, { data: user }, this.modelSpec, this.publicSpec);
+        }
+        async partialUpdateSelf(req, res) {
+            res.set('Content-Type', 'application/json');
+            this.validate(req.body, true);
+            const user = await this.userService.partialUpdateById(req.userContext, req.userContext.user._id, req.body);
+            apiUtils.apiResponse(res, 200, { data: user }, this.modelSpec, this.publicSpec);
+        }
+    };
+    return UsersController = _classThis;
+})();
+export { UsersController };

package/dist/services/{authorizations.service.d.ts → authorization.service.d.ts}

@@ -1,7 +1,7 @@
 import { type IAuthorization, type IUser, type IUserContext } from '@loomcore/common/models';
 import type { IDatabase } from '../databases/index.js';
 import { MultiTenantApiService } from './multi-tenant-api.service.js';
-export declare class AuthorizationsService extends MultiTenantApiService<IAuthorization> {
+export declare class AuthorizationService extends MultiTenantApiService<IAuthorization> {
     private userRolesService;
     private featuresService;
     constructor(database: IDatabase);

package/dist/services/{authorizations.service.js → authorization.service.js}

@@ -1,18 +1,16 @@
 import { AuthorizationModelSpec, getSystemUserContext, } from '@loomcore/common/models';
-import { assertUserHasFeature } from '../utils/index.js';
-import { FeaturesService } from './features.service.js';
+import { FeatureService } from './feature.service.js';
 import { MultiTenantApiService } from './multi-tenant-api.service.js';
-import { UserRolesService } from './user-roles.service.js';
-export class AuthorizationsService extends MultiTenantApiService {
+import { UserRoleService } from './user-role.service.js';
+export class AuthorizationService extends MultiTenantApiService {
     userRolesService;
     featuresService;
     constructor(database) {
         super(database, 'authorizations', 'authorization', AuthorizationModelSpec);
-        this.userRolesService = new UserRolesService(database);
-        this.featuresService = new FeaturesService(database);
+        this.userRolesService = new UserRoleService(database);
+        this.featuresService = new FeatureService(database);
     }
     async preProcessEntity(userContext, entity, isCreate, allowId = true) {
-        assertUserHasFeature(userContext, ['admin', 'system', 'authorizations']);
         return super.preProcessEntity(userContext, entity, isCreate, allowId);
     }
     async getUserContextFeatures(user) {

package/dist/services/feature.service.d.ts

@@ -0,0 +1,6 @@
+import { IFeature } from '@loomcore/common/models';
+import { IDatabase } from '../databases/index.js';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export declare class FeatureService extends MultiTenantApiService<IFeature> {
+    constructor(database: IDatabase);
+}

package/dist/services/feature.service.js

@@ -0,0 +1,7 @@
+import { FeatureModelSpec } from '@loomcore/common/models';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export class FeatureService extends MultiTenantApiService {
+    constructor(database) {
+        super(database, 'features', 'feature', FeatureModelSpec);
+    }
+}

package/dist/services/index.d.ts

@@ -8,9 +8,9 @@ export * from './organization.service.js';
 export * from './organization-domain.service.js';
 export * from './password-reset-token.service.js';
 export * from './refresh-token.service.js';
-export * from './authorizations.service.js';
-export * from './features.service.js';
-export * from './roles.service.js';
-export * from './user-roles.service.js';
+export * from './authorization.service.js';
+export * from './feature.service.js';
+export * from './role.service.js';
+export * from './user-role.service.js';
 export * from './tenant-query-decorator.js';
 export * from './user.service.js';

package/dist/services/index.js

@@ -8,9 +8,9 @@ export * from './organization.service.js';
 export * from './organization-domain.service.js';
 export * from './password-reset-token.service.js';
 export * from './refresh-token.service.js';
-export * from './authorizations.service.js';
-export * from './features.service.js';
-export * from './roles.service.js';
-export * from './user-roles.service.js';
+export * from './authorization.service.js';
+export * from './feature.service.js';
+export * from './role.service.js';
+export * from './user-role.service.js';
 export * from './tenant-query-decorator.js';
 export * from './user.service.js';

package/dist/services/role.service.d.ts

@@ -0,0 +1,6 @@
+import { IRole } from '@loomcore/common/models';
+import { IDatabase } from '../databases/index.js';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export declare class RoleService extends MultiTenantApiService<IRole> {
+    constructor(database: IDatabase);
+}

package/dist/services/role.service.js

@@ -0,0 +1,7 @@
+import { RoleModelSpec } from '@loomcore/common/models';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export class RoleService extends MultiTenantApiService {
+    constructor(database) {
+        super(database, 'roles', 'role', RoleModelSpec);
+    }
+}

package/dist/services/user-role.service.d.ts

@@ -0,0 +1,6 @@
+import { IUserRole } from '@loomcore/common/models';
+import { IDatabase } from '../databases/index.js';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export declare class UserRoleService extends MultiTenantApiService<IUserRole> {
+    constructor(database: IDatabase);
+}

package/dist/services/user-role.service.js

@@ -0,0 +1,7 @@
+import { UserRoleModelSpec } from '@loomcore/common/models';
+import { MultiTenantApiService } from './multi-tenant-api.service.js';
+export class UserRoleService extends MultiTenantApiService {
+    constructor(database) {
+        super(database, 'userRoles', 'userRole', UserRoleModelSpec);
+    }
+}

package/dist/services/user.service.d.ts

@@ -1,17 +1,14 @@
-import { type IModelSpec, type IPagedResult, type IQueryOptions, type IUser, type IUserContext } from '@loomcore/common/models';
+import { type IModelSpec, type IQueryOptions, type IUser, type IUserContext } from '@loomcore/common/models';
 import type { AppIdType } from '@loomcore/common/types';
 import type { IDatabase } from '../databases/models/index.js';
 import { MultiTenantApiService } from './multi-tenant-api.service.js';
 export declare class UserService extends MultiTenantApiService<IUser> {
     constructor(database: IDatabase, modelSpec?: IModelSpec);
-    getById(userContext: IUserContext, id: AppIdType): Promise<IUser>;
-    get(userContext: IUserContext, queryOptions?: IQueryOptions): Promise<IPagedResult<IUser>>;
-    getAll(userContext: IUserContext): Promise<IUser[]>;
-    getCount(userContext: IUserContext): Promise<number>;
     fullUpdateById(_userContext: IUserContext, _id: AppIdType, _entity: IUser): Promise<IUser>;
     update(userContext: IUserContext, queryObject: IQueryOptions, entity: Partial<IUser>): Promise<IUser[]>;
     batchUpdate(userContext: IUserContext, entities: Partial<IUser>[]): Promise<IUser[]>;
-    partialUpdateById(userContext: IUserContext, id: AppIdType, entity: Partial<IUser>, allowPasswordUpdate?: boolean): Promise<IUser>;
-    private assertPasswordUpdateAllowed;
+    partialUpdateById(userContext: IUserContext, id: AppIdType, entity: Partial<IUser>): Promise<IUser>;
+    changePassword(userContext: IUserContext, id: AppIdType, password: string): Promise<IUser>;
     preProcessEntity(userContext: IUserContext, entity: Partial<IUser>, isCreate: boolean, allowId?: boolean): Promise<Partial<IUser>>;
+    private assertPasswordNotPresent;
 }

package/dist/services/user.service.js

@@ -1,6 +1,5 @@
 import { UserSpec, } from '@loomcore/common/models';
 import { BadRequestError, ServerError } from '../errors/index.js';
-import { assertAdmin, assertUserOrAdmin, isAdmin, } from '../utils/auth/index.js';
 import { passwordUtils } from '../utils/password.utils.js';
 import { MultiTenantApiService } from './multi-tenant-api.service.js';
 import moment from 'moment';
@@ -8,58 +7,31 @@ export class UserService extends MultiTenantApiService {
     constructor(database, modelSpec = UserSpec) {
         super(database, 'users', 'user', modelSpec);
     }
-    async getById(userContext, id) {
-        assertUserOrAdmin(userContext, id);
-        return super.getById(userContext, id);
-    }
-    async get(userContext, queryOptions) {
-        assertAdmin(userContext);
-        return super.get(userContext, queryOptions);
-    }
-    async getAll(userContext) {
-        assertAdmin(userContext);
-        return super.getAll(userContext);
-    }
-    async getCount(userContext) {
-        assertAdmin(userContext);
-        return super.getCount(userContext);
-    }
     async fullUpdateById(_userContext, _id, _entity) {
         throw new ServerError('User full update is not allowed.');
     }
     async update(userContext, queryObject, entity) {
-        assertAdmin(userContext);
-        this.assertPasswordUpdateAllowed(userContext, null, entity, false);
+        this.assertPasswordNotPresent(entity);
         return super.update(userContext, queryObject, entity);
     }
     async batchUpdate(userContext, entities) {
-        assertAdmin(userContext);
         for (const entity of entities) {
-            this.assertPasswordUpdateAllowed(userContext, null, entity, false);
+            this.assertPasswordNotPresent(entity);
         }
         return super.batchUpdate(userContext, entities);
     }
-    async partialUpdateById(userContext, id, entity, allowPasswordUpdate = false) {
-        assertUserOrAdmin(userContext, id);
-        this.assertPasswordUpdateAllowed(userContext, id, entity, allowPasswordUpdate);
+    async partialUpdateById(userContext, id, entity) {
+        this.assertPasswordNotPresent(entity);
         return super.partialUpdateById(userContext, id, entity);
     }
-    assertPasswordUpdateAllowed(userContext, id, entity, allowPasswordUpdate) {
-        if (!('password' in entity)) {
-            return;
-        }
-        if (!entity.password) {
+    async changePassword(userContext, id, password) {
+        if (!password) {
             throw new BadRequestError('Password cannot be empty.');
         }
-        if (!allowPasswordUpdate) {
-            throw new ServerError('Use auth change password endpoint to update password.');
-        }
-        if (isAdmin(userContext)) {
-            return;
-        }
-        if (userContext.user._id !== id) {
-            throw new ServerError('You can only update your own password.');
-        }
+        const updates = {
+            password: password,
+        };
+        return super.partialUpdateById(userContext, id, updates);
     }
     async preProcessEntity(userContext, entity, isCreate, allowId = false) {
         const preparedEntity = await super.preProcessEntity(userContext, entity, isCreate, allowId);
@@ -74,4 +46,9 @@ export class UserService extends MultiTenantApiService {
         }
         return preparedEntity;
     }
+    assertPasswordNotPresent(entity) {
+        if ('password' in entity) {
+            throw new BadRequestError('Cannot update user with password present on the entity.');
+        }
+    }
 }

package/dist/utils/auth/attempt-login.util.d.ts

@@ -1,5 +1,5 @@
 import { type ILoginResponse, type IOrganization } from '@loomcore/common/models';
 import type { IDatabase } from '../../databases/models/index.js';
-import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { AuthorizationService } from '../../services/authorization.service.js';
 import { UserService } from '../../services/user.service.js';
-export declare function attemptLogin(database: IDatabase, email: string, password: string, deviceId: string, organization: IOrganization | null, userService?: UserService, authorizationsService?: AuthorizationsService): Promise<ILoginResponse>;
+export declare function attemptLogin(database: IDatabase, email: string, password: string, deviceId: string, organization: IOrganization | null, userService?: UserService, authorizationsService?: AuthorizationService): Promise<ILoginResponse>;

package/dist/utils/auth/attempt-login.util.js

@@ -1,10 +1,10 @@
 import { EmptyUserContext, } from '@loomcore/common/models';
 import { BadRequestError } from '../../errors/index.js';
-import { AuthorizationsService } from '../../services/authorizations.service.js';
+import { AuthorizationService } from '../../services/authorization.service.js';
 import { UserService } from '../../services/user.service.js';
 import { passwordUtils } from '../password.utils.js';
 import { logUserIn } from './log-user-in.util.js';
-export async function attemptLogin(database, email, password, deviceId, organization, userService = new UserService(database), authorizationsService = new AuthorizationsService(database)) {
+export async function attemptLogin(database, email, password, deviceId, organization, userService = new UserService(database), authorizationsService = new AuthorizationService(database)) {
     const lowerCaseEmail = email.toLowerCase();
     const userContext = {
         ...EmptyUserContext,