@loomcore/api 0.2.39 → 0.2.41

package/LICENSE

@@ -1,201 +1,201 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
-
-   APPENDIX: How to apply the Apache License to your work.
-
-      To apply the Apache License to your work, attach the following
-      boilerplate notice, with the fields enclosed by brackets "[]"
-      replaced with your own identifying information. (Don't include
-      the brackets!)  The text should be enclosed in the appropriate
-      comment syntax for the file format. We also recommend that a
-      file or class name and description of purpose be included on the
-      same "printed page" as the copyright notice for easier
-      identification within third-party archives.
-
-   Copyright [yyyy] [name of copyright owner]
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

package/dist/__tests__/postgres-test-migrations/postgres-test-schema.js

@@ -6,7 +6,7 @@ export const getPostgresTestSchema = (config) => {
         up: async ({ context: pool }) => {
             const orgColumnDef = isMultiTenant ? '"_orgId" INTEGER,' : "";
             await pool.query(`
-        CREATE TABLE IF NOT EXISTS "testEntities" (
+        CREATE TABLE IF NOT EXISTS "test_entities" (
           "_id" INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
           ${orgColumnDef}
           "name" VARCHAR(255) NOT NULL,
@@ -24,7 +24,7 @@ export const getPostgresTestSchema = (config) => {
       `);
         },
         down: async ({ context: pool }) => {
-            await pool.query('DROP TABLE IF EXISTS "testEntities"');
+            await pool.query('DROP TABLE IF EXISTS "test_entities"');
         },
     });
     migrations.push({
@@ -74,7 +74,7 @@ export const getPostgresTestSchema = (config) => {
         up: async ({ context: pool }) => {
             const orgColumnDef = isMultiTenant ? '"_orgId" INTEGER,' : "";
             await pool.query(`
-        CREATE TABLE IF NOT EXISTS "testItems" (
+        CREATE TABLE IF NOT EXISTS "test_items" (
           "_id" INTEGER GENERATED ALWAYS AS IDENTITY PRIMARY KEY,
           ${orgColumnDef}
           "name" VARCHAR(255) NOT NULL,
@@ -90,7 +90,7 @@ export const getPostgresTestSchema = (config) => {
       `);
         },
         down: async ({ context: pool }) => {
-            await pool.query('DROP TABLE IF EXISTS "testItems"');
+            await pool.query('DROP TABLE IF EXISTS "test_items"');
         },
     });
     migrations.push({

package/dist/__tests__/test-objects.js

@@ -53,14 +53,12 @@ export function getTestMetaOrgUser() {
 export function getTestMetaOrgUserContext() {
     return {
         user: getTestMetaOrgUser(),
-        organization: getTestMetaOrg(),
         features: ["metaorgUser"],
     };
 }
 export function getTestMetaOrgAdminUserContext() {
     return {
         user: getTestMetaOrgUser(),
-        organization: getTestMetaOrg(),
         features: ["admin"],
     };
 }
@@ -105,7 +103,6 @@ export function getTestOrgUser() {
 export function getTestOrgUserContext() {
     return {
         user: getTestOrgUser(),
-        organization: getTestOrg(),
         features: ["testOrgUser"],
     };
 }

package/dist/controllers/api.controller.js

@@ -2,7 +2,7 @@ import { BadRequestError } from '../errors/index.js';
 import { entityUtils } from '@loomcore/common/utils';
 import { Value } from '@sinclair/typebox/value';
 import { getIdSchema } from '@loomcore/common/validation';
-import { apiUtils, authorizeMethod } from '../utils/index.js';
+import { apiUtils, authorizeMethod, createPublicSpec } from '../utils/index.js';
 export class ApiController {
     app;
     service;
@@ -17,9 +17,14 @@ export class ApiController {
         this.service = service;
         this.apiResourceName = resourceName;
         this.modelSpec = modelSpec;
-        this.publicSpec = publicSpec;
         this.idSchema = getIdSchema();
         this.mapRoutes(app);
+        if (modelSpec && !publicSpec) {
+            this.publicSpec = createPublicSpec(modelSpec);
+        }
+        else {
+            this.publicSpec = publicSpec;
+        }
     }
     mapRoutes(app) {
         const authorize = (method) => authorizeMethod(this, method);

package/dist/controllers/auth.controller.js

@@ -157,13 +157,16 @@ let AuthController = (() => {
             }
             const userContext = {
                 ...EmptyUserContext,
-                organization: organization || undefined,
+                user: {
+                    ...EmptyUserContext.user,
+                    _orgId: organization?._id,
+                },
             };
             const user = await this.userService.findOne(userContext, {
                 filters: { email: { eq: email.toLowerCase() } },
             });
             if (user) {
-                await sendResetPasswordEmail(this.database, email, referer, organization || undefined);
+                await sendResetPasswordEmail(userContext, this.database, email, referer);
             }
             apiUtils.apiResponse(res, 200);
         }

package/dist/databases/mongo-db/migrations/mongo-initial-schema.js

@@ -253,8 +253,8 @@ export const getMongoInitialSchema = (dbConfig) => {
                     throw new Error(errorMessage);
                 }
                 const systemUserContext = getSystemUserContext();
-                const orgDoc = isMultiTenant && systemUserContext.organization?._id
-                    ? { _orgId: String(systemUserContext.organization._id) }
+                const orgDoc = isMultiTenant && systemUserContext.user._orgId
+                    ? { _orgId: String(systemUserContext.user._orgId) }
                     : {};
                 const hashedPassword = await passwordUtils.hashPassword(dbConfig.adminUser.password);
                 const email = dbConfig.adminUser.email.toLowerCase();

package/dist/databases/postgres/migrations/postgres-initial-schema.js

@@ -313,7 +313,7 @@ export const getPostgresInitialSchema = (dbConfig) => {
                 }
                 const systemUserContext = getSystemUserContext();
                 const orgId = isMultiTenant
-                    ? systemUserContext.organization?._id
+                    ? systemUserContext.user._orgId
                     : undefined;
                 const hashedPassword = await passwordUtils.hashPassword(dbConfig.adminUser.password);
                 const email = dbConfig.adminUser.email.toLowerCase();

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

@@ -3,12 +3,15 @@ import type { IAuthConfig } from "./auth-config.interface.js";
 import type { IDatabaseConfig } from "./database-config.interface.js";
 import type { IEmailClient } from "./email-client.interface.js";
 import type { IEmailConfig } from "./email-config.interface.js";
+import { LogLevel } from "./index.js";
 export interface IBaseApiConfig {
     app: IAppConfig;
     auth?: IAuthConfig;
     database: IDatabaseConfig;
     debug?: {
         showErrors?: boolean;
+        logLevel: LogLevel;
+        showAuditFields: boolean;
     };
     email?: IEmailConfig;
     env: string;

package/dist/models/index.d.ts

@@ -2,4 +2,5 @@ export * from './app-config.interface.js';
 export * from './base-api-config.interface.js';
 export * from './database-config.interface.js';
 export * from './initial-database-config.interface.js';
+export * from './log-level.type.js';
 export * from './email-client.interface.js';

package/dist/models/index.js

@@ -2,4 +2,5 @@ export * from './app-config.interface.js';
 export * from './base-api-config.interface.js';
 export * from './database-config.interface.js';
 export * from './initial-database-config.interface.js';
+export * from './log-level.type.js';
 export * from './email-client.interface.js';

package/dist/models/log-level.type.d.ts

@@ -0,0 +1 @@
+export type LogLevel = "debug" | "info" | "warn" | "error";

package/dist/models/log-level.type.js

@@ -0,0 +1 @@
+export {};

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

@@ -17,7 +17,7 @@ export class MultiTenantApiService extends GenericApiService {
             userContext?.user?._id === getSystemUserId()) {
             return super.prepareQuery(userContext, queryOptions, operations);
         }
-        if (!userContext?.organization?._id) {
+        if (!userContext?.user?._orgId) {
             throw new BadRequestError("A valid userContext was not provided to MultiTenantApiService.prepareQuery");
         }
         if (!this.tenantDecorator) {
@@ -30,12 +30,12 @@ export class MultiTenantApiService extends GenericApiService {
         if (!config?.app?.isMultiTenant) {
             return super.preProcessEntity(userContext, entity, isCreate, allowId);
         }
-        if (!userContext?.organization?._id) {
+        if (!userContext?.user?._orgId) {
             throw new BadRequestError("A valid userContext was not provided to MultiTenantApiService.prepareEntity");
         }
         const preparedEntity = await super.preProcessEntity(userContext, entity, isCreate, allowId);
         if (isCreate && userContext.user._id !== getSystemUserId()) {
-            preparedEntity._orgId = userContext.organization?._id;
+            preparedEntity._orgId = userContext.user._orgId;
         }
         return preparedEntity;
     }

package/dist/services/organization.service.js

@@ -14,7 +14,7 @@ export class OrganizationService extends GenericApiService {
             if (metaOrg && entity.isMetaOrg) {
                 throw new BadRequestError("Meta organization already exists");
             }
-            if (metaOrg && userContext.organization?._id !== metaOrg._id) {
+            if (metaOrg && userContext.user._orgId !== metaOrg._id) {
                 throw new BadRequestError("User is not authorized to create an organization");
             }
         }

package/dist/services/tenant-query-decorator.js

@@ -11,18 +11,18 @@ export class TenantQueryDecorator {
     applyTenantToQuery(userContext, queryObject, collectionName) {
         let result = queryObject;
         const shouldApplyTenantFilter = !this.options.excludedCollections?.includes(collectionName) &&
-            userContext?.organization?._id;
+            userContext?.user._orgId;
         if (shouldApplyTenantFilter) {
             const orgIdField = this.options.orgIdField || "_orgId";
             result = {
                 ...queryObject,
                 filters: {
                     ...queryObject.filters,
-                    [orgIdField]: { eq: userContext.organization?._id },
+                    [orgIdField]: { eq: userContext.user._orgId },
                 },
             };
         }
-        else if (!userContext?.organization?._id) {
+        else if (!userContext?.user._orgId) {
             if (!this.options.excludedCollections?.includes(collectionName)) {
                 throw new ServerError("No _orgId found in userContext");
             }
@@ -33,29 +33,29 @@ export class TenantQueryDecorator {
         const result = { ...queryOptions };
         const shouldApplyTenantFilter = !this.options.excludedCollections?.includes(collectionName);
         if (shouldApplyTenantFilter) {
-            if (!userContext?.organization?._id) {
+            if (!userContext?.user._orgId) {
                 throw new ServerError("userContext must have an _orgId property to apply tenant filtering");
             }
             if (!result.filters) {
                 result.filters = {};
             }
             const orgIdField = this.getOrgIdField();
-            result.filters[orgIdField] = { eq: userContext.organization?._id };
+            result.filters[orgIdField] = { eq: userContext.user._orgId };
         }
         return result;
     }
     applyTenantToEntity(userContext, entity, collectionName) {
         let result = entity;
         const shouldApplyTenantFilter = !this.options.excludedCollections?.includes(collectionName) &&
-            userContext?.organization?._id;
+            userContext?.user._orgId;
         if (shouldApplyTenantFilter) {
             const orgIdField = this.options.orgIdField || "_orgId";
             result = {
                 ...entity,
-                [orgIdField]: userContext.organization?._id,
+                [orgIdField]: userContext.user._orgId,
             };
         }
-        else if (!userContext?.organization?._id) {
+        else if (!userContext?.user._orgId) {
             if (!this.options.excludedCollections?.includes(collectionName)) {
                 throw new ServerError("No _orgId found in userContext");
             }

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

@@ -8,7 +8,10 @@ export async function attemptLogin(database, email, password, deviceId, organiza
     const lowerCaseEmail = email.toLowerCase();
     const userContext = {
         ...EmptyUserContext,
-        organization: organization ?? undefined,
+        user: {
+            ...EmptyUserContext.user,
+            _orgId: organization?._id,
+        },
     };
     const user = await userService.findOne(userContext, {
         filters: {
@@ -25,7 +28,6 @@ export async function attemptLogin(database, email, password, deviceId, organiza
     const features = await authorizationsService.getUserContextFeatures(user);
     const authenticatedUserContext = {
         user: user,
-        organization: organization ?? undefined,
         features: features,
     };
     const tokens = await logUserIn(database, authenticatedUserContext, deviceId, userService);

package/dist/utils/auth/log-user-in.util.js

@@ -6,7 +6,7 @@ import { updateLastLoggedIn } from "./update-last-logged-in.util.js";
 export async function logUserIn(database, userContext, deviceId, userService) {
     const authConfig = getAuthConfig();
     const accessToken = generateJwt(userContext);
-    const refreshTokenObject = await createNewRefreshToken(database, userContext.user._id, deviceId, userContext.organization?._id);
+    const refreshTokenObject = await createNewRefreshToken(database, userContext.user._id, deviceId, userContext.user._orgId);
     const accessTokenExpiresOn = getExpiresOnFromSeconds(authConfig.jwtExpirationInSeconds);
     const tokenResponse = {
         accessToken,

package/dist/utils/auth/request-token-using-refresh-token.util.d.ts

@@ -1,6 +1,5 @@
 import { type ITokenResponse } from "@loomcore/common/models";
 import type { IDatabase } from "../../databases/models/index.js";
 import { AuthorizationsService } from "../../services/authorizations.service.js";
-import { OrganizationService } from "../../services/organization.service.js";
 import { UserService } from "../../services/user.service.js";
-export declare function requestTokenUsingRefreshToken(database: IDatabase, refreshToken: string, deviceId: string, userService?: UserService, organizationService?: OrganizationService, authorizationsService?: AuthorizationsService): Promise<ITokenResponse | null>;
+export declare function requestTokenUsingRefreshToken(database: IDatabase, refreshToken: string, deviceId: string, userService?: UserService, authorizationsService?: AuthorizationsService): Promise<ITokenResponse | null>;

package/dist/utils/auth/request-token-using-refresh-token.util.js

@@ -1,33 +1,18 @@
 import { getSystemUserContext, } from "@loomcore/common/models";
 import { AuthorizationsService } from "../../services/authorizations.service.js";
-import { OrganizationService } from "../../services/organization.service.js";
 import { UserService } from "../../services/user.service.js";
-import { config } from "../../config/base-api-config.js";
 import { createNewTokens } from "./create-new-tokens.util.js";
 import { getActiveRefreshToken } from "./get-active-refresh-token.util.js";
 import { BadRequestError } from "../../errors/index.js";
-export async function requestTokenUsingRefreshToken(database, refreshToken, deviceId, userService = new UserService(database), organizationService = new OrganizationService(database), authorizationsService = new AuthorizationsService(database)) {
+export async function requestTokenUsingRefreshToken(database, refreshToken, deviceId, userService = new UserService(database), authorizationsService = new AuthorizationsService(database)) {
     const systemUserContext = getSystemUserContext();
     const activeRefreshToken = await getActiveRefreshToken(database, systemUserContext, refreshToken, deviceId);
     if (!activeRefreshToken) {
         return null;
     }
-    let organization = null;
-    if (config.app.isMultiTenant && activeRefreshToken._orgId) {
-        organization =
-            await organizationService.findOne(systemUserContext, {
-                filters: { _id: { eq: activeRefreshToken._orgId } },
-            });
-        if (!organization) {
-            throw new BadRequestError("Organization not found");
-        }
-    }
     let userQueryOptions = {
         filters: { _id: { eq: activeRefreshToken.userId } },
     };
-    if (organization) {
-        userQueryOptions.filters = { ...userQueryOptions.filters, _orgId: { eq: organization._id } };
-    }
     const user = await userService.findOne(systemUserContext, userQueryOptions);
     if (!user) {
         throw new BadRequestError("User not found");
@@ -35,7 +20,6 @@ export async function requestTokenUsingRefreshToken(database, refreshToken, devi
     const features = await authorizationsService.getUserContextFeatures(user);
     const userContext = {
         user,
-        organization: organization ?? undefined,
         features,
     };
     return createNewTokens(userContext, activeRefreshToken);

package/dist/utils/auth/reset-password.util.js

@@ -11,7 +11,10 @@ export async function resetPassword(database, email, passwordResetToken, passwor
     const passwordResetTokenService = new PasswordResetTokenService(database);
     const userContext = {
         ...EmptyUserContext,
-        organization: organization ?? undefined,
+        user: {
+            ...EmptyUserContext.user,
+            _orgId: organization?._id,
+        },
     };
     const retrievedPasswordResetToken = await passwordResetTokenService.findOne(userContext, {
         filters: { email: { eq: lowerCaseEmail } },

package/dist/utils/auth/send-reset-password-email.util.d.ts

@@ -1,3 +1,3 @@
-import { type IOrganization } from "@loomcore/common/models";
+import { type IUserContext } from "@loomcore/common/models";
 import type { IDatabase } from "../../databases/models/index.js";
-export declare function sendResetPasswordEmail(database: IDatabase, emailAddress: string, clientBaseUrl: string, organization?: IOrganization): Promise<void>;
+export declare function sendResetPasswordEmail(userContext: IUserContext, database: IDatabase, emailAddress: string, clientBaseUrl: string): Promise<void>;

package/dist/utils/auth/send-reset-password-email.util.js

@@ -1,17 +1,12 @@
-import { EmptyUserContext, } from "@loomcore/common/models";
 import { ServerError } from "../../errors/index.js";
 import { EmailService } from "../../services/email.service.js";
 import { PasswordResetTokenService } from "../../services/password-reset-token.service.js";
 import { getAuthConfig } from "./get-auth-config.util.js";
 import { getExpiresOnFromMinutes } from "./get-expires-on-from-minutes.util.js";
-export async function sendResetPasswordEmail(database, emailAddress, clientBaseUrl, organization) {
+export async function sendResetPasswordEmail(userContext, database, emailAddress, clientBaseUrl) {
     const authConfig = getAuthConfig();
     const passwordResetTokenService = new PasswordResetTokenService(database);
     const emailService = new EmailService();
-    const userContext = {
-        ...EmptyUserContext,
-        organization: organization ?? undefined,
-    };
     const expiresOn = getExpiresOnFromMinutes(authConfig.passwordResetTokenExpirationInMinutes);
     const passwordResetToken = await passwordResetTokenService.createPasswordResetToken(userContext, emailAddress, expiresOn);
     if (!passwordResetToken) {

package/dist/utils/create-public-spec.utils.d.ts

@@ -0,0 +1,2 @@
+import { IModelSpec } from "@loomcore/common/models";
+export declare function createPublicSpec(spec: IModelSpec): IModelSpec;

package/dist/utils/create-public-spec.utils.js

@@ -0,0 +1,13 @@
+import { entityUtils } from "@loomcore/common/utils";
+import { config } from "../config/index.js";
+export function createPublicSpec(spec) {
+    if (config.debug?.showAuditFields) {
+        return spec;
+    }
+    const publicSpec = entityUtils.getModelSpec(spec.fullSchema, {
+        isAuditable: spec.isAuditable,
+        isEntity: spec.isEntity,
+        addAuditableSchema: false,
+    });
+    return publicSpec;
+}

package/dist/utils/index.d.ts

@@ -2,7 +2,9 @@ export * from "./address.utils.js";
 export * from "./api.utils.js";
 export * from "./auth/index.js";
 export * from "./conversion.utils.js";
+export * from "./create-public-spec.utils.js";
 export * from "./express.utils.js";
 export * from "./jwt.utils.js";
+export * from "./logger.utils.js";
 export * from "./password.utils.js";
 export * from "./string.utils.js";

package/dist/utils/index.js

@@ -2,7 +2,9 @@ export * from "./address.utils.js";
 export * from "./api.utils.js";
 export * from "./auth/index.js";
 export * from "./conversion.utils.js";
+export * from "./create-public-spec.utils.js";
 export * from "./express.utils.js";
 export * from "./jwt.utils.js";
+export * from "./logger.utils.js";
 export * from "./password.utils.js";
 export * from "./string.utils.js";

package/dist/utils/logger.utils.d.ts

@@ -0,0 +1,8 @@
+import { LogLevel } from "../models/index.js";
+export declare const getCurrentLogLevel: () => LogLevel;
+export declare const logger: {
+    debug: (...args: unknown[]) => void;
+    info: (...args: unknown[]) => void;
+    warn: (...args: unknown[]) => void;
+    error: (...args: unknown[]) => void;
+};

package/dist/utils/logger.utils.js

@@ -0,0 +1,43 @@
+import { config } from "../config/index.js";
+const LOG_LEVEL_PRIORITIES = {
+    debug: 0,
+    info: 1,
+    warn: 2,
+    error: 3,
+};
+export const getCurrentLogLevel = () => {
+    const envLogLevel = config.debug?.logLevel?.toLowerCase();
+    if (envLogLevel === "debug" ||
+        envLogLevel === "info" ||
+        envLogLevel === "warn" ||
+        envLogLevel === "error") {
+        return envLogLevel;
+    }
+    return "info";
+};
+const shouldLog = (messageLevel) => {
+    const currentLevel = getCurrentLogLevel();
+    return (LOG_LEVEL_PRIORITIES[messageLevel] >= LOG_LEVEL_PRIORITIES[currentLevel]);
+};
+export const logger = {
+    debug: (...args) => {
+        if (shouldLog("debug")) {
+            console.debug(...args);
+        }
+    },
+    info: (...args) => {
+        if (shouldLog("info")) {
+            console.info(...args);
+        }
+    },
+    warn: (...args) => {
+        if (shouldLog("warn")) {
+            console.warn(...args);
+        }
+    },
+    error: (...args) => {
+        if (shouldLog("error")) {
+            console.error(...args);
+        }
+    },
+};

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.2.39",
+  "version": "0.2.41",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -59,7 +59,7 @@
     "reflect-metadata": "^0.2.2"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.81",
+    "@loomcore/common": "^0.0.84",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",