@loomcore/api 0.1.58 → 0.1.60

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

@@ -1,5 +1,5 @@
 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) => {
@@ -150,11 +150,20 @@ 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 (!isSystemUserContextInitialized()) {
+                    const errorMessage = isMultiTenant
+                        ? '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.'
+                        : 'BUG: SystemUserContext has not been initialized. For non-multi-tenant setups, SystemUserContext should be initialized before migrations run.';
+                    console.error('❌ Migration Error:', errorMessage);
+                    throw new Error(errorMessage);
+                }
                 const systemUserContext = getSystemUserContext();
                 const _id = randomUUID().toString();
                 await authService.createUser(systemUserContext, {

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

@@ -1,4 +1,4 @@
-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) => {
@@ -218,23 +218,16 @@ 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) {
-                        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 (!isSystemUserContextInitialized()) {
+                        const errorMessage = isMultiTenant
+                            ? '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.'
+                            : 'BUG: SystemUserContext has not been initialized. For non-multi-tenant setups, SystemUserContext should be initialized before migrations run.';
+                        console.error('❌ Migration Error:', errorMessage);
+                        throw new Error(errorMessage);
                     }
+                    const systemUserContext = getSystemUserContext();
                     const userData = {
                         email: config.auth?.adminUser?.email,
                         password: config.auth?.adminUser?.password,

package/dist/services/auth.service.js

@@ -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

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