@loomcore/api 0.1.18 → 0.1.19

package/dist/__tests__/postgres.test-database.js

@@ -6,7 +6,7 @@ import { setupDatabaseForMultitenant } from '../databases/postgres/migrations/se
 import { setupDatabaseForAuth } from '../databases/postgres/migrations/setup-for-auth.migration.js';
 import { runTestMigrations } from './postgres-test-migrations/run-test-migrations.js';
 import { PostgresDatabase } from '../databases/postgres/postgres.database.js';
-import { testOrg } from './test-objects.js';
+import { getSystemUserContext } from '@loomcore/common/models';
 export class TestPostgresDatabase {
     database = null;
     postgresClient = null;
@@ -33,11 +33,13 @@ export class TestPostgresDatabase {
             if (!success) {
                 throw new Error('Failed to setup for multitenant');
             }
-            success = (await setupDatabaseForAuth(postgresClient, adminUsername || 'admin', adminPassword || 'password', testOrg._id)).success;
+            await initSystemUserContext(this.database);
+            success = (await setupDatabaseForAuth(postgresClient, adminUsername || 'admin', adminPassword || 'password')).success;
             if (!success) {
                 throw new Error('Failed to setup for auth');
             }
-            success = (await runTestMigrations(postgresClient, testOrg._id)).success;
+            const systemUserContext = getSystemUserContext();
+            success = (await runTestMigrations(postgresClient, systemUserContext._orgId)).success;
             if (!success) {
                 throw new Error('Failed to run test migrations');
             }
@@ -45,7 +47,6 @@ export class TestPostgresDatabase {
             await this.createIndexes(postgresClient);
             await testUtils.createMetaOrg();
         }
-        await initSystemUserContext(this.database);
         return this.database;
     }
     async createIndexes(client) {

package/dist/databases/postgres/migrations/001-create-migrations-table.migration.d.ts

@@ -4,14 +4,14 @@ export declare class CreateMigrationTableMigration implements IMigration {
     private readonly client;
     constructor(client: Client);
     index: number;
-    execute(_orgId?: string): Promise<{
+    execute(): Promise<{
         success: boolean;
         error: Error;
     } | {
         success: boolean;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error;
     } | {

package/dist/databases/postgres/migrations/001-create-migrations-table.migration.js

@@ -5,13 +5,12 @@ export class CreateMigrationTableMigration {
         this.client = client;
     }
     index = 1;
-    async execute(_orgId) {
+    async execute() {
         const _id = randomUUID().toString();
         try {
             await this.client.query(`
                 CREATE TABLE "migrations" (
                     "_id" VARCHAR(255) PRIMARY KEY,
-                    "_orgId" VARCHAR(255),
                     "index" INTEGER NOT NULL,
                     "hasRun" BOOLEAN NOT NULL,
                     "reverted" BOOLEAN NOT NULL
@@ -24,22 +23,12 @@ export class CreateMigrationTableMigration {
             }
         }
         try {
-            if (_orgId) {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);`);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
-            }
-            else {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
+            if (result.rowCount === 0) {
+                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
             }
         }
         catch (error) {
@@ -47,7 +36,7 @@ export class CreateMigrationTableMigration {
         }
         return { success: true, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         try {
             const result = await this.client.query(`
             DROP TABLE "migrations";

package/dist/databases/postgres/migrations/002-create-organizations-table.migration.d.ts

@@ -6,14 +6,14 @@ export declare class CreateOrganizationsTableMigration implements IMigration {
     private readonly orgCode;
     constructor(client: Client, orgName: string, orgCode: string);
     index: number;
-    execute(_orgId?: string): Promise<{
+    execute(): Promise<{
         success: boolean;
         error: Error;
     } | {
         success: boolean;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error;
     } | {

package/dist/databases/postgres/migrations/002-create-organizations-table.migration.js

@@ -9,7 +9,7 @@ export class CreateOrganizationsTableMigration {
         this.orgCode = orgCode;
     }
     index = 2;
-    async execute(_orgId) {
+    async execute() {
         const _id = randomUUID().toString();
         try {
             await this.client.query(`
@@ -40,8 +40,8 @@ export class CreateOrganizationsTableMigration {
         }
         try {
             const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -52,7 +52,7 @@ export class CreateOrganizationsTableMigration {
         }
         return { success: true, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         try {
             const result = await this.client.query(`
                 DROP TABLE "organizations";
@@ -62,21 +62,21 @@ export class CreateOrganizationsTableMigration {
             }
         }
         catch (error) {
-            return { success: false, error: new Error(`Error dropping organizations table for orgId ${_orgId}: ${error.message}`) };
+            return { success: false, error: new Error(`Error dropping organizations table: ${error.message}`) };
         }
         try {
             const result = await this.client.query(`
-                Update "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}' AND "_orgId" = '${_orgId}';
+                Update "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
                 return {
-                    success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: Migration record not found.
-                    Migration index: ${this.index}, _orgId: ${_orgId}`)
+                    success: false, error: new Error(`Error updating migration record for index ${this.index}: Migration record not found.
+                    Migration index: ${this.index}`)
                 };
             }
         }
         catch (error) {
-            return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: ${error.message}`) };
+            return { success: false, error: new Error(`Error updating migration record for index ${this.index}: ${error.message}`) };
         }
         return { success: true, error: null };
     }

package/dist/databases/postgres/migrations/003-create-users-table.migration.d.ts

@@ -11,7 +11,7 @@ export declare class CreateUsersTableMigration implements IMigration {
         success: boolean;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error;
     } | {

package/dist/databases/postgres/migrations/003-create-users-table.migration.js

@@ -37,37 +37,21 @@ export class CreateUsersTableMigration {
                 return { success: false, error: new Error(`Error creating users table: ${error.message}`) };
             }
         }
-        if (_orgId) {
-            try {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);
-                `);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
-            }
-            catch (error) {
-                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
+        try {
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            `);
+            if (result.rowCount === 0) {
+                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
             }
         }
-        else {
-            try {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', ${this.index}, TRUE, FALSE);
-                `);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
-            }
-            catch (error) {
-                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
-            }
+        catch (error) {
+            return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
         }
         return { success: true, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         try {
             const result = await this.client.query(`
                 DROP TABLE "users";
@@ -81,14 +65,14 @@ export class CreateUsersTableMigration {
         }
         try {
             const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}' AND "_orgId" = '${_orgId}';
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
-                return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: No row returned`) };
+                return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };
             }
         }
         catch (error) {
-            return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: ${error.message}`) };
+            return { success: false, error: new Error(`Error updating migration record for index ${this.index}: ${error.message}`) };
         }
         return { success: true, error: null };
     }

package/dist/databases/postgres/migrations/004-create-refresh-tokens-table.migration.d.ts

@@ -11,7 +11,7 @@ export declare class CreateRefreshTokenTableMigration implements IMigration {
         success: boolean;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error;
     } | {

package/dist/databases/postgres/migrations/004-create-refresh-tokens-table.migration.js

@@ -29,37 +29,21 @@ export class CreateRefreshTokenTableMigration {
                 return { success: false, error: new Error(`Error creating refresh token table: ${error.message}`) };
             }
         }
-        if (_orgId) {
-            try {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);
-                `);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
-            }
-            catch (error) {
-                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
+        try {
+            const result = await this.client.query(`
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
+            `);
+            if (result.rowCount === 0) {
+                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
             }
         }
-        else {
-            try {
-                const result = await this.client.query(`
-                    INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
-                    VALUES ('${_id}', ${this.index}, TRUE, FALSE);
-                `);
-                if (result.rowCount === 0) {
-                    return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
-                }
-            }
-            catch (error) {
-                return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
-            }
+        catch (error) {
+            return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: ${error.message}`) };
         }
         return { success: true, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         try {
             const result = await this.client.query(`
                 DROP TABLE "refreshTokens";
@@ -73,10 +57,10 @@ export class CreateRefreshTokenTableMigration {
         }
         try {
             const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}' AND "_orgId" = '${_orgId}';
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
-                return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: No row returned`) };
+                return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };
             }
         }
         catch (error) {

package/dist/databases/postgres/migrations/005-create-meta-org.migration.d.ts

@@ -6,7 +6,7 @@ export declare class CreateMetaOrgMigration implements IMigration {
     private readonly orgCode;
     constructor(client: Client, orgName: string, orgCode: string);
     index: number;
-    execute(_orgId?: string): Promise<{
+    execute(): Promise<{
         success: boolean;
         error: Error;
         metaOrgId?: undefined;
@@ -15,7 +15,7 @@ export declare class CreateMetaOrgMigration implements IMigration {
         metaOrgId: string;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error;
     } | {

package/dist/databases/postgres/migrations/005-create-meta-org.migration.js

@@ -9,7 +9,7 @@ export class CreateMetaOrgMigration {
         this.orgCode = orgCode;
     }
     index = 5;
-    async execute(_orgId) {
+    async execute() {
         const _id = randomUUID().toString();
         try {
             const result = await this.client.query(`
@@ -24,8 +24,8 @@ export class CreateMetaOrgMigration {
         }
         try {
             const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -36,9 +36,9 @@ export class CreateMetaOrgMigration {
         }
         return { success: true, metaOrgId: _id, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         try {
-            const result = await this.client.query(`DELETE FROM "organizations" WHERE "_id" = ${_orgId} AND "isMetaOrg" = TRUE;`);
+            const result = await this.client.query(`DELETE FROM "organizations" WHERE "isMetaOrg" = TRUE;`);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error reverting meta org: No row returned`) };
             }
@@ -48,14 +48,14 @@ export class CreateMetaOrgMigration {
         }
         try {
             const result = await this.client.query(`
-                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}' AND "_orgId" = '${_orgId}';
+                UPDATE "migrations" SET "reverted" = TRUE WHERE "index" = '${this.index}';
             `);
             if (result.rowCount === 0) {
-                return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: No row returned`) };
+                return { success: false, error: new Error(`Error updating migration record for index ${this.index}: No row returned`) };
             }
         }
         catch (error) {
-            return { success: false, error: new Error(`Error updating migration record for index ${this.index} and orgId ${_orgId}: ${error.message}`) };
+            return { success: false, error: new Error(`Error updating migration record for index ${this.index}: ${error.message}`) };
         }
         return { success: true, error: null };
     }

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

@@ -13,7 +13,7 @@ export declare class CreateAdminUserMigration implements IMigration {
         success: boolean;
         error: null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error | null;
     }>;

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

@@ -1,6 +1,6 @@
 import { PostgresDatabase } from "../index.js";
 import { randomUUID } from "crypto";
-import { getSystemUserContext, initializeSystemUserContext } from "@loomcore/common/models";
+import { getSystemUserContext } from "@loomcore/common/models";
 import { AuthService } from "../../../services/auth.service.js";
 export class CreateAdminUserMigration {
     client;
@@ -17,9 +17,7 @@ export class CreateAdminUserMigration {
         try {
             const database = new PostgresDatabase(this.client);
             const authService = new AuthService(database);
-            initializeSystemUserContext(this.adminEmail, _orgId);
-            const systemUserContext = getSystemUserContext();
-            const adminUser = await authService.createUser(systemUserContext, {
+            const adminUser = await authService.createUser(getSystemUserContext(), {
                 _id: _id,
                 _orgId: _orgId,
                 email: this.adminEmail,
@@ -35,8 +33,8 @@ export class CreateAdminUserMigration {
         }
         try {
             const result = await this.client.query(`
-                INSERT INTO "migrations" ("_id", "_orgId", "index", "hasRun", "reverted")
-                VALUES ('${_id}', '${_orgId}', ${this.index}, TRUE, FALSE);
+                INSERT INTO "migrations" ("_id", "index", "hasRun", "reverted")
+                VALUES ('${_id}', ${this.index}, TRUE, FALSE);
             `);
             if (result.rowCount === 0) {
                 return { success: false, error: new Error(`Error inserting migration ${this.index} to migrations table: No row returned`) };
@@ -47,7 +45,7 @@ export class CreateAdminUserMigration {
         }
         return { success: true, error: null };
     }
-    async revert(_orgId) {
+    async revert() {
         throw new Error('Not implemented');
     }
 }

package/dist/databases/postgres/migrations/migration.interface.d.ts

@@ -1,10 +1,10 @@
 export interface IMigration {
     index: number;
-    execute(_orgId?: string): Promise<{
+    execute(): Promise<{
         success: boolean;
         error: Error | null;
     }>;
-    revert(_orgId?: string): Promise<{
+    revert(): Promise<{
         success: boolean;
         error: Error | null;
     }>;

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, _orgId?: string): Promise<{
+export declare function setupDatabaseForAuth(client: Client, adminUsername: string, adminPassword: string): Promise<{
     success: boolean;
     error: Error | null;
 }>;

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

@@ -3,14 +3,14 @@ import { CreateMigrationTableMigration } from "./001-create-migrations-table.mig
 import { CreateUsersTableMigration } from "./003-create-users-table.migration.js";
 import { doesTableExist } from "../utils/does-table-exist.util.js";
 import { CreateAdminUserMigration } from "./006-create-admin-user.migration.js";
-export async function setupDatabaseForAuth(client, adminUsername, adminPassword, _orgId) {
+export async function setupDatabaseForAuth(client, adminUsername, adminPassword) {
     let runMigrations = [];
     if (await doesTableExist(client, 'migrations')) {
         const migrations = await client.query(`
             SELECT "_id", "index"
             FROM migrations
-            WHERE "hasRun" = TRUE AND "reverted" = FALSE AND "_orgId" = $1
-        `, [_orgId]);
+            WHERE "hasRun" = TRUE AND "reverted" = FALSE
+        `);
         runMigrations = migrations.rows.map((row) => {
             return row.index;
         });
@@ -25,7 +25,7 @@ export async function setupDatabaseForAuth(client, adminUsername, adminPassword,
     if (!runMigrations.includes(6))
         migrationsToRun.push(new CreateAdminUserMigration(client, adminUsername, adminPassword));
     for (const migration of migrationsToRun) {
-        await migration.execute(_orgId);
+        await migration.execute();
     }
     return { success: true, error: null };
 }

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

@@ -21,12 +21,20 @@ export async function setupDatabaseForMultitenant(client, orgName, orgCode) {
     }
     if (!runMigrations.includes(1)) {
         const createMigrationTableMigration = new CreateMigrationTableMigration(client);
-        const result = await createMigrationTableMigration.execute(metaOrgId);
+        const result = await createMigrationTableMigration.execute();
         if (!result.success) {
             console.log('setupDatabaseForMultitenant: error creating migration table', result.error);
             return { success: false, metaOrgId: metaOrgId, error: result.error };
         }
     }
+    if (!runMigrations.includes(2)) {
+        const createOrganizationTableMigration = new CreateOrganizationsTableMigration(client, orgName, orgCode);
+        const result = await createOrganizationTableMigration.execute();
+        if (!result.success) {
+            console.log('setupDatabaseForMultitenant: error creating organizations table', result.error);
+            return { success: false, metaOrgId: metaOrgId, error: result.error };
+        }
+    }
     else {
         const database = new PostgresDatabase(client);
         const organizationService = new OrganizationService(database);
@@ -35,17 +43,9 @@ export async function setupDatabaseForMultitenant(client, orgName, orgCode) {
             metaOrgId = metaOrg._id;
         }
     }
-    if (!runMigrations.includes(2)) {
-        const createOrganizationTableMigration = new CreateOrganizationsTableMigration(client, orgName, orgCode);
-        const result = await createOrganizationTableMigration.execute(metaOrgId);
-        if (!result.success) {
-            console.log('setupDatabaseForMultitenant: error creating organizations table', result.error);
-            return { success: false, metaOrgId: metaOrgId, error: result.error };
-        }
-    }
     if (!runMigrations.includes(5)) {
         const createMetaOrgMigration = new CreateMetaOrgMigration(client, orgName, orgCode);
-        const result = await createMetaOrgMigration.execute(metaOrgId);
+        const result = await createMetaOrgMigration.execute();
         if (!result.success || !result.metaOrgId) {
             console.log('setupDatabaseForMultitenant: error creating meta org', result.error);
             return { success: false, metaOrgId: metaOrgId, error: result.error };

package/package.json

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