@loomcore/api 0.2.28 → 0.2.30

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

@@ -1,4 +1,4 @@
-import { type IModelSpec } from "@loomcore/common/models";
+import { type ILoginResponse, type IModelSpec } from "@loomcore/common/models";
 import type { Application, Request, Response } from "express";
 import type { IDatabase } from "../databases/models/index.js";
 import { OrganizationService, UserService } from "../services/index.js";
@@ -21,7 +21,7 @@ export declare class AuthController {
     login(req: Request, res: Response): Promise<void>;
     requestTokenUsingRefreshToken(req: Request, res: Response): Promise<void>;
     getUserContext(req: Request, res: Response): Promise<void>;
-    afterAuth(_req: Request, _res: Response, _loginResponse: any): void;
+    afterAuth(_req: Request, _res: Response, _loginResponse: ILoginResponse): Promise<void>;
     changePassword(req: Request, res: Response): Promise<void>;
     forgotPassword(req: Request, res: Response): Promise<void>;
     resetPassword(req: Request, res: Response): Promise<void>;

package/dist/controllers/auth.controller.js

@@ -77,7 +77,7 @@ let AuthController = (() => {
         }
         mapRoutes(app) {
             const authorize = (method) => authorizeMethod(this, method);
-            app.post(`/api/auth/login`, this.login.bind(this), this.afterAuth.bind(this));
+            app.post(`/api/auth/login`, this.login.bind(this));
             app.get(`/api/auth/refresh`, this.requestTokenUsingRefreshToken.bind(this));
             app.get(`/api/auth/get-user-context`, authorize('getUserContext'), this.getUserContext.bind(this));
             app.patch(`/api/auth/change-password`, authorize('changePassword'), this.changePassword.bind(this));
@@ -106,6 +106,7 @@ let AuthController = (() => {
             res.set("Content-Type", "application/json");
             const deviceId = getAndSetDeviceIdCookie(req, res);
             const loginResponse = await attemptLogin(this.database, email, password, deviceId, organization, this.userService);
+            await this.afterAuth(req, res, loginResponse);
             apiUtils.apiResponse(res, 200, { data: loginResponse }, this.loginResponseSpec);
         }
         async requestTokenUsingRefreshToken(req, res) {
@@ -128,9 +129,7 @@ let AuthController = (() => {
             const userContext = req.userContext;
             apiUtils.apiResponse(res, 200, { data: userContext }, this.userContextSpec);
         }
-        afterAuth(_req, _res, _loginResponse) {
-            console.log("in afterAuth");
-        }
+        async afterAuth(_req, _res, _loginResponse) { }
         async changePassword(req, res) {
             const userContext = req.userContext;
             if (!userContext) {

package/dist/utils/auth/assert-admin-or-feature.util.d.ts

@@ -0,0 +1,2 @@
+import type { IUserContext } from "@loomcore/common/models";
+export declare function assertAdminOrFeature(userContext: IUserContext, features: string[], requireAll?: boolean): void;

package/dist/utils/auth/assert-admin-or-feature.util.js

@@ -0,0 +1,8 @@
+import { isAdmin } from "./is-admin.util.js";
+import { assertUserHasFeature } from "./assert-user-has-feature.util.js";
+export function assertAdminOrFeature(userContext, features, requireAll = false) {
+    if (isAdmin(userContext)) {
+        return;
+    }
+    assertUserHasFeature(userContext, features, requireAll);
+}

package/dist/utils/auth/assert-user-has-feature.util.d.ts

@@ -1,2 +1,2 @@
 import { IUserContext } from "@loomcore/common/models";
-export declare function assertUserHasFeature(userContext: IUserContext, features: string[]): void;
+export declare function assertUserHasFeature(userContext: IUserContext, features: string[], requireAll?: boolean): void;

package/dist/utils/auth/assert-user-has-feature.util.js

@@ -1,10 +1,18 @@
 import { UnauthorizedError } from "../../errors/index.js";
-export function assertUserHasFeature(userContext, features) {
+export function assertUserHasFeature(userContext, features, requireAll = false) {
     if (features.length === 0) {
         return;
     }
     const missingFeatures = features.filter(feature => !userContext.features.includes(feature));
-    if (missingFeatures.length > 0) {
-        throw new UnauthorizedError(missingFeatures);
+    if (requireAll) {
+        if (missingFeatures.length > 0) {
+            throw new UnauthorizedError(missingFeatures);
+        }
     }
+    else {
+        if (missingFeatures.length === features.length) {
+            throw new UnauthorizedError(missingFeatures);
+        }
+    }
+    return;
 }

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

@@ -1,4 +1,4 @@
 import { type ILoginResponse, type IOrganization } from "@loomcore/common/models";
 import type { IDatabase } from "../../databases/models/index.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): Promise<ILoginResponse | null>;
+export declare function attemptLogin(database: IDatabase, email: string, password: string, deviceId: string, organization: IOrganization | null, userService?: UserService): Promise<ILoginResponse>;

package/dist/utils/auth/index.d.ts

@@ -1,4 +1,5 @@
 export * from "./assert-admin.util.js";
+export * from "./assert-admin-or-feature.util.js";
 export * from "./assert-owner-or-admin.util.js";
 export * from "./assert-user-or-admin.util.js";
 export * from "./attempt-login.util.js";

package/dist/utils/auth/index.js

@@ -1,4 +1,5 @@
 export * from "./assert-admin.util.js";
+export * from "./assert-admin-or-feature.util.js";
 export * from "./assert-owner-or-admin.util.js";
 export * from "./assert-user-or-admin.util.js";
 export * from "./attempt-login.util.js";

package/package.json

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