@loomcore/api 0.2.20 → 0.2.21

package/dist/controllers/auth.controller.js

@@ -1,4 +1,4 @@
-import { EmptyUserContext, passwordValidator, TokenResponseSpec, } from "@loomcore/common/models";
+import { EmptyUserContext, passwordValidator, TokenResponseSpec, UserSpec, } from "@loomcore/common/models";
 import { entityUtils } from "@loomcore/common/utils";
 import { config } from "../config/base-api-config.js";
 import { BadRequestError, UnauthenticatedError } from "../errors/index.js";
@@ -16,8 +16,12 @@ export class AuthController {
     loginResponseSpec;
     constructor(app, database, options = {}) {
         this.database = database;
+        const userSpecFromService = options.userService?.getModelSpec();
+        const inheritedUserSpec = userSpecFromService && userSpecFromService !== UserSpec
+            ? userSpecFromService
+            : undefined;
         const resolved = resolveAuthUserSpecs({
-            userSpec: options.userSpec,
+            userSpec: options.userSpec ?? inheritedUserSpec,
             publicUserSpec: options.publicUserSpec,
         });
         this.userSpec = resolved.userSpec;
@@ -27,8 +31,9 @@ export class AuthController {
         this.userService =
             options.userService ?? new UserService(database, this.userSpec);
         this.organizationService = new OrganizationService(database);
-        if (options.userSpec) {
-            setAuthUserContextSpec(createUserContextSpec(this.userSpec));
+        const jwtUserModelSpec = options.userSpec ?? inheritedUserSpec ?? options.publicUserSpec;
+        if (jwtUserModelSpec) {
+            setAuthUserContextSpec(createUserContextSpec(jwtUserModelSpec));
         }
         this.mapRoutes(app);
     }

package/dist/services/generic-api-service/generic-api-service.interface.d.ts

@@ -1,10 +1,11 @@
-import type { IEntity, IPagedResult, IQueryOptions, IUserContext } from "@loomcore/common/models";
+import type { IEntity, IModelSpec, IPagedResult, IQueryOptions, IUserContext } from "@loomcore/common/models";
 import type { AppIdType } from "@loomcore/common/types";
 import type { ValueError } from "@sinclair/typebox/errors";
 import type { PostProcessEntityCustomFunction, PrepareQueryCustomFunction } from "../../controllers/types.js";
 import type { DeleteResult } from "../../databases/models/delete-result.js";
 import type { Operation } from "../../databases/operations/operation.js";
 export interface IGenericApiService<T extends IEntity> {
+    getModelSpec(): IModelSpec;
     validate(doc: any, isPartial?: boolean): ValueError[] | null;
     validateMany(docs: any[], isPartial?: boolean): ValueError[] | null;
     prepareQuery(userContext: IUserContext | undefined, queryObject: IQueryOptions, operations: Operation[]): {

package/dist/services/generic-api-service/generic-api.service.d.ts

@@ -12,6 +12,7 @@ export declare class GenericApiService<T extends IEntity> implements IGenericApi
     protected singularResourceName: string;
     protected modelSpec: IModelSpec;
     constructor(database: IDatabase, pluralResourceName: string, singularResourceName: string, modelSpec: IModelSpec);
+    getModelSpec(): IModelSpec;
     getAll(userContext: IUserContext): Promise<T[]>;
     getAll<TCustom extends IEntity>(userContext: IUserContext, prepareQueryCustom: PrepareQueryCustomFunction, postProcessEntityCustom: PostProcessEntityCustomFunction<T, TCustom>): Promise<TCustom[]>;
     prepareQuery(userContext: IUserContext | undefined, queryObject: IQueryOptions, operations: Operation[]): {

package/dist/services/generic-api-service/generic-api.service.js

@@ -16,6 +16,9 @@ export class GenericApiService {
         this.modelSpec = modelSpec;
         this.database = database;
     }
+    getModelSpec() {
+        return this.modelSpec;
+    }
     async getAll(userContext, prepareQueryCustom, postProcessEntityCustom) {
         let operations = [];
         if (prepareQueryCustom) {

package/package.json

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