@solidstarters/solid-core 1.2.191 → 1.2.193

package/dist/services/ai-interaction.service.js

@@ -48,21 +48,21 @@ var AiInteractionService_1;
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.AiInteractionService = void 0;
 const common_1 = require("@nestjs/common");
-const typeorm_1 = require("@nestjs/typeorm");
 const core_1 = require("@nestjs/core");
+const typeorm_1 = require("@nestjs/typeorm");
 const typeorm_2 = require("typeorm");
-const crud_service_1 = require("./crud.service");
-const model_metadata_service_1 = require("./model-metadata.service");
-const module_metadata_service_1 = require("./module-metadata.service");
 const config_1 = require("@nestjs/config");
-const file_service_1 = require("./file.service");
-const crud_helper_service_1 = require("./crud-helper.service");
 const child_process_1 = require("child_process");
-const ai_interaction_entity_1 = require("../entities/ai-interaction.entity");
 const fs = __importStar(require("fs/promises"));
-const publisher_factory_service_1 = require("./queues/publisher-factory.service");
 const error_messages_1 = require("../constants/error-messages");
+const ai_interaction_repository_1 = require("../repository/ai-interaction.repository");
+const crud_helper_service_1 = require("./crud-helper.service");
+const crud_service_1 = require("./crud.service");
+const file_service_1 = require("./file.service");
+const model_metadata_service_1 = require("./model-metadata.service");
+const module_metadata_service_1 = require("./module-metadata.service");
 const mcp_handler_factory_service_1 = require("./genai/mcp-handlers/mcp-handler-factory.service");
+const publisher_factory_service_1 = require("./queues/publisher-factory.service");
 let AiInteractionService = AiInteractionService_1 = class AiInteractionService extends crud_service_1.CRUDService {
     constructor(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, moduleRef, publisherFactory, mcpHandlerFactory) {
         super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);
@@ -219,7 +219,6 @@ exports.AiInteractionService = AiInteractionService;
 exports.AiInteractionService = AiInteractionService = AiInteractionService_1 = __decorate([
     (0, common_1.Injectable)(),
     __param(6, (0, typeorm_1.InjectEntityManager)()),
-    __param(7, (0, typeorm_1.InjectRepository)(ai_interaction_entity_1.AiInteraction, 'default')),
     __metadata("design:paramtypes", [model_metadata_service_1.ModelMetadataService,
         module_metadata_service_1.ModuleMetadataService,
         config_1.ConfigService,
@@ -227,7 +226,7 @@ exports.AiInteractionService = AiInteractionService = AiInteractionService_1 = _
         core_1.DiscoveryService,
         crud_helper_service_1.CrudHelperService,
         typeorm_2.EntityManager,
-        typeorm_2.Repository,
+        ai_interaction_repository_1.AiInteractionRepository,
         core_1.ModuleRef,
         publisher_factory_service_1.PublisherFactory,
         mcp_handler_factory_service_1.McpHandlerFactory])

package/dist/services/ai-interaction.service.js.map

@@ -1 +1 @@
-{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Logger, Injectable } from '@nestjs/common';\nimport { InjectEntityManager, InjectRepository } from '@nestjs/typeorm';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { EntityManager, Repository } from 'typeorm';\n\nimport { CRUDService } from 'src/services/crud.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { ConfigService } from '@nestjs/config';\nimport { FileService } from 'src/services/file.service';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { spawn } from 'child_process';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport * as fs from 'fs/promises';\nimport { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';\nimport { PublisherFactory } from './queues/publisher-factory.service';\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\nimport { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';\nimport { McpHandlerFactory } from './genai/mcp-handlers/mcp-handler-factory.service';\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  private readonly logger = new Logger(AiInteractionService.name);\n\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    @InjectRepository(AiInteraction, 'default')\n    readonly repo: Repository<AiInteraction>,\n    readonly moduleRef: ModuleRef,\n    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,\n    // readonly requestContextService: RequestContextService,\n    readonly mcpHandlerFactory: McpHandlerFactory,\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {\n    // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();\n\n    const aiInteraction = await this.create({\n      userId: userId,\n      threadId: threadId ? threadId : `thread-${userId}`,\n      role: 'human',\n      message: dto.prompt,\n      contentType: '',\n      errorMessage: '',\n      modelUsed: '',\n      responseTimeMs: 0,\n      metadata: '',\n      isAutoApply: isAutoApply\n    });\n    const m = {\n      payload: {\n        aiInteractionId: aiInteraction.id,\n        moduleName: dto.moduleName\n      },\n      parentEntity: 'aiInteraction',\n      parentEntityId: aiInteraction.id,\n    };\n\n    const queueMessageId = await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');\n\n    return {\n      queueMessageId: queueMessageId,\n      aiInteractionId: aiInteraction.id\n    }\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<McpResponse> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException(ERROR_MESSAGES.PYTHON_EXECUTABLE_NOT_CONFIGURED);\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    // TODO: Refactor to use the command.service.ts instead...\n    return new Promise((resolve, reject) => {\n      this.logger.log(`Attempting to run command:`)\n      this.logger.log(`${pythonExecutable} ${mcpClient} \"${prompt}\"`);\n\n      const python = spawn(pythonExecutable, [mcpClient, `\"${prompt}\"`]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        this.logger.log(`Python script exited with code ${code}`);\n\n        if (code !== 0) {\n          this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);\n          return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));\n        }\n\n        try {\n          this.logger.log(`Python script exited with zero exit code: ${stdout}`);\n          const raw: McpResponse = JSON.parse(stdout);\n\n          // Sometimes the raw.response might not be a valid json\n          // TODO: examine the content type of the raw response..\n          // if (raw.content_type==='json') {\n          // }\n          let parsedResponse = raw.response;\n          try {\n            parsedResponse = JSON.parse(raw.response);\n          }\n          catch (ex) {\n            this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);\n            // raw.success = false\n          }\n          // Parse the response string into an object\n          // const parsedResponse = JSON.parse(raw.response);\n\n          // Replace the string with the parsed object\n          const enrichedRaw = {\n            ...raw,\n            response: parsedResponse,\n          };\n          // if (!raw.success) {\n          //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          // }\n          // let cleaned = raw.response.trim();\n\n          // Don't need to re-parse this...\n          // const parsed = JSON.parse(cleaned);\n          // resolve(cleaned);\n\n          resolve(enrichedRaw);\n        } catch (err: any) {\n          reject(new Error(`Mcp Invocation Failed: ${err.message}`));\n        }\n      });\n    });\n  }\n\n  cleanResponse(response: string) {\n    this.logger.log(`mcp server response is: ${response}`);\n\n    // Remove markdown-style code block wrapper\n    if (response.startsWith('```json')) {\n      response = response.replace(/^```json/, '').trim();\n    }\n    if (response.endsWith('```')) {\n      response = response.replace(/```$/, '').trim();\n    }\n    this.logger.log(`mcp server response after removing doc tags is: ${response}`);\n\n    return response;\n  }\n\n  async applySolidAiInteraction(id: number) {\n    // Fetch the aiInteraction\n    const aiInteraction = await this.findOne(id, {\n      populate: ['user']\n    });\n    if (!aiInteraction) {\n      const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${id}`\n\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(m);\n    }\n\n    // TODO: Validation: Check if JSON.parse(metadata).tools_invoked starts with solid_\n    let metadata: any = {};\n    try {\n      if (typeof aiInteraction.metadata === \"string\") {\n        metadata = JSON.parse(aiInteraction.metadata);\n      } else if (typeof aiInteraction.metadata === \"object\" && aiInteraction.metadata !== null) {\n        metadata = aiInteraction.metadata;\n      } else {\n        // optional fallback\n        metadata = {};\n      }\n    } catch (e) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(`Invalid metadata JSON: ${e}`);\n    }\n\n    const toolsInvoked = metadata['toolsInvoked'];\n    if (!toolsInvoked) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_SOLID_COMMAND);\n    }\n\n    // TODO: OPTIMISATION for chained tool invocation, for now we are assuming only 1 tool was used.\n    const toolInvoked = toolsInvoked[0];\n\n    // TODO: use the toolInvoked to identify a service using some convention.\n    // TODO: Eg. if toolInvoked is solid_create_module <> SolidCreateModuleMcpToolHandler ... create a factory class to do this mapping and identify the relevant provider. \n    const mcpToolHandler = this.mcpHandlerFactory.getInstance(toolInvoked);\n    if (!mcpToolHandler) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_MCP_HANDLER);\n    }\n\n    const handlerApplicationResponse = await mcpToolHandler.apply(aiInteraction);\n\n    // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)\n    // throw new Error('Method not implemented.');\n\n    // Mark the interaction as applied\n    await this.update(aiInteraction.id, { isApplied: true }, [], true);\n\n    return handlerApplicationResponse;\n  }\n}\n"]}
+{"version":3,"file":"ai-interaction.service.js","sourceRoot":"","sources":["../../src/services/ai-interaction.service.ts"],"names":[],"mappings":"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","sourcesContent":["import { BadRequestException, Injectable, Logger } from '@nestjs/common';\nimport { DiscoveryService, ModuleRef } from \"@nestjs/core\";\nimport { InjectEntityManager } from '@nestjs/typeorm';\nimport { EntityManager } from 'typeorm';\n\nimport { ConfigService } from '@nestjs/config';\nimport { spawn } from 'child_process';\nimport * as fs from 'fs/promises';\nimport { ERROR_MESSAGES } from 'src/constants/error-messages';\nimport { InvokeAiPromptDto } from 'src/dtos/invoke-ai-prompt.dto';\nimport { McpResponse, TriggerMcpClientOptions } from 'src/interfaces';\nimport { AiInteractionRepository } from 'src/repository/ai-interaction.repository';\nimport { CrudHelperService } from 'src/services/crud-helper.service';\nimport { CRUDService } from 'src/services/crud.service';\nimport { FileService } from 'src/services/file.service';\nimport { ModelMetadataService } from 'src/services/model-metadata.service';\nimport { ModuleMetadataService } from 'src/services/module-metadata.service';\nimport { AiInteraction } from '../entities/ai-interaction.entity';\nimport { McpHandlerFactory } from './genai/mcp-handlers/mcp-handler-factory.service';\nimport { PublisherFactory } from './queues/publisher-factory.service';\n\n@Injectable()\nexport class AiInteractionService extends CRUDService<AiInteraction> {\n  private readonly logger = new Logger(AiInteractionService.name);\n\n  constructor(\n    readonly modelMetadataService: ModelMetadataService,\n    readonly moduleMetadataService: ModuleMetadataService,\n    readonly configService: ConfigService,\n    readonly fileService: FileService,\n    readonly discoveryService: DiscoveryService,\n    readonly crudHelperService: CrudHelperService,\n    @InjectEntityManager()\n    readonly entityManager: EntityManager,\n    // @InjectRepository(AiInteraction, 'default')\n    // readonly repo: Repository<AiInteraction>,\n    readonly repo: AiInteractionRepository,\n    readonly moduleRef: ModuleRef,\n    readonly publisherFactory: PublisherFactory<TriggerMcpClientOptions>,\n    // readonly requestContextService: RequestContextService,\n    readonly mcpHandlerFactory: McpHandlerFactory,\n\n  ) {\n    super(modelMetadataService, moduleMetadataService, configService, fileService, discoveryService, crudHelperService, entityManager, repo, 'aiInteraction', 'solid-core', moduleRef);\n  }\n\n  async triggerMcpClientJob(dto: InvokeAiPromptDto, userId: number, isAutoApply: boolean = false, threadId: string = null): Promise<any> {\n    // const activeUser: ActiveUserData = this.requestContextService.getActiveUser();\n\n    const aiInteraction = await this.create({\n      userId: userId,\n      threadId: threadId ? threadId : `thread-${userId}`,\n      role: 'human',\n      message: dto.prompt,\n      contentType: '',\n      errorMessage: '',\n      modelUsed: '',\n      responseTimeMs: 0,\n      metadata: '',\n      isAutoApply: isAutoApply\n    });\n    const m = {\n      payload: {\n        aiInteractionId: aiInteraction.id,\n        moduleName: dto.moduleName\n      },\n      parentEntity: 'aiInteraction',\n      parentEntityId: aiInteraction.id,\n    };\n\n    const queueMessageId = await this.publisherFactory.publish(m, 'TriggerMcpClientPublisher');\n\n    return {\n      queueMessageId: queueMessageId,\n      aiInteractionId: aiInteraction.id\n    }\n  }\n\n  /**\n   * Runs the Python MCP client with a prompt and returns the parsed JSON embedded in the 'response'.\n   * @param prompt - The question or instruction to send to the MCP client.\n   * @returns The parsed object inside the 'response' field of the JSON output.\n   */\n  async runMcpPrompt(prompt: string): Promise<McpResponse> {\n    const pythonExecutable = process.env.MCP_PYTHON_EXECUTABLE;\n    const mcpClient = process.env.MCP_CLIENT;\n\n    // TODO: We can return an error if the above env variables are not properly setup...\n    if (!pythonExecutable || !mcpClient) {\n      throw new BadRequestException(ERROR_MESSAGES.PYTHON_EXECUTABLE_NOT_CONFIGURED);\n    }\n\n    // Check if both paths are valid and accessible\n    try {\n      const [pyStat, clientStat] = await Promise.all([\n        fs.stat(pythonExecutable),\n        fs.stat(mcpClient),\n      ]);\n\n      if (!pyStat.isFile()) {\n        throw new BadRequestException(`MCP_PYTHON_EXECUTABLE path is not a file: ${pythonExecutable}`);\n      }\n\n      if (!clientStat.isFile()) {\n        throw new BadRequestException(`MCP_CLIENT path is not a file: ${mcpClient}`);\n      }\n\n    } catch (err: any) {\n      throw new BadRequestException(`Invalid MCP executable or client path: ${err.message}`);\n    }\n\n    // TODO: Refactor to use the command.service.ts instead...\n    return new Promise((resolve, reject) => {\n      this.logger.log(`Attempting to run command:`)\n      this.logger.log(`${pythonExecutable} ${mcpClient} \"${prompt}\"`);\n\n      const python = spawn(pythonExecutable, [mcpClient, `\"${prompt}\"`]);\n\n      let stdout = '';\n      let stderr = '';\n\n      python.stdout.on('data', (data) => {\n        stdout += data.toString();\n      });\n\n      python.stderr.on('data', (data) => {\n        stderr += data.toString();\n      });\n\n      python.on('close', (code) => {\n        this.logger.log(`Python script exited with code ${code}`);\n\n        if (code !== 0) {\n          this.logger.error(`Python script exited with a non-zero exit code: ${stderr}`);\n          return reject(new Error(`Python script exited with a non-zero exit code: ${stderr}`));\n        }\n\n        try {\n          this.logger.log(`Python script exited with zero exit code: ${stdout}`);\n          const raw: McpResponse = JSON.parse(stdout);\n\n          // Sometimes the raw.response might not be a valid json\n          // TODO: examine the content type of the raw response..\n          // if (raw.content_type==='json') {\n          // }\n          let parsedResponse = raw.response;\n          try {\n            parsedResponse = JSON.parse(raw.response);\n          }\n          catch (ex) {\n            this.logger.warn(`Attempting to parse mcp client response assuming it is JSON, however it is not: ${parsedResponse}`);\n            // raw.success = false\n          }\n          // Parse the response string into an object\n          // const parsedResponse = JSON.parse(raw.response);\n\n          // Replace the string with the parsed object\n          const enrichedRaw = {\n            ...raw,\n            response: parsedResponse,\n          };\n          // if (!raw.success) {\n          //   return reject(new Error(`MCP error: ${raw.errors?.join(', ')}`));\n          // }\n          // let cleaned = raw.response.trim();\n\n          // Don't need to re-parse this...\n          // const parsed = JSON.parse(cleaned);\n          // resolve(cleaned);\n\n          resolve(enrichedRaw);\n        } catch (err: any) {\n          reject(new Error(`Mcp Invocation Failed: ${err.message}`));\n        }\n      });\n    });\n  }\n\n  cleanResponse(response: string) {\n    this.logger.log(`mcp server response is: ${response}`);\n\n    // Remove markdown-style code block wrapper\n    if (response.startsWith('```json')) {\n      response = response.replace(/^```json/, '').trim();\n    }\n    if (response.endsWith('```')) {\n      response = response.replace(/```$/, '').trim();\n    }\n    this.logger.log(`mcp server response after removing doc tags is: ${response}`);\n\n    return response;\n  }\n\n  async applySolidAiInteraction(id: number) {\n    // Fetch the aiInteraction\n    const aiInteraction = await this.findOne(id, {\n      populate: ['user']\n    });\n    if (!aiInteraction) {\n      const m = `Unable to identified the aiInteraction entry that triggered this job... using id: ${id}`\n\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(m);\n    }\n\n    // TODO: Validation: Check if JSON.parse(metadata).tools_invoked starts with solid_\n    let metadata: any = {};\n    try {\n      if (typeof aiInteraction.metadata === \"string\") {\n        metadata = JSON.parse(aiInteraction.metadata);\n      } else if (typeof aiInteraction.metadata === \"object\" && aiInteraction.metadata !== null) {\n        metadata = aiInteraction.metadata;\n      } else {\n        // optional fallback\n        metadata = {};\n      }\n    } catch (e) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(`Invalid metadata JSON: ${e}`);\n    }\n\n    const toolsInvoked = metadata['toolsInvoked'];\n    if (!toolsInvoked) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_SOLID_COMMAND);\n    }\n\n    // TODO: OPTIMISATION for chained tool invocation, for now we are assuming only 1 tool was used.\n    const toolInvoked = toolsInvoked[0];\n\n    // TODO: use the toolInvoked to identify a service using some convention.\n    // TODO: Eg. if toolInvoked is solid_create_module <> SolidCreateModuleMcpToolHandler ... create a factory class to do this mapping and identify the relevant provider. \n    const mcpToolHandler = this.mcpHandlerFactory.getInstance(toolInvoked);\n    if (!mcpToolHandler) {\n      // TODO: RESPONSE SHAPE ALERT Check if we want to control the shape of the response....\n      throw new Error(ERROR_MESSAGES.UNABLE_TO_RESOLVE_MCP_HANDLER);\n    }\n\n    const handlerApplicationResponse = await mcpToolHandler.apply(aiInteraction);\n\n    // TODO: This provider to implement an interface - IMcpToolResponseHandler ... apply(aiInteraction: AiInteraction)\n    // throw new Error('Method not implemented.');\n\n    // Mark the interaction as applied\n    await this.update(aiInteraction.id, { isApplied: true }, [], true);\n\n    return handlerApplicationResponse;\n  }\n}\n"]}

package/dist/services/authentication.service.d.ts

@@ -6,6 +6,7 @@ import commonConfig from 'src/config/common.config';
 import { jwtConfig } from 'src/config/jwt.config';
 import { CreateUserDto } from 'src/dtos/create-user.dto';
 import { MailFactory } from 'src/factories/mail.factory';
+import { UserRepository } from 'src/repository/user.repository';
 import { Msg91OTPService } from 'src/services/sms/Msg91OTPService';
 import { DataSource, Repository } from 'typeorm';
 import { iamConfig } from '../config/iam.config';
@@ -22,7 +23,6 @@ import { User } from '../entities/user.entity';
 import { ActiveUserData } from '../interfaces/active-user-data.interface';
 import { HashingService } from './hashing.service';
 import { RefreshTokenIdsStorageService } from './refresh-token-ids-storage.service';
-import { RequestContextService } from './request-context.service';
 import { RoleMetadataService } from './role-metadata.service';
 import { SettingService } from './setting.service';
 import { UserActivityHistoryService } from './user-activity-history.service';
@@ -43,10 +43,9 @@ export declare class AuthenticationService {
     private readonly roleMetadataService;
     private readonly commonConfiguration;
     private readonly userActivityHistoryService;
-    private readonly requestContextService;
     private readonly dataSource;
     private readonly logger;
-    constructor(userService: UserService, userRepository: Repository<User>, hashingService: HashingService, jwtService: JwtService, jwtConfiguration: ConfigType<typeof jwtConfig>, iamConfiguration: ConfigType<typeof iamConfig>, refreshTokenIdsStorage: RefreshTokenIdsStorageService, httpService: HttpService, mailServiceFactory: MailFactory, smsService: Msg91OTPService, eventEmitter: EventEmitter2, settingService: SettingService, roleMetadataService: RoleMetadataService, commonConfiguration: ConfigType<typeof commonConfig>, userActivityHistoryService: UserActivityHistoryService, requestContextService: RequestContextService, dataSource: DataSource);
+    constructor(userService: UserService, userRepository: UserRepository, hashingService: HashingService, jwtService: JwtService, jwtConfiguration: ConfigType<typeof jwtConfig>, iamConfiguration: ConfigType<typeof iamConfig>, refreshTokenIdsStorage: RefreshTokenIdsStorageService, httpService: HttpService, mailServiceFactory: MailFactory, smsService: Msg91OTPService, eventEmitter: EventEmitter2, settingService: SettingService, roleMetadataService: RoleMetadataService, commonConfiguration: ConfigType<typeof commonConfig>, userActivityHistoryService: UserActivityHistoryService, dataSource: DataSource);
     private getConfig;
     private getCompanyLogo;
     resolveUser(username: string, email: string): Promise<User>;
@@ -147,7 +146,7 @@ export declare class AuthenticationService {
         };
     }>;
     private isPasswordlessRegistrationEnabled;
-    logout(): Promise<{
+    logout(refreshToken: string): Promise<{
         message: string;
     }>;
     activateUser(userId: number): Promise<void>;

package/dist/services/authentication.service.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"authentication.service.d.ts","sourceRoot":"","sources":["../../src/services/authentication.service.ts"],"names":[],"mappings":"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"}

package/dist/services/authentication.service.js

@@ -29,6 +29,7 @@ const jwt_config_1 = require("../config/jwt.config");
 const error_messages_1 = require("../constants/error-messages");
 const success_messages_1 = require("../constants/success-messages");
 const mail_factory_1 = require("../factories/mail.factory");
+const user_repository_1 = require("../repository/user.repository");
 const Msg91OTPService_1 = require("./sms/Msg91OTPService");
 const typeorm_2 = require("typeorm");
 const uuid_1 = require("uuid");
@@ -38,7 +39,6 @@ const user_entity_1 = require("../entities/user.entity");
 const interfaces_1 = require("../interfaces");
 const hashing_service_1 = require("./hashing.service");
 const refresh_token_ids_storage_service_1 = require("./refresh-token-ids-storage.service");
-const request_context_service_1 = require("./request-context.service");
 const role_metadata_service_1 = require("./role-metadata.service");
 const setting_service_1 = require("./setting.service");
 const user_activity_history_service_1 = require("./user-activity-history.service");
@@ -50,7 +50,7 @@ var LoginProvider;
     LoginProvider["OTP"] = "otp";
 })(LoginProvider || (LoginProvider = {}));
 let AuthenticationService = AuthenticationService_1 = class AuthenticationService {
-    constructor(userService, userRepository, hashingService, jwtService, jwtConfiguration, iamConfiguration, refreshTokenIdsStorage, httpService, mailServiceFactory, smsService, eventEmitter, settingService, roleMetadataService, commonConfiguration, userActivityHistoryService, requestContextService, dataSource) {
+    constructor(userService, userRepository, hashingService, jwtService, jwtConfiguration, iamConfiguration, refreshTokenIdsStorage, httpService, mailServiceFactory, smsService, eventEmitter, settingService, roleMetadataService, commonConfiguration, userActivityHistoryService, dataSource) {
         this.userService = userService;
         this.userRepository = userRepository;
         this.hashingService = hashingService;
@@ -66,7 +66,6 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
         this.roleMetadataService = roleMetadataService;
         this.commonConfiguration = commonConfiguration;
         this.userActivityHistoryService = userActivityHistoryService;
-        this.requestContextService = requestContextService;
         this.dataSource = dataSource;
         this.logger = new common_1.Logger(AuthenticationService_1.name);
     }
@@ -839,16 +838,19 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
     async isPasswordlessRegistrationEnabled() {
         return this.settingService.getConfigValue('passwordlessRegistration');
     }
-    async logout() {
+    async logout(refreshToken) {
         try {
-            const activeUser = this.requestContextService.getActiveUser();
-            const userId = activeUser?.sub;
+            const payload = this.jwtService.decode(refreshToken);
+            if (!payload || !payload.sub) {
+                throw new common_1.UnauthorizedException(error_messages_1.ERROR_MESSAGES.INVALID_REFRESH_TOKEN);
+            }
+            const userId = payload.sub;
+            await this.refreshTokenIdsStorage.invalidate(userId);
             const user = await this.userRepository.findOne({
                 where: {
                     id: userId,
                 }
             });
-            await this.refreshTokenIdsStorage.invalidate(userId);
             await this.userActivityHistoryService.logEvent('logout', user);
             return { message: success_messages_1.SUCCESS_MESSAGES.LOGOUT_SUCCESS };
         }
@@ -892,13 +894,12 @@ let AuthenticationService = AuthenticationService_1 = class AuthenticationServic
 exports.AuthenticationService = AuthenticationService;
 exports.AuthenticationService = AuthenticationService = AuthenticationService_1 = __decorate([
     (0, common_1.Injectable)(),
-    __param(1, (0, typeorm_1.InjectRepository)(user_entity_1.User)),
     __param(4, (0, common_1.Inject)(jwt_config_1.jwtConfig.KEY)),
     __param(5, (0, common_1.Inject)(iam_config_1.iamConfig.KEY)),
     __param(13, (0, common_1.Inject)(common_config_1.default.KEY)),
-    __param(16, (0, typeorm_1.InjectDataSource)()),
+    __param(15, (0, typeorm_1.InjectDataSource)()),
     __metadata("design:paramtypes", [user_service_1.UserService,
-        typeorm_2.Repository,
+        user_repository_1.UserRepository,
         hashing_service_1.HashingService,
         jwt_1.JwtService, void 0, void 0, refresh_token_ids_storage_service_1.RefreshTokenIdsStorageService,
         axios_1.HttpService,
@@ -907,7 +908,6 @@ exports.AuthenticationService = AuthenticationService = AuthenticationService_1
         event_emitter_1.EventEmitter2,
         setting_service_1.SettingService,
         role_metadata_service_1.RoleMetadataService, void 0, user_activity_history_service_1.UserActivityHistoryService,
-        request_context_service_1.RequestContextService,
         typeorm_2.DataSource])
 ], AuthenticationService);
 function parseUniqueConstraintError(detail) {