@loomcore/api 0.2.26 → 0.2.28

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

@@ -0,0 +1,7 @@
+import { IUserContext, IUserRole } from "@loomcore/common/models";
+import { IDatabase } from "../databases/index.js";
+import { MultiTenantApiService } from "./multi-tenant-api.service.js";
+export declare class UserRolesService extends MultiTenantApiService<IUserRole> {
+    constructor(database: IDatabase);
+    preProcessEntity(userContext: IUserContext, entity: Partial<IUserRole>, isCreate: boolean, allowId?: boolean): Promise<Partial<IUserRole>>;
+}

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

@@ -0,0 +1,12 @@
+import { UserRoleModelSpec } from "@loomcore/common/models";
+import { MultiTenantApiService } from "./multi-tenant-api.service.js";
+import { assertUserHasFeature } from "../utils/index.js";
+export class UserRolesService extends MultiTenantApiService {
+    constructor(database) {
+        super(database, "user_roles", "user_role", UserRoleModelSpec);
+    }
+    async preProcessEntity(userContext, entity, isCreate, allowId = true) {
+        assertUserHasFeature(userContext, ['admin', 'system', 'user-roles']);
+        return super.preProcessEntity(userContext, entity, isCreate, allowId);
+    }
+}

package/dist/services/user.service.js

@@ -1,6 +1,6 @@
 import { UserSpec, } from "@loomcore/common/models";
 import { BadRequestError, ServerError } from "../errors/index.js";
-import { assertAdmin, assertSelfOrAdmin, } from "../utils/auth/index.js";
+import { assertAdmin, assertUserOrAdmin, } from "../utils/auth/index.js";
 import { passwordUtils } from "../utils/password.utils.js";
 import { MultiTenantApiService } from "./multi-tenant-api.service.js";
 export class UserService extends MultiTenantApiService {
@@ -8,7 +8,7 @@ export class UserService extends MultiTenantApiService {
         super(database, "users", "user", modelSpec);
     }
     async getById(userContext, id) {
-        assertSelfOrAdmin(userContext, id);
+        assertUserOrAdmin(userContext, id);
         return super.getById(userContext, id);
     }
     async get(userContext, queryOptions) {
@@ -39,7 +39,7 @@ export class UserService extends MultiTenantApiService {
         return super.batchUpdate(userContext, entities);
     }
     async partialUpdateById(userContext, id, entity, allowPasswordUpdate = false) {
-        assertSelfOrAdmin(userContext, id);
+        assertUserOrAdmin(userContext, id);
         this.assertPasswordUpdateAllowed(userContext, id, entity, allowPasswordUpdate);
         return super.partialUpdateById(userContext, id, entity);
     }

package/dist/services/utils/getUserContextAuthorizations.util.d.ts

@@ -1,3 +1,3 @@
-import type { IUser, IUserContextAuthorization } from "@loomcore/common/models";
+import type { IUser } from "@loomcore/common/models";
 import type { IDatabase } from "../../databases/models/index.js";
-export declare function getUserContextAuthorizations(database: IDatabase, user: IUser): Promise<IUserContextAuthorization[]>;
+export declare function getUserContextFeatures(database: IDatabase, user: IUser): Promise<string[]>;

package/dist/services/utils/getUserContextAuthorizations.util.js

@@ -1,9 +1,9 @@
 import { PostgresDatabase } from "../../databases/postgres/postgres.database.js";
-export async function getUserContextAuthorizations(database, user) {
+export async function getUserContextFeatures(database, user) {
     if (!(database instanceof PostgresDatabase)) {
         return [];
     }
     const orgId = user._orgId;
-    const authorizations = await database.getUserAuthorizations(user._id, orgId);
-    return authorizations;
+    const features = await database.getUserFeatures(user._id, orgId);
+    return features;
 }

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

@@ -1,2 +1,2 @@
 import type { IAuditable, IUserContext } from "@loomcore/common/models";
-export declare function assertOwnerOrAdmin(userContext: IUserContext, entity: IAuditable): void;
+export declare function assertOwnerOrAdmin(userContext: IUserContext, auditable: IAuditable): void;

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

@@ -1,10 +1,10 @@
 import { UnauthorizedError } from "../../errors/index.js";
 import { isAdmin } from "./is-admin.util.js";
-export function assertOwnerOrAdmin(userContext, entity) {
+export function assertOwnerOrAdmin(userContext, auditable) {
     if (isAdmin(userContext)) {
         return;
     }
-    if (userContext.user._id !== entity._createdBy) {
+    if (userContext.user._id !== auditable._createdBy) {
         throw new UnauthorizedError();
     }
 }

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

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

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

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

package/dist/utils/auth/{assert-self-or-admin.util.d.ts → assert-user-or-admin.util.d.ts}

@@ -1,3 +1,3 @@
 import type { IUserContext } from "@loomcore/common/models";
 import type { AppIdType } from "@loomcore/common/types";
-export declare function assertSelfOrAdmin(userContext: IUserContext, userId: AppIdType): void;
+export declare function assertUserOrAdmin(userContext: IUserContext, userId: AppIdType): void;

package/dist/utils/auth/{assert-self-or-admin.util.js → assert-user-or-admin.util.js}

@@ -1,6 +1,6 @@
 import { UnauthorizedError } from "../../errors/index.js";
 import { isAdmin } from "./is-admin.util.js";
-export function assertSelfOrAdmin(userContext, userId) {
+export function assertUserOrAdmin(userContext, userId) {
     if (isAdmin(userContext)) {
         return;
     }

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

@@ -1,9 +1,9 @@
 import { EmptyUserContext, } from "@loomcore/common/models";
 import { BadRequestError } from "../../errors/index.js";
 import { UserService } from "../../services/user.service.js";
-import { getUserContextAuthorizations } from "../../services/utils/getUserContextAuthorizations.util.js";
 import { passwordUtils } from "../password.utils.js";
 import { logUserIn } from "./log-user-in.util.js";
+import { getUserContextFeatures } from "../../services/utils/getUserContextAuthorizations.util.js";
 export async function attemptLogin(database, email, password, deviceId, organization, userService = new UserService(database)) {
     const lowerCaseEmail = email.toLowerCase();
     const userContext = {
@@ -22,11 +22,11 @@ export async function attemptLogin(database, email, password, deviceId, organiza
     if (!passwordsMatch) {
         throw new BadRequestError("Invalid Credentials");
     }
-    const authorizations = await getUserContextAuthorizations(database, user);
+    const features = await getUserContextFeatures(database, user);
     const authenticatedUserContext = {
         user: user,
         organization: organization ?? undefined,
-        authorizations: authorizations,
+        features: features,
     };
     const tokens = await logUserIn(database, authenticatedUserContext, deviceId, userService);
     return {

package/dist/utils/auth/auth-user-specs.util.d.ts

@@ -1,4 +1,3 @@
 import { type IModelSpec } from "@loomcore/common/models";
 export declare function createLoginResponseSpec(userContextSpec: IModelSpec): IModelSpec;
-export declare function setAuthUserContextSpec(spec: IModelSpec): void;
 export declare function getAuthUserContextSpec(): IModelSpec;

package/dist/utils/auth/auth-user-specs.util.js

@@ -2,15 +2,13 @@ import { TokenResponseSchema, UserContextSpec, } from "@loomcore/common/models";
 import { entityUtils } from "@loomcore/common/utils";
 import { Type } from "@sinclair/typebox";
 export function createLoginResponseSpec(userContextSpec) {
+    authUserContextSpec = userContextSpec;
     return entityUtils.getModelSpec(Type.Object({
         tokens: TokenResponseSchema,
         userContext: userContextSpec.fullSchema,
     }), { isEntity: false });
 }
 let authUserContextSpec = UserContextSpec;
-export function setAuthUserContextSpec(spec) {
-    authUserContextSpec = spec;
-}
 export function getAuthUserContextSpec() {
     return authUserContextSpec;
 }

package/dist/utils/auth/authorize-method.util.d.ts

@@ -0,0 +1,2 @@
+import { RequestHandler } from 'express';
+export declare function authorizeMethod<T extends object>(instance: T, methodName: Extract<keyof T, string>): RequestHandler;

package/dist/utils/auth/authorize-method.util.js

@@ -0,0 +1,8 @@
+import { resolveAuthRequirement } from '../../decorators/authorize.decorator.js';
+import { buildAuthGuard } from '../../middleware/authorize/authorize.middleware.js';
+export function authorizeMethod(instance, methodName) {
+    const constructor = instance.constructor;
+    const prototype = Object.getPrototypeOf(instance);
+    const requirement = resolveAuthRequirement(constructor, prototype, methodName);
+    return buildAuthGuard(requirement);
+}

package/dist/utils/auth/create-new-refresh-token.util.d.ts

@@ -1,4 +1,4 @@
+import { type IRefreshToken } from "@loomcore/common/models";
 import type { AppIdType } from "@loomcore/common/types";
 import type { IDatabase } from "../../databases/models/index.js";
-import type { IRefreshToken } from "../../models/refresh-token.model.js";
 export declare function createNewRefreshToken(database: IDatabase, userId: AppIdType, deviceId: string, orgId?: AppIdType): Promise<IRefreshToken>;

package/dist/utils/auth/create-new-tokens.util.d.ts

@@ -1,3 +1,2 @@
-import type { ITokenResponse, IUserContext } from "@loomcore/common/models";
-import type { IRefreshToken } from "../../models/refresh-token.model.js";
+import type { IRefreshToken, ITokenResponse, IUserContext } from "@loomcore/common/models";
 export declare function createNewTokens(userContext: IUserContext, activeRefreshToken: IRefreshToken): Promise<ITokenResponse>;

package/dist/utils/auth/get-active-refresh-token.util.d.ts

@@ -1,4 +1,3 @@
-import type { IUserContext } from "@loomcore/common/models";
+import type { IRefreshToken, IUserContext } from "@loomcore/common/models";
 import type { IDatabase } from "../../databases/models/index.js";
-import type { IRefreshToken } from "../../models/refresh-token.model.js";
 export declare function getActiveRefreshToken(database: IDatabase, userContext: IUserContext, refreshToken: string, deviceId: string): Promise<IRefreshToken | null>;

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

@@ -1,8 +1,9 @@
 export * from "./assert-admin.util.js";
 export * from "./assert-owner-or-admin.util.js";
-export * from "./assert-self-or-admin.util.js";
+export * from "./assert-user-or-admin.util.js";
 export * from "./attempt-login.util.js";
 export * from "./auth-user-specs.util.js";
+export * from "./assert-user-has-feature.util.js";
 export * from "./change-password.util.js";
 export * from "./create-new-refresh-token.util.js";
 export * from "./create-new-tokens.util.js";
@@ -21,3 +22,4 @@ export * from "./request-token-using-refresh-token.util.js";
 export * from "./reset-password.util.js";
 export * from "./send-reset-password-email.util.js";
 export * from "./update-last-logged-in.util.js";
+export * from "./authorize-method.util.js";

package/dist/utils/auth/index.js

@@ -1,8 +1,9 @@
 export * from "./assert-admin.util.js";
 export * from "./assert-owner-or-admin.util.js";
-export * from "./assert-self-or-admin.util.js";
+export * from "./assert-user-or-admin.util.js";
 export * from "./attempt-login.util.js";
 export * from "./auth-user-specs.util.js";
+export * from "./assert-user-has-feature.util.js";
 export * from "./change-password.util.js";
 export * from "./create-new-refresh-token.util.js";
 export * from "./create-new-tokens.util.js";
@@ -21,3 +22,4 @@ export * from "./request-token-using-refresh-token.util.js";
 export * from "./reset-password.util.js";
 export * from "./send-reset-password-email.util.js";
 export * from "./update-last-logged-in.util.js";
+export * from "./authorize-method.util.js";

package/dist/utils/auth/is-admin.util.js

@@ -1,4 +1,3 @@
 export function isAdmin(userContext) {
-    return userContext.authorizations.some((authorization) => authorization.feature === "admin" ||
-        authorization.feature === "system");
+    return userContext.features.some((feature) => feature === "admin" || feature === "system");
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.26",
+  "version": "0.2.28",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -55,10 +55,11 @@
   "dependencies": {
     "jsonwebtoken": "^9.0.2",
     "node-mailjet": "^6.0.8",
-    "qs": "^6.15.2"
+    "qs": "^6.15.2",
+    "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.78",
+    "@loomcore/common": "^0.0.80",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",

package/dist/middleware/is-authorized.d.ts

@@ -1,4 +0,0 @@
-import type { NextFunction, Request, Response } from "express";
-import type { MethodAuth } from "../models/method-auth.model.js";
-declare const isAuthorized: (config: MethodAuth) => (req: Request, _res: Response, next: NextFunction) => void;
-export { isAuthorized };

package/dist/middleware/is-authorized.js

@@ -1,57 +0,0 @@
-import jwt from "jsonwebtoken";
-import { BadRequestError, UnauthenticatedError, UnauthorizedError, } from "../errors/index.js";
-import { getAuthUserContextSpec } from "../utils/auth/auth-user-specs.util.js";
-import { getAuthConfig } from "../utils/auth/get-auth-config.util.js";
-function resolveAuthMethod(req) {
-    switch (req.method.toUpperCase()) {
-        case "GET":
-        case "HEAD":
-            return "read";
-        case "POST":
-            return "create";
-        case "PUT":
-        case "PATCH":
-            return "update";
-        case "DELETE":
-            return "delete";
-        default:
-            return null;
-    }
-}
-function assertFeatureRequirement(userContext, requirement) {
-    if (requirement === undefined) {
-        throw new UnauthorizedError();
-    }
-    if (requirement === true) {
-        return;
-    }
-    if (!requirement.some((feature) => userContext.authorizations.some((authorization) => authorization.feature === feature))) {
-        throw new UnauthorizedError();
-    }
-}
-const isAuthorized = (config) => {
-    return (req, _res, next) => {
-        let token = null;
-        if (req.headers?.authorization) {
-            const authHeader = req.headers.authorization;
-            const authHeaderArray = authHeader.split("Bearer ");
-            if (authHeaderArray?.length > 1) {
-                token = authHeaderArray[1];
-            }
-        }
-        if (!token) {
-            throw new UnauthenticatedError();
-        }
-        const authConfig = getAuthConfig();
-        const rawPayload = jwt.verify(token, authConfig.clientSecret);
-        const userContext = getAuthUserContextSpec().decode(rawPayload);
-        req.userContext = userContext;
-        const method = resolveAuthMethod(req);
-        if (!method) {
-            throw new BadRequestError("Invalid HTTP method");
-        }
-        assertFeatureRequirement(userContext, config[method]);
-        next();
-    };
-};
-export { isAuthorized };

package/dist/models/authorization.model.d.ts

@@ -1,16 +0,0 @@
-import { IAuditable, IEntity } from "@loomcore/common/models";
-export interface IAuthorization extends IEntity, IAuditable {
-    roleId: string;
-    featureId: string;
-    startDate?: Date;
-    endDate?: Date;
-    config?: any;
-}
-export declare const AuthorizationSchema: import("@sinclair/typebox").TObject<{
-    roleId: import("@sinclair/typebox").TString;
-    featureId: import("@sinclair/typebox").TString;
-    startDate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    endDate: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>>;
-    config: import("@sinclair/typebox").TOptional<import("@sinclair/typebox").TAny>;
-}>;
-export declare const AuthorizationModelSpec: import("@loomcore/common/models").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/authorization.model.js

@@ -1,11 +0,0 @@
-import { Type } from "@sinclair/typebox";
-import { entityUtils } from "@loomcore/common/utils";
-import { TypeboxIsoDate } from "@loomcore/common/validation";
-export const AuthorizationSchema = Type.Object({
-    roleId: Type.String({ minLength: 1, title: 'Role ID' }),
-    featureId: Type.String({ minLength: 1, title: 'Feature ID' }),
-    startDate: Type.Optional(TypeboxIsoDate({ title: 'Start Date' })),
-    endDate: Type.Optional(TypeboxIsoDate({ title: 'End Date' })),
-    config: Type.Optional(Type.Any({ title: 'Config' }))
-});
-export const AuthorizationModelSpec = entityUtils.getModelSpec(AuthorizationSchema, { isAuditable: true });

package/dist/models/feature.model.d.ts

@@ -1,7 +0,0 @@
-import { IEntity } from "@loomcore/common/models";
-import { TSchema } from "@sinclair/typebox";
-export interface IFeature extends IEntity {
-    name: string;
-}
-export declare const FeatureSchema: TSchema;
-export declare const FeatureModelSpec: import("@loomcore/common/models").IModelSpec<TSchema>;

package/dist/models/feature.model.js

@@ -1,6 +0,0 @@
-import { entityUtils } from "@loomcore/common/utils";
-import { Type } from "@sinclair/typebox";
-export const FeatureSchema = Type.Object({
-    name: Type.String({ minLength: 1 }),
-});
-export const FeatureModelSpec = entityUtils.getModelSpec(FeatureSchema);

package/dist/models/method-auth.model.d.ts

@@ -1,9 +0,0 @@
-export type FeatureRequirement = true | string[];
-export interface MethodAuth {
-    read?: FeatureRequirement;
-    create?: FeatureRequirement;
-    update?: FeatureRequirement;
-    delete?: FeatureRequirement;
-}
-export declare const authenticated: MethodAuth;
-export declare const adminWrites: MethodAuth;

package/dist/models/method-auth.model.js

@@ -1,12 +0,0 @@
-export const authenticated = {
-    read: true,
-    create: true,
-    update: true,
-    delete: true,
-};
-export const adminWrites = {
-    read: true,
-    create: ["admin"],
-    update: ["admin"],
-    delete: ["admin"],
-};

package/dist/models/refresh-token.model.d.ts

@@ -1,19 +0,0 @@
-import type { IEntity } from "@loomcore/common/models";
-import type { AppIdType } from "@loomcore/common/types";
-export interface IRefreshToken extends IEntity {
-    token: string;
-    deviceId: string;
-    userId: AppIdType;
-    expiresOn: number;
-    created: Date;
-    createdBy: AppIdType;
-}
-export declare const refreshTokenSchema: import("@sinclair/typebox").TObject<{
-    token: import("@sinclair/typebox").TString;
-    deviceId: import("@sinclair/typebox").TString;
-    userId: import("@sinclair/typebox").TSchema;
-    expiresOn: import("@sinclair/typebox").TNumber;
-    created: import("@sinclair/typebox").TTransform<import("@sinclair/typebox").TString, Date>;
-    createdBy: import("@sinclair/typebox").TSchema;
-}>;
-export declare const refreshTokenModelSpec: import("@loomcore/common/models").IModelSpec<import("@sinclair/typebox").TSchema>;

package/dist/models/refresh-token.model.js

@@ -1,12 +0,0 @@
-import { entityUtils } from "@loomcore/common/utils";
-import { getIdSchema, TypeboxIsoDate } from "@loomcore/common/validation";
-import { Type } from "@sinclair/typebox";
-export const refreshTokenSchema = Type.Object({
-    token: Type.String({ minLength: 1 }),
-    deviceId: Type.String({ minLength: 1 }),
-    userId: getIdSchema(),
-    expiresOn: Type.Number(),
-    created: TypeboxIsoDate({ title: "Created Date" }),
-    createdBy: getIdSchema(),
-});
-export const refreshTokenModelSpec = entityUtils.getModelSpec(refreshTokenSchema);

package/dist/models/role.model.d.ts

@@ -1,7 +0,0 @@
-import { IEntity } from "@loomcore/common/models";
-import { TSchema } from "@sinclair/typebox";
-export interface IRole extends IEntity {
-    name: string;
-}
-export declare const RoleSchema: TSchema;
-export declare const RoleModelSpec: import("@loomcore/common/models").IModelSpec<TSchema>;

package/dist/models/role.model.js

@@ -1,6 +0,0 @@
-import { Type } from "@sinclair/typebox";
-import { entityUtils } from "@loomcore/common/utils";
-export const RoleSchema = Type.Object({
-    name: Type.String({ minLength: 1 }),
-});
-export const RoleModelSpec = entityUtils.getModelSpec(RoleSchema);

package/dist/models/user-role.model.d.ts

@@ -1,8 +0,0 @@
-import { IAuditable, IEntity } from "@loomcore/common/models";
-import { TSchema } from "@sinclair/typebox";
-export interface IUserRole extends IEntity, IAuditable {
-    userId: string;
-    roleId: string;
-}
-export declare const UserRoleSchema: TSchema;
-export declare const UserRoleModelSpec: import("@loomcore/common/models").IModelSpec<TSchema>;

package/dist/models/user-role.model.js

@@ -1,7 +0,0 @@
-import { entityUtils } from "@loomcore/common/utils";
-import { Type } from "@sinclair/typebox";
-export const UserRoleSchema = Type.Object({
-    userId: Type.String({ minLength: 1 }),
-    roleId: Type.String({ minLength: 1 }),
-});
-export const UserRoleModelSpec = entityUtils.getModelSpec(UserRoleSchema, { isAuditable: true });