@loomcore/api 0.2.22 → 0.2.24

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

@@ -9,6 +9,7 @@ export interface UsersControllerOptions {
     userService?: UserService;
     userSpec?: IModelSpec;
     publicUserSpec?: IModelSpec;
+    routeAuth?: MethodAuth;
 }
 export declare class UsersController extends ApiController<IUser> {
     userService: UserService;

package/dist/controllers/users.controller.js

@@ -13,7 +13,7 @@ export class UsersController extends ApiController {
         const userSpec = options.userSpec ?? UserSpec;
         const publicUserSpec = options.publicUserSpec ?? PublicUserSpec;
         const userService = options.userService ?? new UserService(database, userSpec);
-        super("users", app, userService, usersRouteAuth, "user", userSpec, publicUserSpec);
+        super("users", app, userService, options.routeAuth ?? usersRouteAuth, "user", userSpec, publicUserSpec);
         this.userService = userService;
     }
 }

package/dist/middleware/is-authorized.js

@@ -50,29 +50,19 @@ const isAuthorized = (config) => {
             throw new UnauthenticatedError();
         }
         const authConfig = getAuthConfig();
-        try {
-            const rawPayload = jwt.verify(token, authConfig.clientSecret);
-            const userContext = getAuthUserContextSpec().decode(rawPayload);
-            req.userContext = userContext;
-            if (isAdmin(userContext)) {
-                next();
-                return;
-            }
-            const method = resolveAuthMethod(req);
-            if (!method) {
-                throw new UnauthorizedError();
-            }
-            assertFeatureRequirement(userContext, config[method]);
+        const rawPayload = jwt.verify(token, authConfig.clientSecret);
+        const userContext = getAuthUserContextSpec().decode(rawPayload);
+        req.userContext = userContext;
+        if (isAdmin(userContext)) {
             next();
+            return;
         }
-        catch (err) {
-            if (err instanceof UnauthorizedError ||
-                err instanceof UnauthenticatedError) {
-                throw err;
-            }
-            console.error(err);
-            throw new UnauthenticatedError();
+        const method = resolveAuthMethod(req);
+        if (!method) {
+            throw new UnauthorizedError();
         }
+        assertFeatureRequirement(userContext, config[method]);
+        next();
     };
 };
 export { isAuthorized };

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

@@ -1,4 +1,4 @@
-import { type IModelSpec, type IQueryOptions, type IUser, type IUserContext } from "@loomcore/common/models";
+import { type IModelSpec, type IPagedResult, 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";
@@ -7,6 +7,10 @@ export declare class UserService extends MultiTenantApiService<IUser> {
     private isAdmin;
     private assertAdmin;
     private assertSelfOrAdmin;
+    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[]>;

package/dist/services/user.service.js

@@ -23,6 +23,22 @@ export class UserService extends MultiTenantApiService {
             throw new UnauthorizedError();
         }
     }
+    async getById(userContext, id) {
+        this.assertSelfOrAdmin(userContext, id);
+        return super.getById(userContext, id);
+    }
+    async get(userContext, queryOptions) {
+        this.assertAdmin(userContext);
+        return super.get(userContext, queryOptions);
+    }
+    async getAll(userContext) {
+        this.assertAdmin(userContext);
+        return super.getAll(userContext);
+    }
+    async getCount(userContext) {
+        this.assertAdmin(userContext);
+        return super.getCount(userContext);
+    }
     async fullUpdateById(_userContext, _id, _entity) {
         throw new ServerError("User full update is not allowed.");
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.22",
+  "version": "0.2.24",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {