@loomcore/api 0.1.26 → 0.1.27

package/dist/databases/postgres/migrations/006-create-admin-user.migration.d.ts

@@ -4,7 +4,7 @@ export declare class CreateAdminUserMigration implements IMigration {
     private readonly client;
     constructor(client: Client);
     index: number;
-    execute(adminEmail?: string, adminPassword?: string): Promise<{
+    execute(adminEmail?: string, adminPassword?: string, metaOrgId?: string): Promise<{
         success: boolean;
         adminUserId: string | undefined;
         error: Error | null;

package/dist/databases/postgres/migrations/006-create-admin-user.migration.js

@@ -8,7 +8,7 @@ export class CreateAdminUserMigration {
         this.client = client;
     }
     index = 6;
-    async execute(adminEmail, adminPassword) {
+    async execute(adminEmail, adminPassword, metaOrgId) {
         const _id = randomUUID().toString();
         const systemUserContext = getSystemUserContext();
         let createdUser;
@@ -17,7 +17,7 @@ export class CreateAdminUserMigration {
             const authService = new AuthService(database);
             createdUser = await authService.createUser(systemUserContext, {
                 _id: _id,
-                _orgId: systemUserContext._orgId,
+                _orgId: metaOrgId,
                 email: adminEmail,
                 password: adminPassword,
                 firstName: 'Admin',

package/dist/databases/postgres/migrations/setup-for-auth.migration.d.ts

@@ -1,5 +1,5 @@
 import { Client } from "pg";
-export declare function setupDatabaseForAuth(client: Client, adminUsername: string, adminPassword: string, metaOrgId?: string): Promise<{
+export declare function setupDatabaseForAuth(client: Client, adminEmail: string, adminPassword: string, metaOrgId?: string): Promise<{
     success: boolean;
     error: Error | null;
 }>;

package/dist/databases/postgres/migrations/setup-for-auth.migration.js

@@ -8,7 +8,7 @@ import { CreateRoleTableMigration } from "./007-create-roles-table.migration.js"
 import { CreateAuthorizationsTableMigration } from "./010-create-authorizations-table.migration.js";
 import { CreateFeaturesTableMigration } from "./009-create-features-table.migration.js";
 import { CreateAdminAuthorizationMigration } from "./011-create-admin-authorization.migration.js";
-export async function setupDatabaseForAuth(client, adminUsername, adminPassword, metaOrgId) {
+export async function setupDatabaseForAuth(client, adminEmail, adminPassword, metaOrgId) {
     let runMigrations = [];
     if (await doesTableExist(client, 'migrations')) {
         const migrations = await client.query(`
@@ -47,7 +47,11 @@ export async function setupDatabaseForAuth(client, adminUsername, adminPassword,
     }
     if (!runMigrations.includes(6)) {
         const migration = new CreateAdminUserMigration(client);
-        const result = await migration.execute(adminUsername, adminPassword);
+        const result = await migration.execute(adminEmail, adminPassword, metaOrgId);
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating admin user', result.error);
+            return { success: false, error: result.error };
+        }
         adminUserId = result.adminUserId;
     }
     if (!runMigrations.includes(7)) {
@@ -85,7 +89,7 @@ export async function setupDatabaseForAuth(client, adminUsername, adminPassword,
     if (!runMigrations.includes(11)) {
         if (!adminUserId) {
             console.error('setupDatabaseForAuth: Admin user ID is required');
-            return { success: true, error: null };
+            return { success: false, error: new Error('Admin user ID is required') };
         }
         const migration = new CreateAdminAuthorizationMigration(client, adminUserId, metaOrgId);
         const result = await migration.execute();

package/dist/databases/postgres/migrations/setup-for-multitenant.migration.js

@@ -2,9 +2,6 @@ import { CreateMigrationTableMigration } from "./001-create-migrations-table.mig
 import { CreateOrganizationsTableMigration } from "./002-create-organizations-table.migration.js";
 import { doesTableExist } from "../utils/does-table-exist.util.js";
 import { CreateMetaOrgMigration } from "./005-create-meta-org.migration.js";
-import { PostgresDatabase } from "../postgres.database.js";
-import { OrganizationService } from "../../../services/index.js";
-import { EmptyUserContext } from "@loomcore/common/models";
 export async function setupDatabaseForMultitenant(client, metaOrgName, metaOrgCode) {
     let runMigrations = [];
     let metaOrgId;
@@ -34,14 +31,6 @@ export async function setupDatabaseForMultitenant(client, metaOrgName, metaOrgCo
             return { success: false, metaOrgId: metaOrgId, error: result.error };
         }
     }
-    else {
-        const database = new PostgresDatabase(client);
-        const organizationService = new OrganizationService(database);
-        const metaOrg = await organizationService.getMetaOrg(EmptyUserContext);
-        if (metaOrg) {
-            metaOrgId = metaOrg._id;
-        }
-    }
     if (!runMigrations.includes(5)) {
         const createMetaOrgMigration = new CreateMetaOrgMigration(client, metaOrgName, metaOrgCode);
         const result = await createMetaOrgMigration.execute();
@@ -51,15 +40,5 @@ export async function setupDatabaseForMultitenant(client, metaOrgName, metaOrgCo
         }
         metaOrgId = result.metaOrgId;
     }
-    else {
-        if (!metaOrgId) {
-            const database = new PostgresDatabase(client);
-            const organizationService = new OrganizationService(database);
-            const metaOrg = await organizationService.getMetaOrg(EmptyUserContext);
-            if (metaOrg) {
-                metaOrgId = metaOrg._id;
-            }
-        }
-    }
     return { success: true, metaOrgId: metaOrgId, error: null };
 }

package/package.json

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