@loomcore/api 0.0.14 → 0.0.17

package/dist/__tests__/test-express-app.js

@@ -39,7 +39,7 @@ export class TestExpressApp {
             debug: {
                 showErrors: false
             },
-            app: { multiTenant: true },
+            app: { isMultiTenant: true },
             auth: {
                 jwtExpirationInSeconds: 3600,
                 refreshTokenExpirationInDays: 7,

package/dist/models/base-api-config.interface.d.ts

@@ -15,7 +15,7 @@ export interface IBaseApiConfig {
         showErrors?: boolean;
     };
     app: {
-        multiTenant: boolean;
+        isMultiTenant: boolean;
     };
     auth: {
         jwtExpirationInSeconds: number;

package/dist/services/multi-tenant-api.service.d.ts

@@ -2,7 +2,7 @@ import { Db } from 'mongodb';
 import { IUserContext, IEntity, QueryOptions, IModelSpec } from '@loomcore/common/models';
 import { GenericApiService } from './generic-api.service.js';
 export declare class MultiTenantApiService<T extends IEntity> extends GenericApiService<T> {
-    private tenantDecorator;
+    private tenantDecorator?;
     constructor(db: Db, pluralResourceName: string, singularResourceName: string, modelSpec?: IModelSpec);
     protected prepareQuery(userContext: IUserContext, query: any): any;
     protected prepareQueryOptions(userContext: IUserContext, queryOptions: QueryOptions): QueryOptions;

package/dist/services/multi-tenant-api.service.js

@@ -1,25 +1,37 @@
 import { GenericApiService } from './generic-api.service.js';
 import { TenantQueryDecorator } from './tenant-query-decorator.js';
 import { BadRequestError } from '../errors/bad-request.error.js';
+import { config } from '../config/base-api-config.js';
 export class MultiTenantApiService extends GenericApiService {
     tenantDecorator;
     constructor(db, pluralResourceName, singularResourceName, modelSpec) {
         super(db, pluralResourceName, singularResourceName, modelSpec);
-        this.tenantDecorator = new TenantQueryDecorator();
+        if (config?.app?.isMultiTenant) {
+            this.tenantDecorator = new TenantQueryDecorator();
+        }
     }
     prepareQuery(userContext, query) {
+        if (!config?.app?.isMultiTenant) {
+            return super.prepareQuery(userContext, query);
+        }
         if (!userContext || !userContext._orgId) {
             throw new BadRequestError('A valid userContext was not provided to MultiTenantApiService.prepareQuery');
         }
         return this.tenantDecorator.applyTenantToQuery(userContext, query, this.pluralResourceName);
     }
     prepareQueryOptions(userContext, queryOptions) {
+        if (!config?.app?.isMultiTenant) {
+            return super.prepareQueryOptions(userContext, queryOptions);
+        }
         if (!userContext || !userContext._orgId) {
             throw new BadRequestError('A valid userContext was not provided to MultiTenantApiService.prepareQueryOptions');
         }
         return this.tenantDecorator.applyTenantToQueryOptions(userContext, queryOptions, this.pluralResourceName);
     }
     async prepareEntity(userContext, entity, isCreate) {
+        if (!config?.app?.isMultiTenant) {
+            return super.prepareEntity(userContext, entity, isCreate);
+        }
         if (!userContext || !userContext._orgId) {
             throw new BadRequestError('A valid userContext was not provided to MultiTenantApiService.prepareEntity');
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.0.14",
+  "version": "0.0.17",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb",
   "scripts": {
@@ -44,7 +44,7 @@
     "jsonwebtoken": "^9.0.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.7",
+    "@loomcore/common": "^0.0.9",
     "@sinclair/typebox": "^0.34.31",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",