npm - @loomcore/api - Versions diffs - 0.1.58 → 0.1.59 - Mend

@loomcore/api 0.1.58 → 0.1.59

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (4) hide show

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

@@ -1,10 +1,18 @@
 import { randomUUID } from 'crypto';
-import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext } from '@loomcore/common/models';
+import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext, isSystemUserContextInitialized } from '@loomcore/common/models';
 import { MongoDBDatabase } from '../mongo-db.database.js';
 import { AuthService, OrganizationService } from '../../../services/index.js';
 export const getMongoInitialSchema = (config) => {
     const migrations = [];
     const isMultiTenant = config.app.isMultiTenant === true;
+    console.log('📋 Migration Config Diagnostic:');
+    console.log('  isMultiTenant:', isMultiTenant);
+    console.log('  config.app.metaOrgName:', config.app.metaOrgName ?? '(undefined)');
+    console.log('  config.app.metaOrgCode:', config.app.metaOrgCode ?? '(undefined)');
+    console.log('  config.auth?.adminUser?.email:', config.auth?.adminUser?.email ?? '(undefined)');
+    console.log('  config.auth?.adminUser?.password:', config.auth?.adminUser?.password ? '(set)' : '(undefined)');
+    console.log('  Will add meta-org migration:', isMultiTenant && !!config.app.metaOrgName && !!config.app.metaOrgCode);
+    console.log('  Will add admin-user migration:', !!config.auth?.adminUser?.email && !!config.auth?.adminUser?.password);
     if (isMultiTenant) {
         migrations.push({
             name: '00000000000001_schema-organizations',
@@ -150,11 +158,19 @@ export const getMongoInitialSchema = (config) => {
         migrations.push({
             name: '00000000000009_data-admin-user',
             up: async ({ context: db }) => {
-                if (config.auth?.adminUser?.email || !config.auth?.adminUser?.password) {
+                if (!config.auth?.adminUser?.email || !config.auth?.adminUser?.password) {
                     throw new Error('Admin user email and password must be provided in config');
                 }
                 const database = new MongoDBDatabase(db);
                 const authService = new AuthService(database);
+                if (isMultiTenant && !isSystemUserContextInitialized()) {
+                    throw new Error('SystemUserContext has not been initialized. The meta-org migration (00000000000008_data-meta-org) should have run before this migration. ' +
+                        'This migration only runs if config.app.metaOrgName and config.app.metaOrgCode are provided. ' +
+                        'Please ensure both values are set in your config.');
+                }
+                if (!isMultiTenant && !isSystemUserContextInitialized()) {
+                    initializeSystemUserContext(config.email?.systemEmailAddress || 'system@example.com', undefined);
+                }
                 const systemUserContext = getSystemUserContext();
                 const _id = randomUUID().toString();
                 await authService.createUser(systemUserContext, {

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

@@ -1,9 +1,17 @@
-import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext } from '@loomcore/common/models';
+import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext, isSystemUserContextInitialized } from '@loomcore/common/models';
 import { PostgresDatabase } from '../postgres.database.js';
 import { AuthService, OrganizationService } from '../../../services/index.js';
 export const getPostgresInitialSchema = (config) => {
     const migrations = [];
     const isMultiTenant = config.app.isMultiTenant === true;
+    console.log('📋 Migration Config Diagnostic:');
+    console.log('  isMultiTenant:', isMultiTenant);
+    console.log('  config.app.metaOrgName:', config.app.metaOrgName ?? '(undefined)');
+    console.log('  config.app.metaOrgCode:', config.app.metaOrgCode ?? '(undefined)');
+    console.log('  config.auth?.adminUser?.email:', config.auth?.adminUser?.email ?? '(undefined)');
+    console.log('  config.auth?.adminUser?.password:', config.auth?.adminUser?.password ? '(set)' : '(undefined)');
+    console.log('  Will add meta-org migration:', isMultiTenant && !!config.app.metaOrgName && !!config.app.metaOrgCode);
+    console.log('  Will add admin-user migration:', !!config.auth?.adminUser?.email && !!config.auth?.adminUser?.password);
     if (isMultiTenant) {
         migrations.push({
             name: '00000000000001_schema-organizations',
@@ -218,23 +226,15 @@ export const getPostgresInitialSchema = (config) => {
                 try {
                     const database = new PostgresDatabase(client);
                     const authService = new AuthService(database);
-                    let systemUserContext = getSystemUserContext();
-                    if (!systemUserContext) {
-                        throw new Error('SystemUserContext has not been initialized. For non-multi-tenant setups, initialize it before running migrations.');
+                    if (isMultiTenant && !isSystemUserContextInitialized()) {
+                        throw new Error('SystemUserContext has not been initialized. The meta-org migration (00000000000008_data-meta-org) should have run before this migration. ' +
+                            'This migration only runs if config.app.metaOrgName and config.app.metaOrgCode are provided. ' +
+                            'Please ensure both values are set in your config.');
                     }
-                    if (isMultiTenant) {
-                        if (!systemUserContext.organization?._id) {
-                            const organizationService = new OrganizationService(database);
-                            const metaOrg = await organizationService.getMetaOrg(EmptyUserContext);
-                            if (metaOrg) {
-                                initializeSystemUserContext(config.email?.systemEmailAddress || 'system@example.com', metaOrg);
-                                systemUserContext = getSystemUserContext();
-                            }
-                            if (!systemUserContext?.organization?._id) {
-                                throw new Error('Cannot create admin user: Multi-tenant mode is enabled but meta-org does not exist. Ensure metaOrgName and metaOrgCode are provided in config so the meta-org migration runs before the admin-user migration.');
-                            }
-                        }
+                    if (!isMultiTenant && !isSystemUserContextInitialized()) {
+                        initializeSystemUserContext(config.email?.systemEmailAddress || 'system@example.com', undefined);
                     }
+                    const systemUserContext = getSystemUserContext();
                     const userData = {
                         email: config.auth?.adminUser?.email,
                         password: config.auth?.adminUser?.password,

package/dist/services/auth.service.js CHANGED Viewed

@@ -174,7 +174,7 @@ export class AuthService extends MultiTenantApiService {
         }
         const httpOrHttps = config.env === 'local' ? 'http' : 'https';
         const urlEncodedEmail = encodeURIComponent(emailAddress);
-        const resetPasswordLink = `${httpOrHttps}://${config.network.hostName}/reset-password/${passwordResetToken.token}/${urlEncodedEmail}`;
+        const resetPasswordLink = `${httpOrHttps}://${config.app.name}/reset-password/${passwordResetToken.token}/${urlEncodedEmail}`;
         const htmlEmailBody = `<strong><a href="${resetPasswordLink}">Reset Password</a></strong>`;
         await this.emailService.sendHtmlEmail(emailAddress, `Reset Password for ${config.app.name}`, htmlEmailBody);
     }

package/package.json CHANGED Viewed

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