@loomcore/api 0.1.86 → 0.1.88

package/dist/__tests__/common-test.utils.js

@@ -200,10 +200,6 @@ export function setupTestConfig(isMultiTenant = true, dbType) {
             dbType: dbType,
         },
         auth: {
-            adminUser: {
-                email: 'admin@test.com',
-                password: 'admin-password'
-            },
             clientSecret: 'test-secret',
             saltWorkFactor: 10,
             jwtExpirationInSeconds: 3600,

package/dist/__tests__/postgres.test-database.d.ts

@@ -5,7 +5,7 @@ export declare class TestPostgresDatabase implements ITestDatabase {
     private postgresClient;
     private postgresPool;
     private initPromise;
-    init(adminUsername?: string, adminPassword?: string): Promise<IDatabase>;
+    init(): Promise<IDatabase>;
     getRandomId(): string;
     private _performInit;
     private createIndexes;

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

@@ -10,17 +10,17 @@ export class TestPostgresDatabase {
     postgresClient = null;
     postgresPool = null;
     initPromise = null;
-    async init(adminUsername, adminPassword) {
+    async init() {
         if (this.initPromise) {
             return this.initPromise;
         }
-        this.initPromise = this._performInit(adminUsername, adminPassword);
+        this.initPromise = this._performInit();
         return this.initPromise;
     }
     getRandomId() {
         throw new Error('getRandomId() should not be used for PostgreSQL _id fields. PostgreSQL uses auto-generated integer IDs. Remove _id from entities and let the database generate it.');
     }
-    async _performInit(adminUsername, adminPassword) {
+    async _performInit() {
         if (!this.database) {
             let postgresClient;
             let pool;

package/dist/__tests__/test-database.interface.d.ts

@@ -1,6 +1,6 @@
 import { IDatabase } from "../databases/models/index.js";
 export type ITestDatabase = {
-    init(adminUsername?: string, adminPassword?: string): Promise<IDatabase>;
+    init(): Promise<IDatabase>;
     getRandomId(): string;
     clearCollections(): Promise<void>;
     cleanup(): Promise<void>;

package/dist/__tests__/test-express-app.js

@@ -36,7 +36,7 @@ export class TestExpressApp {
             else {
                 const testPostgresDb = new TestPostgresDatabase();
                 this.testDatabase = testPostgresDb;
-                this.database = await testPostgresDb.init('admin', 'password');
+                this.database = await testPostgresDb.init();
             }
         }
         if (!this.app) {

package/dist/databases/migrations/migration-runner.d.ts

@@ -1,12 +1,14 @@
 import { IBaseApiConfig } from '../../models/base-api-config.interface.js';
+import { IResetApiConfig } from '../../models/reset-api-config.interface.js';
 export declare class MigrationRunner {
     private config;
+    private resetConfig?;
     private dbType;
     private dbUrl;
     private migrationsDir;
     private primaryTimezone;
     private dbConnection;
-    constructor(config: IBaseApiConfig);
+    constructor(config: IBaseApiConfig, resetConfig?: IResetApiConfig);
     private getTimestamp;
     private parseSql;
     private getMigrator;

package/dist/databases/migrations/migration-runner.js

@@ -10,14 +10,16 @@ import { getPostgresInitialSchema } from '../postgres/migrations/postgres-initia
 import { getMongoInitialSchema } from '../mongo-db/migrations/mongo-initial-schema.js';
 export class MigrationRunner {
     config;
+    resetConfig;
     dbType;
     dbUrl;
     migrationsDir;
     primaryTimezone;
     dbConnection;
-    constructor(config) {
+    constructor(config, resetConfig) {
         setBaseApiConfig(config);
         this.config = config;
+        this.resetConfig = resetConfig;
         this.dbType = config.app.dbType;
         this.dbUrl = this.dbType === 'postgres' ? buildPostgresUrl(config) : buildMongoUrl(config);
         this.migrationsDir = path.join(process.cwd(), 'database', 'migrations');
@@ -186,6 +188,9 @@ export class MigrationRunner {
     async run(command = 'up', target) {
         try {
             if (command === 'reset') {
+                if (!this.resetConfig) {
+                    throw new Error('Reset configuration not found');
+                }
                 await this.wipeDatabase();
                 console.log('🚀 Restarting migrations...');
                 const migrator = await this.getMigrator();

package/dist/databases/mongo-db/migrations/mongo-initial-schema.d.ts

@@ -1,5 +1,6 @@
 import { Db } from 'mongodb';
 import { IBaseApiConfig } from '../../../models/base-api-config.interface.js';
+import { IResetApiConfig } from '../../../models/reset-api-config.interface.js';
 export interface ISyntheticMigration {
     name: string;
     up: (context: {
@@ -9,4 +10,4 @@ export interface ISyntheticMigration {
         context: Db;
     }) => Promise<void>;
 }
-export declare const getMongoInitialSchema: (config: IBaseApiConfig) => ISyntheticMigration[];
+export declare const getMongoInitialSchema: (config: IBaseApiConfig, resetConfig?: IResetApiConfig) => ISyntheticMigration[];

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

@@ -2,7 +2,7 @@ import { randomUUID } from 'crypto';
 import { initializeSystemUserContext, EmptyUserContext, getSystemUserContext, isSystemUserContextInitialized, personModelSpec } from '@loomcore/common/models';
 import { MongoDBDatabase } from '../mongo-db.database.js';
 import { AuthService, GenericApiService, OrganizationService } from '../../../services/index.js';
-export const getMongoInitialSchema = (config) => {
+export const getMongoInitialSchema = (config, resetConfig) => {
     const migrations = [];
     const isMultiTenant = config.app.isMultiTenant;
     if (isMultiTenant && !config.multiTenant) {
@@ -161,7 +161,7 @@ export const getMongoInitialSchema = (config) => {
             }
         });
     }
-    if (isAuthEnabled) {
+    if (isAuthEnabled && resetConfig) {
         migrations.push({
             name: '00000000000009_data-admin-user',
             up: async ({ context: db }) => {
@@ -198,19 +198,19 @@ export const getMongoInitialSchema = (config) => {
                     _id: _id,
                     _orgId: systemUserContext.organization?._id,
                     externalId: 'admin-user-external-id',
-                    email: config.auth?.adminUser?.email,
-                    password: config.auth?.adminUser?.password,
+                    email: resetConfig.adminUser.email,
+                    password: resetConfig.adminUser.password,
                     displayName: 'Admin User',
                 }, person);
             },
             down: async ({ context: db }) => {
-                if (!config.auth?.adminUser?.email)
+                if (!resetConfig?.adminUser?.email)
                     return;
-                await db.collection('users').deleteOne({ email: config.auth?.adminUser?.email });
+                await db.collection('users').deleteOne({ email: resetConfig.adminUser.email });
             }
         });
     }
-    if (config.auth?.adminUser?.email && isMultiTenant) {
+    if (resetConfig?.adminUser?.email && isMultiTenant) {
         migrations.push({
             name: '00000000000010_data-admin-authorizations',
             up: async ({ context: db }) => {
@@ -221,7 +221,7 @@ export const getMongoInitialSchema = (config) => {
                 if (!metaOrg) {
                     throw new Error('Meta organization not found. Ensure meta-org migration ran successfully.');
                 }
-                const adminUser = await authService.getUserByEmail(config.auth.adminUser.email);
+                const adminUser = await authService.getUserByEmail(resetConfig.adminUser.email);
                 if (!adminUser) {
                     throw new Error('Admin user not found. Ensure admin-user migration ran successfully.');
                 }

package/dist/databases/postgres/commands/postgres-partial-update-by-id.command.js

@@ -3,10 +3,7 @@ import { buildJoinClauses } from '../utils/build-join-clauses.js';
 import { columnsAndValuesFromEntity } from '../utils/columns-and-values-from-entity.js';
 export async function partialUpdateById(client, operations, id, entity, pluralResourceName) {
     try {
-        console.log('entity', JSON.stringify(entity, null, 2));
         const { columns, values } = columnsAndValuesFromEntity(entity);
-        console.log('columns', JSON.stringify(columns, null, 2));
-        console.log('values', JSON.stringify(values, null, 2));
         const updateColumns = columns.filter(col => col !== '"_id"');
         const updateValues = values.filter((_, index) => columns[index] !== '"_id"');
         if (updateColumns.length === 0) {

package/dist/databases/postgres/migrations/__tests__/test-migration-helper.js

@@ -2,7 +2,7 @@ import { Umzug } from 'umzug';
 import { getPostgresInitialSchema } from '../postgres-initial-schema.js';
 import { getPostgresTestSchema } from '../../../../__tests__/postgres-test-migrations/postgres-test-schema.js';
 export async function runInitialSchemaMigrations(pool, config) {
-    const initialSchema = getPostgresInitialSchema(config);
+    const initialSchema = getPostgresInitialSchema(config, { adminUser: { email: 'admin@test.com', password: 'admin-password' } });
     const umzug = new Umzug({
         migrations: async () => {
             return initialSchema.map(m => ({

package/dist/databases/postgres/migrations/postgres-initial-schema.d.ts

@@ -1,5 +1,6 @@
 import { Pool } from 'pg';
 import { IBaseApiConfig } from '../../../models/base-api-config.interface.js';
+import { IResetApiConfig } from '../../../models/reset-api-config.interface.js';
 export interface SyntheticMigration {
     name: string;
     up: (context: {
@@ -9,4 +10,4 @@ export interface SyntheticMigration {
         context: Pool;
     }) => Promise<void>;
 }
-export declare const getPostgresInitialSchema: (config: IBaseApiConfig) => SyntheticMigration[];
+export declare const getPostgresInitialSchema: (config: IBaseApiConfig, resetConfig?: IResetApiConfig) => SyntheticMigration[];

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

@@ -1,7 +1,7 @@
 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) => {
+export const getPostgresInitialSchema = (config, resetConfig) => {
     const migrations = [];
     const isMultiTenant = config.app.isMultiTenant;
     if (isMultiTenant && !config.multiTenant) {
@@ -285,7 +285,7 @@ export const getPostgresInitialSchema = (config) => {
             }
         });
     }
-    if (isAuthEnabled) {
+    if (isAuthEnabled && resetConfig?.adminUser) {
         migrations.push({
             name: '00000000000011_data-admin-user',
             up: async ({ context: pool }) => {
@@ -304,8 +304,8 @@ export const getPostgresInitialSchema = (config) => {
                     }
                     const systemUserContext = getSystemUserContext();
                     const userData = {
-                        email: config.auth?.adminUser?.email,
-                        password: config.auth?.adminUser?.password,
+                        email: resetConfig.adminUser.email,
+                        password: resetConfig.adminUser.password,
                         displayName: 'Admin User',
                     };
                     if (isMultiTenant && systemUserContext.organization?._id) {
@@ -325,13 +325,13 @@ export const getPostgresInitialSchema = (config) => {
                 }
             },
             down: async ({ context: pool }) => {
-                if (!config.auth?.adminUser?.email)
+                if (!resetConfig?.adminUser?.email)
                     return;
-                const result = await pool.query(`DELETE FROM "users" WHERE "email" = $1`, [config.auth?.adminUser?.email]);
+                const result = await pool.query(`DELETE FROM "users" WHERE "email" = $1`, [resetConfig.adminUser.email]);
             }
         });
     }
-    if (config.auth) {
+    if (config.auth && resetConfig) {
         migrations.push({
             name: '00000000000012_data-admin-authorizations',
             up: async ({ context: pool }) => {
@@ -344,7 +344,7 @@ export const getPostgresInitialSchema = (config) => {
                     if (isMultiTenant && !metaOrg) {
                         throw new Error('Meta organization not found. Ensure meta-org migration ran successfully.');
                     }
-                    const adminUser = await authService.getUserByEmail(config.auth.adminUser.email);
+                    const adminUser = await authService.getUserByEmail(resetConfig.adminUser.email);
                     if (!adminUser) {
                         throw new Error('Admin user not found. Ensure admin-user migration ran successfully.');
                     }

package/dist/models/auth-config.interface.d.ts

@@ -1,8 +1,4 @@
 export interface IAuthConfig {
-    adminUser: {
-        email: string;
-        password: string;
-    };
     clientSecret: string;
     saltWorkFactor: number;
     deviceIdCookieMaxAgeInDays: number;

package/dist/models/index.d.ts

@@ -1,3 +1,4 @@
 export * from './base-api-config.interface.js';
+export * from './reset-api-config.interface.js';
 export * from './refresh-token.model.js';
 export * from './email-client.interface.js';

package/dist/models/index.js

@@ -1,3 +1,4 @@
 export * from './base-api-config.interface.js';
+export * from './reset-api-config.interface.js';
 export * from './refresh-token.model.js';
 export * from './email-client.interface.js';

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

@@ -0,0 +1,6 @@
+export interface IResetApiConfig {
+    adminUser: {
+        email: string;
+        password: string;
+    };
+}

package/dist/models/reset-api-config.interface.js

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@loomcore/api",
-  "version": "0.1.86",
+  "version": "0.1.88",
   "private": false,
   "description": "Loom Core Api - An opinionated Node.js api using Typescript, Express, and MongoDb or PostgreSQL",
   "scripts": {
@@ -57,7 +57,7 @@
     "qs": "^6.14.1"
   },
   "peerDependencies": {
-    "@loomcore/common": "^0.0.49",
+    "@loomcore/common": "^0.0.50",
     "@sinclair/typebox": "0.34.33",
     "cookie-parser": "^1.4.6",
     "cors": "^2.8.5",