@solidxai/core 0.1.9-beta.0 → 0.1.9-beta.10

package/src/seeders/module-metadata-seeder.service.ts

@@ -31,7 +31,13 @@ import { ViewMetadataService } from '../services/view-metadata.service';
 import solidCoreMetadata from './seed-data/solid-core-metadata.json';
 import { SystemFieldsSeederService } from './system-fields-seeder.service';
 // import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
-import { ActionMetadata, DEFAULT_SA_PASSWORD, MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL, MenuItemMetadata, ModuleMetadata, RoleMetadata, SignUpDto } from 'src';
+import { ActionMetadata } from '../entities/action-metadata.entity';
+import { MenuItemMetadata } from '../entities/menu-item-metadata.entity';
+import { ModuleMetadata } from '../entities/module-metadata.entity';
+import { RoleMetadata } from '../entities/role-metadata.entity';
+import { MENU_ROLE_JOIN_TABLE_NAME, MENU_ROLE_JOIN_TABLE_NAME_MENU_COL, MENU_ROLE_JOIN_TABLE_NAME_ROLE_COL } from '../dtos/create-menu-item-metadata.dto';
+import { DEFAULT_SA_PASSWORD } from '../dtos/create-user.dto';
+import { SignUpDto } from '../dtos/sign-up.dto';
 import { ADMIN_ROLE_NAME, CreateRoleMetadataDto } from 'src/dtos/create-role-metadata.dto';
 import { CreateSavedFiltersDto } from 'src/dtos/create-saved-filters.dto';
 import { CreateScheduledJobDto } from 'src/dtos/create-scheduled-job.dto';
@@ -151,6 +157,11 @@ export class ModuleMetadataSeederService {
                 const moduleModelFieldCounts = await this.seedModuleModelFields(moduleMetadata);
                 console.log(`${this.formatSeedResult(moduleMetadata.name, 'Module/Model/Fields', moduleModelFieldCounts)}`);
 
+                currentStep = 'seedPermissions';
+                this.logger.log(`Seeding Permissions`);
+                const permissionCounts = await this.seedPermissions(overallMetadata);
+                console.log(`${this.formatSeedResult(moduleMetadata.name, 'Permissions', permissionCounts)}`);
+
                 currentStep = 'seedRoles';
                 this.logger.log(`Seeding Roles`);
                 const roleCounts = await this.seedRoles(overallMetadata);
@@ -282,6 +293,7 @@ export class ModuleMetadataSeederService {
         this.logger.debug(`About to add all permissions to the Admin role`);
         await this.roleService.addAllPermissionsToRole(ADMIN_ROLE_NAME);
 
+        // The below code is commented out for now as we are including permissions for these roles from the seeder json for the Internal and Public role. 
         // 2. Give  permissions to the Internal / Public role.
         // this.logger.debug(`About to add all permissions to the Internal role`);
         // await this.roleService.addPermissionToRole(INTERNAL_ROLE_NAME, INTERNAL_ROLE_PERMISSIONS);
@@ -379,6 +391,14 @@ export class ModuleMetadataSeederService {
         return { pruned: 0, upserted: overallMetadata.roles?.length ?? 0 };
     }
 
+    private async seedPermissions(overallMetadata: any): Promise<{ pruned: number; upserted: number }> {
+        this.logger.debug(`[Start] Processing permissions`);
+        const permissions = overallMetadata.permissions ?? [];
+        await this.handleSeedPermissions(permissions);
+        this.logger.debug(`[End] Processing permissions`);
+        return { pruned: 0, upserted: permissions?.length ?? 0 };
+    }
+
     // OK
     private get seedDataFiles(): any[] {
         const typedSolidCoreMetadata = structuredClone(solidCoreMetadata);
@@ -401,7 +421,7 @@ export class ModuleMetadataSeederService {
     // OK
     private async seedGlobalMetadata() {
         this.logger.log(`Seeding Permissions`);
-        await this.seedPermissions();
+        await this.seedControllerPermissions();
 
         // this.logger.log(`Seeding Default Media Storage Providers`);
         // await this.seedDefaultMediaStorageProviders();
@@ -422,7 +442,7 @@ export class ModuleMetadataSeederService {
     }
 
     // OK
-    private async seedPermissions() {
+    private async seedControllerPermissions() {
 
         const controllers = this.solidRegistry.getControllers();
         const permissionNames: string[] = [];
@@ -440,28 +460,7 @@ export class ModuleMetadataSeederService {
                     const permissionName = `${controller.name}.${methodName}`;
                     permissionNames.push(permissionName);
 
-                    const existingPermission = await this.permissionRepo.findOne({
-                        where: {
-                            name: permissionName
-                        }
-                    });
-
-                    // if (existingPermission) {
-                    //     this.logger.log(`Permission ${permissionName} already exists.`);
-                    // }
-                    // else { }
-
-                    if (!existingPermission) {
-
-                        this.logger.log(`Permission ${permissionName} does not exist, creating new.`);
-
-                        const newPermission = this.permissionRepo.create({
-                            name: permissionName
-                        });
-                        await this.permissionRepo.save(newPermission);
-
-
-                    }
+                    await this.createPermissionIfNotExists(permissionName);
                 }
 
             } catch (error) {
@@ -474,6 +473,32 @@ export class ModuleMetadataSeederService {
         }
     }
 
+    private async createPermissionIfNotExists(permissionName: string): Promise<void> {
+        const existingPermission = await this.permissionRepo.findOne({
+            where: {
+                name: permissionName
+            }
+        });
+
+        if (!existingPermission) {
+            this.logger.log(`Permission ${permissionName} does not exist, creating new.`);
+
+            const newPermission = this.permissionRepo.create({
+                name: permissionName
+            });
+            await this.permissionRepo.save(newPermission);
+        }
+    }
+
+    private async handleSeedPermissions(permissions: any[]): Promise<void> {
+        for (const permission of permissions) {
+            const permissionName = typeof permission === 'string' ? permission : permission?.name;
+            if (permissionName) {
+                await this.createPermissionIfNotExists(permissionName);
+            }
+        }
+    }
+
     // OK
     // private async seedDefaultMediaStorageProviders() {
     //     await this.mediaStorageProviderSeederService.seed();

package/src/seeders/module-test-data.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, Logger } from '@nestjs/common';
 import { DiscoveryService, ModuleRef } from '@nestjs/core';
 import { getDataSourceToken } from '@nestjs/typeorm';
-import { classify } from '@angular-devkit/core/src/utils/strings';
+import { classify } from '../helpers/string.helper';
 import { DataSource, EntityManager } from 'typeorm';
 import * as fs from 'fs';
 import * as path from 'path';
@@ -391,14 +391,7 @@ export class ModuleTestDataService {
         continue;
       }
 
-      await authService.signUp({
-        username: user.username,
-        email: user.email,
-        password: user.password,
-        fullName: user.fullName,
-        mobile: user.mobile,
-        roles: user.roles,
-      });
+      await authService.signUp({ ...user });
       this.logger.log(`Created test user "${user.username}"${user.roles?.length ? ` with roles [${user.roles.join(', ')}]` : ''}`);
     }
   }

package/src/seeders/seed-data/solid-core-metadata.json

@@ -1511,7 +1511,7 @@
             "encrypt": false,
             "relationType": "many-to-many",
             "relationCoModelSingularName": "roleMetadata",
-            "relationCoModelFieldName": "users",
+            "relationCoModelFieldName": "menuItems",
             "relationCreateInverse": true,
             "relationCascade": "set null",
             "relationModelModuleName": "solid-core",
@@ -3780,7 +3780,9 @@
               "audit_insert:audit_insert",
               "audit_update:audit_update",
               "audit_delete:audit_delete",
-              "custom:custom"
+              "custom:custom",
+              "note:note",
+              "task:task"
             ]
           },
           {
@@ -3891,6 +3893,21 @@
             "private": false,
             "encrypt": false,
             "isSystem": false
+          },
+          {
+            "name": "status",
+            "displayName": "Message Status",
+            "type": "selectionStatic",
+            "defaultValue": "pending",
+            "length": 256,
+            "required": true,
+            "index": false,
+            "isSystem": false,
+            "selectionValueType": "string",
+            "selectionStaticValues": [
+              "pending:pending",
+              "completed:completed"
+            ]
           }
         ]
       },
@@ -5819,7 +5836,7 @@
           {
             "name": "toolOutput",
             "displayName": "Tool Output",
-            "type": "longText",
+            "type": "json",
             "columnName": "tool_output",
             "required": false,
             "unique": false,
@@ -5905,6 +5922,11 @@
       }
     ]
   },
+  "permissions": [
+    "mcp:invoke",
+    "agent:invoke",
+    "settings:view_encrypted"
+  ],
   "roles": [
     {
       "name": "Admin"
@@ -5947,6 +5969,7 @@
         "ChatterMessageController.getChatterMessages",
         "ChatterMessageController.postMessage",
         "ChatterMessageController.findMany",
+        "ChatterMessageController.markCompleted",
         "ImportTransactionController.getImportTemplate",
         "ImportTransactionController.getImportInstructions",
         "ImportTransactionController.getImportMappingInfo",
@@ -5961,7 +5984,9 @@
         "AgentSessionController.findMany",
         "AgentSessionController.findOne",
         "AgentEventController.findMany",
-        "AgentEventController.findOne"
+        "AgentEventController.findOne",
+        "mcp:invoke",
+        "agent:invoke"
       ]
     },
     {
@@ -6402,51 +6427,12 @@
       "modelUserKey": "userActivityHistory"
     },
     {
-      "displayName": "App Settings",
-      "name": "appSettings-action",
-      "type": "custom",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/core/solid-core/settings/app-settings",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "setting"
-    },
-    {
-      "displayName": "Authentication Settings Action",
-      "name": "authenticationSettings-action",
-      "type": "custom",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/core/solid-core/settings/authentication-settings",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "setting"
-    },
-    {
-      "displayName": "Ai settings Action",
-      "name": "aiSettings-action",
-      "type": "custom",
-      "domain": "",
-      "context": "",
-      "customComponent": "/admin/core/solid-core/settings/ai-settings",
-      "customIsModal": true,
-      "serverEndpoint": "",
-      "viewUserKey": "",
-      "moduleUserKey": "solid-core",
-      "modelUserKey": "setting"
-    },
-    {
-      "displayName": "Misc Action",
-      "name": "miscSettings-action",
+      "displayName": "Settings",
+      "name": "settings-action",
       "type": "custom",
       "domain": "",
       "context": "",
-      "customComponent": "/admin/core/solid-core/settings/misc-settings",
+      "customComponent": "/admin/core/settings",
       "customIsModal": true,
       "serverEndpoint": "",
       "viewUserKey": "",
@@ -6927,43 +6913,11 @@
       "displayName": "Settings",
       "name": "settings-menu-item",
       "sequenceNumber": 9,
-      "actionUserKey": "",
+      "actionUserKey": "settings-action",
       "moduleUserKey": "solid-core",
       "parentMenuItemUserKey": "",
       "iconName": "settings"
     },
-    {
-      "displayName": "App Settings",
-      "name": "appSettings-menu-item",
-      "sequenceNumber": 1,
-      "actionUserKey": "appSettings-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "settings-menu-item"
-    },
-    {
-      "displayName": "Authentication Settings",
-      "name": "authenticationSettings-menu-item",
-      "sequenceNumber": 2,
-      "actionUserKey": "authenticationSettings-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "settings-menu-item"
-    },
-    {
-      "displayName": "Ai Settings",
-      "name": "aiSettings-menu-item",
-      "sequenceNumber": 3,
-      "actionUserKey": "aiSettings-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "settings-menu-item"
-    },
-    {
-      "displayName": "Misc",
-      "name": "miscSettings-menu-item",
-      "sequenceNumber": 4,
-      "actionUserKey": "miscSettings-action",
-      "moduleUserKey": "solid-core",
-      "parentMenuItemUserKey": "settings-menu-item"
-    },
     {
       "displayName": "Model Sequence",
       "name": "modelSequence-menu-item",
@@ -10533,7 +10487,7 @@
           "edit": true,
           "delete": true,
           "groupBy": "stage",
-          "draggable": true,
+          "draggable": false,
           "allowedViews": [
             "list",
             "kanban"
@@ -11229,6 +11183,7 @@
           "label": "Scheduled Job",
           "className": "grid"
         },
+        "onFieldChange": "scheduleFrequencyOnFieldChangeHandler",
         "children": [
           {
             "type": "sheet",
@@ -11306,7 +11261,8 @@
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "cronExpression"
+                                  "name": "cronExpression",
+                                  "visible": false
                                 }
                               },
                               {
@@ -11336,13 +11292,15 @@
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "dayOfWeek"
+                                  "name": "dayOfWeek",
+                                  "visible": false
                                 }
                               },
                               {
                                 "type": "field",
                                 "attrs": {
-                                  "name": "dayOfMonth"
+                                  "name": "dayOfMonth",
+                                  "visible": false
                                 }
                               }
                             ]
@@ -11470,13 +11428,6 @@
                       "label": "Auth Pages Layout"
                     }
                   },
-                  {
-                    "type": "field",
-                    "attrs": {
-                      "name": "authPagesTheme",
-                      "label": "Auth Pages Theme"
-                    }
-                  },
                   {
                     "type": "field",
                     "attrs": {
@@ -13900,9 +13851,9 @@
                     "attrs": { "name": "col-content", "label": "", "className": "col-12" },
                     "children": [
                       { "type": "field", "attrs": { "name": "content" } },
-                      { "type": "field", "attrs": { "name": "toolArguments" } },
-                      { "type": "field", "attrs": { "name": "toolOutput" } },
-                      { "type": "field", "attrs": { "name": "eventData" } }
+                      { "type": "field", "attrs": { "name": "toolArguments", "viewWidget": "SolidJsonFormViewWidget" } },
+                      { "type": "field", "attrs": { "name": "toolOutput", "viewWidget": "SolidJsonFormViewWidget" } },
+                      { "type": "field", "attrs": { "name": "eventData", "viewWidget": "SolidJsonFormViewWidget" } }
                     ]
                   }
                 ]

package/src/services/api-key.service.ts

@@ -6,6 +6,7 @@ import {
     UnauthorizedException,
 } from '@nestjs/common';
 import { createHash, randomBytes } from 'crypto';
+import { ERROR_MESSAGES } from 'src/constants/error-messages';
 import { CreateApiKeyDto } from 'src/dtos/create-api-key.dto';
 import { UpdateApiKeyDto } from 'src/dtos/update-api-key.dto';
 import { UserApiKey } from 'src/entities/user-api-key.entity';
@@ -13,6 +14,8 @@ import { User } from 'src/entities/user.entity';
 import { ActiveUserData } from 'src/interfaces/active-user-data.interface';
 import { UserApiKeyRepository } from 'src/repository/user-api-key.repository';
 import { PermissionMetadataService } from 'src/services/permission-metadata.service';
+import { AuthenticationService } from './authentication.service';
+import { UserRepository } from 'src/repository/user.repository';
 
 @Injectable()
 export class ApiKeyService {
@@ -21,53 +24,55 @@ export class ApiKeyService {
     constructor(
         private readonly apiKeyRepository: UserApiKeyRepository,
         private readonly permissionMetadataService: PermissionMetadataService,
+        private readonly authenticationService: AuthenticationService,
+        private readonly userRepository: UserRepository,
     ) {}
 
-    async generate(userId: number, dto: CreateApiKeyDto): Promise<{ apiKey: string; record: UserApiKey }> {
-        const user = await this.apiKeyRepository.manager.findOne(User, {
-            where: { id: userId },
-            select: ['id', 'isAllowedToGenerateApiKeys'],
-        });
+    async generate(userId: number, dto: CreateApiKeyDto): Promise < { apiKey: string; record: UserApiKey } > {
+            const user = await this.apiKeyRepository.manager.findOne(User, {
+                where: { id: userId },
+                select: ['id', 'isAllowedToGenerateApiKeys'],
+            });
 
-        if (!user?.isAllowedToGenerateApiKeys) {
-            throw new ForbiddenException('You are not allowed to generate API keys');
-        }
+            if(!user?.isAllowedToGenerateApiKeys) {
+                throw new ForbiddenException('You are not allowed to generate API keys');
+            }
 
         const rawKey = 'sldx_' + randomBytes(32).toString('hex');
-        const hashedKey = this.hash(rawKey);
-        const maskedKey = 'sldx_****' + rawKey.slice(-4);
-
-        const record = this.apiKeyRepository.create({
-            name: dto.name,
-            hashedKey,
-            maskedKey,
-            isActive: true,
-            expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
-            user,
-        });
+            const hashedKey = this.hash(rawKey);
+            const maskedKey = 'sldx_****' + rawKey.slice(-4);
 
-        await this.apiKeyRepository.save(record);
+            const record = this.apiKeyRepository.create({
+                name: dto.name,
+                hashedKey,
+                maskedKey,
+                isActive: true,
+                expiresAt: dto.expiresAt ? new Date(dto.expiresAt) : null,
+                user,
+            });
 
-        // Strip hashedKey from the returned record — maskedKey is all the UI needs
-        delete (record as any).hashedKey;
+            await this.apiKeyRepository.save(record);
 
-        return { apiKey: rawKey, record };
-    }
+            // Strip hashedKey from the returned record — maskedKey is all the UI needs
+            delete(record as any).hashedKey;
 
-    async validate(rawKey: string): Promise<ActiveUserData> {
-        const hashedKey = this.hash(rawKey);
+            return { apiKey: rawKey, record };
+        }
 
-        // Bypass security rules for auth validation — must find the key regardless of caller context
-        const keyRecord = await this.apiKeyRepository.findOne({
-            where: { hashedKey, isActive: true },
-            relations: ['user', 'user.roles'],
-        });
+    async validate(rawKey: string): Promise < ActiveUserData > {
+            const hashedKey = this.hash(rawKey);
 
-        if (!keyRecord) {
-            throw new UnauthorizedException();
-        }
+            // Bypass security rules for auth validation — must find the key regardless of caller context
+            const keyRecord = await this.apiKeyRepository.findOne({
+                where: { hashedKey, isActive: true },
+                relations: ['user', 'user.roles'],
+            });
 
-        if (keyRecord.expiresAt && keyRecord.expiresAt < new Date()) {
+            if(!keyRecord) {
+                throw new UnauthorizedException();
+            }
+
+        if(keyRecord.expiresAt && keyRecord.expiresAt < new Date()) {
             throw new UnauthorizedException('API key expired');
         }
 
@@ -105,6 +110,43 @@ export class ApiKeyService {
             .execute();
     }
 
+
+    async apiKeyMe(apiKey: string) {
+
+        const hasedKey = this.hash(apiKey);
+        const apiKeyRecord = await this.apiKeyRepository.findOne({
+            where: {
+                hashedKey: hasedKey,
+            },
+            relations: {
+                user: {
+                    roles: true
+                }
+            }
+        });
+
+        if (!apiKeyRecord) {
+            throw new UnauthorizedException(ERROR_MESSAGES.INVALID_CREDENTIALS);
+        }
+
+        const user = apiKeyRecord.user;
+
+        const tokens = await this.authenticationService.generateTokens(user);
+
+
+        return {
+            user: {
+                email: user.email,
+                mobile: user.mobile,
+                username: user.username,
+                forcePasswordChange: user.forcePasswordChange,
+                id: user.id,
+                roles: user.roles.map((role) => role.name)
+            },
+            ...tokens
+        }
+    }
+
     private hash(rawKey: string): string {
         return createHash('sha256').update(rawKey).digest('hex');
     }