@loomcore/api 0.1.25 → 0.1.26

package/dist/databases/postgres/migrations/008-create-user-roles-table.migration.js

@@ -18,7 +18,13 @@ export class CreateUserRolesTableMigration {
                         "_orgId" VARCHAR(255),
                         "_userId" VARCHAR(255) NOT NULL,
                         "_roleId" VARCHAR(255) NOT NULL,
-                        CONSTRAINT "fk_user_roles_organization" FOREIGN KEY ("_orgId") REFERENCES "organizations"("_id") ON DELETE CASCADE
+                        "_created" TIMESTAMP NOT NULL,
+                        "_createdBy" VARCHAR(255) NOT NULL,
+                        "_updated" TIMESTAMP NOT NULL,
+                        "_updatedBy" VARCHAR(255) NOT NULL,
+                        "_deleted" TIMESTAMP,
+                        "_deletedBy" VARCHAR(255),
+                        CONSTRAINT "fk_user_roles_organization" FOREIGN KEY ("_orgId") REFERENCES "organizations"("_id") ON DELETE CASCADE,
                         CONSTRAINT "fk_user_roles_user" FOREIGN KEY ("_userId") REFERENCES "users"("_id") ON DELETE CASCADE,
                         CONSTRAINT "fk_user_roles_role" FOREIGN KEY ("_roleId") REFERENCES "roles"("_id") ON DELETE CASCADE,
                         CONSTRAINT "uk_user_roles" UNIQUE ("_orgId", "_userId", "_roleId")

package/dist/databases/postgres/migrations/011-create-admin-authorization.migration.js

@@ -18,16 +18,16 @@ export class CreateAdminAuthorizationMigration {
                 INSERT INTO "roles" ("_id", "_orgId", "name")
                 VALUES ($1, $2, 'admin')
             `, [roleId, this.metaOrgId]);
-            if (roleResult.rows.length === 0) {
+            if (roleResult.rowCount === 0) {
                 await this.client.query('ROLLBACK');
                 return { success: false, error: new Error('Failed to create admin role') };
             }
             const userRoleId = randomUUID().toString();
             const userRoleResult = await this.client.query(`
-                INSERT INTO "user_roles" ("_id", "_orgId", "_userId", "_roleId")
-                VALUES ($1, $2, $3, $4)
+                INSERT INTO "user_roles" ("_id", "_orgId", "_userId", "_roleId", "_created", "_createdBy", "_updated", "_updatedBy")
+                VALUES ($1, $2, $3, $4, NOW(), 'system', NOW(), 'system')
             `, [userRoleId, this.metaOrgId, this.adminUserId, roleId]);
-            if (userRoleResult.rows.length === 0) {
+            if (userRoleResult.rowCount === 0) {
                 await this.client.query('ROLLBACK');
                 return { success: false, error: new Error('Failed to create user role') };
             }
@@ -36,7 +36,7 @@ export class CreateAdminAuthorizationMigration {
                 INSERT INTO "features" ("_id", "_orgId", "name")
                 VALUES ($1, $2, 'admin')
             `, [featureId, this.metaOrgId]);
-            if (featureResult.rows.length === 0) {
+            if (featureResult.rowCount === 0) {
                 await this.client.query('ROLLBACK');
                 return { success: false, error: new Error('Failed to create admin feature') };
             }
@@ -48,7 +48,7 @@ export class CreateAdminAuthorizationMigration {
                 )
                 VALUES ($1, $2, $3, $4, NOW(), 'system', NOW(), 'system')
             `, [authorizationId, this.metaOrgId, roleId, featureId]);
-            if (authorizationResult.rows.length === 0) {
+            if (authorizationResult.rowCount === 0) {
                 await this.client.query('ROLLBACK');
                 return { success: false, error: new Error('Failed to create admin authorization') };
             }

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

@@ -23,15 +23,27 @@ export async function setupDatabaseForAuth(client, adminUsername, adminPassword,
     let adminUserId;
     if (!runMigrations.includes(1)) {
         const migration = new CreateMigrationTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating migrations table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(3)) {
         const migration = new CreateUsersTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating users table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(4)) {
         const migration = new CreateRefreshTokenTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating refresh_tokens table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(6)) {
         const migration = new CreateAdminUserMigration(client);
@@ -40,26 +52,47 @@ export async function setupDatabaseForAuth(client, adminUsername, adminPassword,
     }
     if (!runMigrations.includes(7)) {
         const migration = new CreateRoleTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating roles table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(8)) {
         const migration = new CreateUserRolesTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating user_roles table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(9)) {
         const migration = new CreateFeaturesTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating features table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(10)) {
         const migration = new CreateAuthorizationsTableMigration(client);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating authorizations table', result.error);
+            return { success: false, error: result.error };
+        }
     }
     if (!runMigrations.includes(11)) {
         if (!adminUserId) {
-            return { success: false, error: new Error('Admin user ID is required') };
+            console.error('setupDatabaseForAuth: Admin user ID is required');
+            return { success: true, error: null };
         }
         const migration = new CreateAdminAuthorizationMigration(client, adminUserId, metaOrgId);
-        await migration.execute();
+        const result = await migration.execute();
+        if (!result.success) {
+            console.error('setupDatabaseForAuth: error creating admin authorization', result.error);
+            return { success: false, error: result.error };
+        }
     }
     return { success: true, error: null };
 }

package/dist/databases/postgres/postgres.database.js

@@ -90,9 +90,7 @@ export class PostgresDatabase {
             INNER JOIN "features" f ON a."_featureId" = f."_id"
             WHERE ur."_userId" IN (${placeholders})
                 AND ur."_deleted" IS NULL
-                AND r."_deleted" IS NULL
                 AND a."_deleted" IS NULL
-                AND f."_deleted" IS NULL
                 AND (a."startDate" IS NULL OR a."startDate" <= $${userIds.length + 1})
                 AND (a."endDate" IS NULL OR a."endDate" >= $${userIds.length + 1})
         `;

package/dist/models/user-role.model.d.ts

@@ -1,6 +1,6 @@
-import { IEntity } from "@loomcore/common/models";
+import { IAuditable, IEntity } from "@loomcore/common/models";
 import { TSchema } from "@sinclair/typebox";
-export interface IUserRole extends IEntity {
+export interface IUserRole extends IEntity, IAuditable {
     userId: string;
     roleId: string;
 }

package/dist/models/user-role.model.js

@@ -4,4 +4,4 @@ export const UserRoleSchema = Type.Object({
     userId: Type.String({ minLength: 1 }),
     roleId: Type.String({ minLength: 1 }),
 });
-export const UserRoleModelSpec = entityUtils.getModelSpec(UserRoleSchema);
+export const UserRoleModelSpec = entityUtils.getModelSpec(UserRoleSchema, { isAuditable: true });

package/package.json

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