@solidxai/core 0.1.8-beta.8 → 0.1.8

package/src/dtos/register-private.dto.ts

@@ -1,17 +1,8 @@
-import { IsEmail, IsNotEmpty, IsOptional, MinLength } from 'class-validator';
-
-export class RegisterPrivateDto {
-    @IsNotEmpty()
-    username: string;
-
-    @IsEmail()
-    @IsNotEmpty()
-    email: string;
-
-    @IsOptional()
-    mobile?: string;
+import { IsBoolean, IsOptional } from 'class-validator';
+import { SignUpDto } from './sign-up.dto';
 
+export class RegisterPrivateDto extends SignUpDto {
+    @IsBoolean()
     @IsOptional()
-    @MinLength(10)
-    password?: string;
+    isAllowedToGenerateApiKeys?: boolean;
 }

package/src/dtos/sso-exchange.dto.ts

@@ -0,0 +1,7 @@
+import { IsNotEmpty, IsString } from 'class-validator';
+
+export class SsoExchangeDto {
+    @IsNotEmpty()
+    @IsString()
+    code: string;
+}

package/src/dtos/update-api-key.dto.ts

@@ -0,0 +1,9 @@
+import { ApiProperty } from '@nestjs/swagger';
+import { IsBoolean, IsNotEmpty } from 'class-validator';
+
+export class UpdateApiKeyDto {
+    @ApiProperty({ example: true })
+    @IsBoolean()
+    @IsNotEmpty()
+    isActive: boolean;
+}

package/src/entities/agent-event.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, Index } from 'typeorm';
 import { CommonEntity } from 'src/entities/common.entity';
 import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
-@Entity({ name: 'ss_agent_events', synchronize: false })
+@Entity({ name: 'ss_agent_events' })
 export class AgentEvent extends CommonEntity {
   @Index()
   @Column({ })

package/src/entities/agent-session.entity.ts

@@ -2,7 +2,7 @@ import { Column, Entity, Index } from 'typeorm';
 import { CommonEntity } from 'src/entities/common.entity';
 import { getColumnType } from 'src/helpers/typeorm-db-helper';
 
-@Entity({ name: 'ss_agent_sessions', synchronize: false })
+@Entity({ name: 'ss_agent_sessions' })
 export class AgentSession extends CommonEntity {
   @Index({ unique: true })
   @Column({ })

package/src/entities/setting.entity.ts

@@ -19,6 +19,9 @@ export class Setting extends CommonEntity {
     @Column({ name: "level", type: "varchar", nullable: true })
     level: string;
 
+    @Column({ name: "encrypted", type: "boolean", default: false })
+    encrypted: boolean;
+
     @Index()
     @ManyToOne(() => User, { nullable: true })
     @JoinColumn()

package/src/entities/user-api-key.entity.ts

@@ -0,0 +1,37 @@
+import { Exclude, Expose } from "class-transformer";
+import { CommonEntity } from "src/entities/common.entity";
+import { Column, Entity, Index, ManyToOne } from "typeorm";
+import { User } from "./user.entity";
+
+@Entity("ss_user_api_key")
+@Exclude()
+export class UserApiKey extends CommonEntity {
+
+    @Expose()
+    @Column()
+    name: string;
+
+    // SHA-256 hash of the raw key — never exposed, same treatment as User.password
+    @Index({ unique: true })
+    @Column()
+    hashedKey: string;
+
+    @Expose()
+    @Column()
+    maskedKey: string;
+
+    @Expose()
+    @Column({ default: true })
+    isActive: boolean;
+
+    @Expose()
+    @Column({ nullable: true })
+    expiresAt: Date;
+
+    @Expose()
+    @Column({ nullable: true })
+    lastUsedAt: Date;
+
+    @ManyToOne(() => User, user => user.apiKeys)
+    user: User;
+}

package/src/entities/user.entity.ts

@@ -2,6 +2,7 @@ import { CommonEntity } from "src/entities/common.entity"
 import { Entity, Column, Index, JoinTable, ManyToMany, OneToMany, TableInheritance } from "typeorm";
 import { RoleMetadata } from 'src/entities/role-metadata.entity';
 import { UserViewMetadata } from 'src/entities/user-view-metadata.entity'
+import { UserApiKey } from 'src/entities/user-api-key.entity'
 import { Exclude, Expose } from "class-transformer";
 
 @Entity("ss_user")
@@ -151,4 +152,11 @@ export class User extends CommonEntity {
     @Expose()
     _media: any;
 
+    @Column({ default: false })
+    @Expose()
+    isAllowedToGenerateApiKeys: boolean = false;
+
+    @OneToMany(() => UserApiKey, key => key.user)
+    apiKeys: UserApiKey[];
+
 }

package/src/enums/auth-type.enum.ts

@@ -1,4 +1,5 @@
 export enum AuthType {
     Bearer,
+    ApiKey,
     None,
 }

package/src/guards/api-key.guard.ts

@@ -0,0 +1,32 @@
+import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
+import { Request } from 'express';
+import { REQUEST_USER_KEY } from 'src/constants';
+import { ApiKeyService } from 'src/services/api-key.service';
+import { ClsService } from 'nestjs-cls';
+
+@Injectable()
+export class ApiKeyGuard implements CanActivate {
+    constructor(
+        private readonly apiKeyService: ApiKeyService,
+        private readonly cls: ClsService,
+    ) {}
+
+    async canActivate(context: ExecutionContext): Promise<boolean> {
+        const request = context.switchToHttp().getRequest<Request>();
+        const rawKey = this.extractKeyFromHeader(request);
+
+        if (!rawKey) {
+            throw new UnauthorizedException();
+        }
+
+        const activeUser = await this.apiKeyService.validate(rawKey);
+        request[REQUEST_USER_KEY] = activeUser;
+        this.cls.set(REQUEST_USER_KEY, activeUser);
+
+        return true;
+    }
+
+    private extractKeyFromHeader(request: Request): string | undefined {
+        return request.headers['solidx-api-key'] as string | undefined;
+    }
+}

package/src/guards/authentication.guard.ts

@@ -8,23 +8,26 @@ import { Reflector } from '@nestjs/core';
 import { AUTH_TYPE_KEY } from '../decorators/auth.decorator';
 import { AuthType } from '../enums/auth-type.enum';
 import { AccessTokenGuard } from './access-token.guard';
+import { ApiKeyGuard } from './api-key.guard';
 import { IS_PUBLIC_KEY } from '../decorators/public.decorator';
 import { PermissionMetadataService } from '../services/permission-metadata.service';
 import { ClsService } from 'nestjs-cls';
 
 @Injectable()
 export class AuthenticationGuard implements CanActivate {
-  private static readonly defaultAuthType = AuthType.Bearer;
+  private static readonly defaultAuthTypes = [AuthType.Bearer, AuthType.ApiKey];
   private readonly authTypeGuardMap: Record<
     AuthType,
     CanActivate | CanActivate[]> = {
       [AuthType.Bearer]: this.accessTokenGuard,
+      [AuthType.ApiKey]: this.apiKeyGuard,
       [AuthType.None]: { canActivate: () => true },
     };
 
   constructor(
     private readonly reflector: Reflector,
     private readonly accessTokenGuard: AccessTokenGuard,
+    private readonly apiKeyGuard: ApiKeyGuard,
     private readonly permissionService: PermissionMetadataService,
     private readonly cls: ClsService,
   ) { }
@@ -49,7 +52,7 @@ export class AuthenticationGuard implements CanActivate {
       return true;
     }
 
-    // TODO: Check if this permission viz. contextPermission is listed in the Public role. 
+    // TODO: Check if this permission viz. contextPermission is listed in the Public role.
     const contextPermission = `${context.getClass().name}.${context.getHandler().name}`;
 
     const permissionExistsInRole = await this.permissionService.permissionExistsInRole('Public', contextPermission)
@@ -61,7 +64,7 @@ export class AuthenticationGuard implements CanActivate {
     const authTypes = this.reflector.getAllAndOverride<AuthType[]>(
       AUTH_TYPE_KEY,
       [context.getHandler(), context.getClass()],
-    ) ?? [AuthenticationGuard.defaultAuthType];
+    ) ?? AuthenticationGuard.defaultAuthTypes;
     const guards = authTypes.map((type) => this.authTypeGuardMap[type]).flat();
     let error = new UnauthorizedException();
 

package/src/helpers/bootstrap.helper.ts

@@ -90,6 +90,21 @@ export async function bootstrapSolidApp(
   // Security headers
   app.use(helmet(buildDefaultSecurityHeaderOptions()));
 
+  // Nest's Swagger UI HTML injects inline styles; keep CSP strict elsewhere.
+  const isSwaggerPath = (path: string) =>
+    path === '/docs' ||
+    path === '/docs/' ||
+    path.startsWith('/docs/') ||
+    path === '/docs-json' ||
+    path === '/docs-yaml';
+
+  app.use((req: Request, res: Response, next: NextFunction) => {
+    if (isSwaggerPath(req.path)) {
+      res.removeHeader('Content-Security-Policy');
+    }
+    next();
+  });
+
   // Permissions-Policy header
   app.use((_req: Request, res: Response, next: NextFunction) => {
     res.setHeader('Permissions-Policy', buildPermissionsPolicyHeader(permissionsPolicyOverrides));

package/src/helpers/field-crud-managers/SelectionDynamicFieldCrudManager.ts

@@ -128,14 +128,25 @@ export class SelectionDynamicFieldCrudManager implements FieldCrudManager {
     }
 
     private providerInstance<T extends ISelectionProviderContext>(selectionDynamicProvider: string): ISelectionProvider<T> {
-        const provider = this.options.discoveryService
-            .getProviders()
-            .filter((provider) => provider.name === selectionDynamicProvider)
-            .pop();
-        if (!provider) {
+        const providers = this.options.discoveryService.getProviders();
+
+        const byToken = providers.find((p) => p.name === selectionDynamicProvider);
+        if (byToken) {
+            return byToken.instance as ISelectionProvider<T>;
+        }
+
+        const byName = providers.find((p) => {
+            try {
+                return typeof p.instance?.name === 'function' && p.instance.name() === selectionDynamicProvider;
+            } catch {
+                return false;
+            }
+        });
+
+        if (!byName) {
             throw new Error(`Provider for ${selectionDynamicProvider} not found`);
         }
-        return provider.instance as ISelectionProvider<T>;
+        return byName.instance as ISelectionProvider<T>;
     }
 
     private isApplyRequiredValidation(): boolean {

package/src/index.ts

@@ -126,6 +126,7 @@ export * from './entities/permission-metadata.entity'
 export * from './entities/role-metadata.entity'
 export * from './entities/sms-template.entity'
 export * from './entities/user.entity'
+export * from './entities/user-api-key.entity'
 export * from './entities/view-metadata.entity'
 export * from './entities/setting.entity'
 export * from './entities/saved-filters.entity'
@@ -314,6 +315,7 @@ export * from './services/user.service'
 export * from './services/view-metadata.service'
 export * from './services/whatsapp/Msg91WhatsappService' //rename
 export * from './services/setting.service'
+export * from './services/encryption.service'
 export * from './services/info.service'
 export * from './controllers/info.controller'
 export * from './services/settings/default-settings-provider.service'

package/src/interfaces.ts

@@ -70,6 +70,7 @@ export interface SettingDefinition<T = any> {
   key: string;
   value: T;
   level: SettingLevel;
+  encrypted?: boolean;
 }
 
 // solid-core/settings/settings-provider.interface.ts
@@ -395,3 +396,18 @@ export interface AwsS3Config {
 
 // Prevents inference so callers must provide explicit type arguments; reusable for other APIs.
 export type NoInfer<T> = [T][T extends any ? 0 : never];
+
+export type AuditEventType = 'insert' | 'update' | 'delete';
+
+export interface AuditQueuePayload {
+    eventType: AuditEventType;
+    modelName: string;
+    entityId: string | number | null;
+    occurredAt: string;
+    after?: any;
+    before?: any;
+    updatedColumnNames?: string[];
+    userId?: number | null;
+}
+
+

package/src/jobs/database/chatter-queue-publisher-database.service.ts

@@ -4,7 +4,7 @@ import { DatabasePublisher } from 'src/services/queues/database-publisher.servic
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { MqMessageService } from '../../services/mq-message.service';
 import { QueuesModuleOptions } from "../../interfaces";
-import { AuditQueuePayload } from '../rabbitmq/chatter-queue-publisher.service';
+import { AuditQueuePayload } from '../../interfaces';
 import chatterQueueOptionsDatabase from './chatter-queue-options-database';
 
 @Injectable()

package/src/jobs/database/chatter-queue-subscriber-database.service.ts

@@ -6,7 +6,7 @@ import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../../interfaces";
 import { PollerService } from 'src/services/poller.service';
-import { AuditQueuePayload } from '../rabbitmq/chatter-queue-publisher.service';
+import { AuditQueuePayload } from '../../interfaces';
 import { ChatterMessageService } from 'src/services/chatter-message.service';
 import chatterQueueOptionsDatabase from './chatter-queue-options-database';
 

package/src/jobs/rabbitmq/chatter-queue-publisher.service.ts

@@ -4,21 +4,7 @@ import { RabbitMqPublisher } from 'src/services/queues/rabbitmq-publisher.servic
 import chatterQueueOptions from './chatter-queue-options';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { MqMessageService } from '../../services/mq-message.service';
-import { QueuesModuleOptions } from "../../interfaces";
-
-
-export type AuditEventType = 'insert' | 'update' | 'delete';
-
-export interface AuditQueuePayload {
-    eventType: AuditEventType;
-    modelName: string;              // TypeORM entity class name (e.g. 'Order')
-    entityId: string | number | null;
-    occurredAt: string;             // ISO timestamp, captured at event time
-    after?: any;                    // entity state after operation (insert/update)
-    before?: any;                   // entity state before operation (update/delete)
-    updatedColumnNames?: string[];  // propertyNames of changed columns (update only)
-    userId?: number | null;         // active user captured at event time
-}
+import { AuditQueuePayload, QueuesModuleOptions } from "../../interfaces";
 
 @Injectable()
 export class ChatterQueuePublisherRabbitmq extends RabbitMqPublisher<AuditQueuePayload> {

package/src/jobs/rabbitmq/chatter-queue-subscriber.service.ts

@@ -6,7 +6,7 @@ import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../../interfaces";
 import chatterQueueOptions from './chatter-queue-options';
-import { AuditQueuePayload } from './chatter-queue-publisher.service';
+import { AuditQueuePayload } from '../../interfaces';
 import { ChatterMessageService } from 'src/services/chatter-message.service';
 
 @Injectable()

package/src/jobs/redis/chatter-queue-subscriber-redis.service.ts

@@ -6,7 +6,7 @@ import chatterQueueConfig from './chatter-queue-options-redis';
 import { MqMessageService } from '../../services/mq-message.service';
 import { MqMessageQueueService } from '../../services/mq-message-queue.service';
 import { QueuesModuleOptions } from "../../interfaces";
-import { AuditQueuePayload } from '../rabbitmq/chatter-queue-publisher.service';
+import { AuditQueuePayload } from '../../interfaces';
 import { ChatterMessageService } from '../../services/chatter-message.service';
 
 @Injectable()

package/src/repository/user-api-key.repository.ts

@@ -0,0 +1,17 @@
+import { Injectable } from '@nestjs/common';
+import { UserApiKey } from 'src/entities/user-api-key.entity';
+import { RequestContextService } from 'src/services/request-context.service';
+import { DataSource } from 'typeorm';
+import { SecurityRuleRepository } from './security-rule.repository';
+import { SolidBaseRepository } from './solid-base.repository';
+
+@Injectable()
+export class UserApiKeyRepository extends SolidBaseRepository<UserApiKey> {
+    constructor(
+        readonly dataSource: DataSource,
+        readonly requestContextService: RequestContextService,
+        readonly securityRuleRepository: SecurityRuleRepository,
+    ) {
+        super(UserApiKey, dataSource, requestContextService, securityRuleRepository);
+    }
+}

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

@@ -2085,6 +2085,35 @@
             "relationModelModuleName": "solid-core",
             "isSystem": true
           },
+          {
+            "name": "isAllowedToGenerateApiKeys",
+            "displayName": "Is Allowed To Generate API Keys",
+            "type": "boolean",
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "defaultValue": "false",
+            "isSystem": true,
+            "enableAuditTracking": true
+          },
+          {
+            "name": "apiKeys",
+            "displayName": "API Keys",
+            "type": "relation",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "relationType": "one-to-many",
+            "relationCoModelSingularName": "userApiKey",
+            "relationCoModelFieldName": "user",
+            "relationCreateInverse": true,
+            "relationModelModuleName": "solid-core",
+            "isSystem": true
+          },
           {
             "name": "passwordScheme",
             "displayName": "Password Scheme",
@@ -2129,6 +2158,105 @@
           }
         ]
       },
+      {
+        "singularName": "userApiKey",
+        "tableName": "ss_user_api_key",
+        "pluralName": "userApiKeys",
+        "displayName": "User API Key",
+        "description": "API keys for programmatic server-to-server access",
+        "dataSource": "default",
+        "dataSourceType": "postgres",
+        "userKeyFieldUserKey": "name",
+        "isSystem": true,
+        "fields": [
+          {
+            "name": "name",
+            "displayName": "Name",
+            "type": "shortText",
+            "length": 512,
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "hashedKey",
+            "displayName": "Hashed Key",
+            "type": "shortText",
+            "length": 512,
+            "required": true,
+            "unique": true,
+            "index": true,
+            "private": true,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "maskedKey",
+            "displayName": "Masked Key",
+            "type": "shortText",
+            "length": 512,
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "isActive",
+            "displayName": "Is Active",
+            "type": "boolean",
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "defaultValue": "true",
+            "isSystem": true
+          },
+          {
+            "name": "expiresAt",
+            "displayName": "Expires At",
+            "type": "datetime",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "lastUsedAt",
+            "displayName": "Last Used At",
+            "type": "datetime",
+            "required": false,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "isSystem": true
+          },
+          {
+            "name": "user",
+            "displayName": "User",
+            "type": "relation",
+            "required": true,
+            "unique": false,
+            "index": false,
+            "private": false,
+            "encrypt": false,
+            "relationType": "many-to-one",
+            "relationCoModelSingularName": "user",
+            "relationCoModelFieldName": "apiKeys",
+            "relationCreateInverse": true,
+            "relationModelModuleName": "solid-core",
+            "isSystem": true
+          }
+        ]
+      },
       {
         "singularName": "userActivityHistory",
         "tableName": "ss_user_activity_history",
@@ -5490,7 +5618,7 @@
             "private": false,
             "encrypt": false,
             "isSystem": true,
-            "selectionStaticValues": ["active", "completed", "failed", "cancelled"],
+            "selectionStaticValues": ["active:Active", "completed:Completed", "failed:Failed", "cancelled:Cancelled"],
             "selectionValueType": "string"
           },
           {
@@ -5627,15 +5755,15 @@
             "encrypt": false,
             "isSystem": true,
             "selectionStaticValues": [
-              "user_message",
-              "assistant_message",
-              "tool_use",
-              "tool_result",
-              "system_prompt",
-              "thinking",
-              "error",
-              "session_start",
-              "session_end"
+              "user_message:User Message",
+              "assistant_message:Assistant Message",
+              "tool_use:Tool Use",
+              "tool_result:Tool Result",
+              "system_prompt:System Prompt",
+              "thinking:Thinking",
+              "error:Error",
+              "session_start:Session Start",
+              "session_end:Session End"
             ],
             "selectionValueType": "string"
           },
@@ -13601,9 +13729,9 @@
           "pagination": true,
           "pageSizeOptions": [10, 25, 50],
           "enableGlobalSearch": true,
-          "create": false,
+          "create": true,
           "edit": true,
-          "delete": false
+          "delete": true
         },
         "children": [
           { "type": "field", "attrs": { "name": "sessionId", "isSearchable": true } },
@@ -13659,9 +13787,7 @@
                       { "type": "field", "attrs": { "name": "totalSteps" } },
                       { "type": "field", "attrs": { "name": "totalCost" } },
                       { "type": "field", "attrs": { "name": "totalInputTokens" } },
-                      { "type": "field", "attrs": { "name": "totalOutputTokens" } },
-                      { "type": "field", "attrs": { "name": "createdAt" } },
-                      { "type": "field", "attrs": { "name": "updatedAt" } }
+                      { "type": "field", "attrs": { "name": "totalOutputTokens" } }
                     ]
                   }
                 ]
@@ -13697,9 +13823,9 @@
           "pagination": true,
           "pageSizeOptions": [10, 25, 50],
           "enableGlobalSearch": true,
-          "create": false,
-          "edit": false,
-          "delete": false
+          "create": true,
+          "edit": true,
+          "delete": true
         },
         "children": [
           { "type": "field", "attrs": { "name": "id" } },
@@ -13760,8 +13886,7 @@
                       { "type": "field", "attrs": { "name": "cost" } },
                       { "type": "field", "attrs": { "name": "inputTokens" } },
                       { "type": "field", "attrs": { "name": "outputTokens" } },
-                      { "type": "field", "attrs": { "name": "toolReturncode" } },
-                      { "type": "field", "attrs": { "name": "createdAt" } }
+                      { "type": "field", "attrs": { "name": "toolReturncode" } }
                     ]
                   }
                 ]