From a9173f69888c9a7719b93588c0282c91a9e9129c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Dominique=20Eifl=C3=A4nder?=
 <dominique.eiflaender@knecon.com>
Date: Mon, 24 Jun 2024 13:20:20 +0200
Subject: [PATCH] RED-9352: Fixed security config

---
 .../llm/service/queue/MessageHandler.java     | 20 +++++++------------
 .../llm/service/services/LlmService.java      |  8 ++++----
 src/main/resources/application.yaml           |  2 +-
 3 files changed, 12 insertions(+), 18 deletions(-)

diff --git a/src/main/java/com/knecon/fforesight/llm/service/queue/MessageHandler.java b/src/main/java/com/knecon/fforesight/llm/service/queue/MessageHandler.java
index 9b109f7..1b74da1 100644
--- a/src/main/java/com/knecon/fforesight/llm/service/queue/MessageHandler.java
+++ b/src/main/java/com/knecon/fforesight/llm/service/queue/MessageHandler.java
@@ -1,12 +1,8 @@
 package com.knecon.fforesight.llm.service.queue;
 
-import org.springframework.amqp.core.Message;
-import org.springframework.amqp.rabbit.annotation.RabbitHandler;
-import org.springframework.amqp.rabbit.annotation.RabbitListener;
 import org.springframework.stereotype.Service;
 
 import lombok.RequiredArgsConstructor;
-import lombok.SneakyThrows;
 import lombok.extern.slf4j.Slf4j;
 
 @Slf4j
@@ -14,14 +10,12 @@ import lombok.extern.slf4j.Slf4j;
 @RequiredArgsConstructor
 public class MessageHandler {
 
-
-
-    @SneakyThrows
-    @RabbitHandler
-    @RabbitListener(queues = "#{llmServiceSettings.getRequestQueueName()}")
-    public void receiveIndexingRequest(Message message) {
-
-        // TODO: Do something.
-    }
+//    @SneakyThrows
+//    @RabbitHandler
+//    @RabbitListener(queues = "#{llmServiceSettings.getRequestQueueName()}")
+//    public void receiveIndexingRequest(Message message) {
+//
+//        // TODO: Do something.
+//    }
 
 }
diff --git a/src/main/java/com/knecon/fforesight/llm/service/services/LlmService.java b/src/main/java/com/knecon/fforesight/llm/service/services/LlmService.java
index 3de8f16..e8e934e 100644
--- a/src/main/java/com/knecon/fforesight/llm/service/services/LlmService.java
+++ b/src/main/java/com/knecon/fforesight/llm/service/services/LlmService.java
@@ -53,18 +53,18 @@ public class LlmService {
         ChatCompletionsOptions options = new ChatCompletionsOptions(chatMessages);
         options.setStream(true);
         Flux<ChatCompletions> chatCompletions = client.getChatCompletionsStream(settings.getModel(), options);
+        String userId = KeycloakSecurity.getUserId();
         chatCompletions.subscribe(chatCompletion -> {
-            sendWebsocketEvent(chatCompletion.getChoices()
+            sendWebsocketEvent(userId, chatCompletion.getChoices()
                                        .get(0).getDelta().getContent());
 
         });
     }
 
 
-    private void sendWebsocketEvent(String token) {
+    private void sendWebsocketEvent(String userId, String token) {
 
-        System.out.println("/topic/" + TenantContext.getTenantId() + "/chat-events/" + KeycloakSecurity.getUserId());
-        websocketTemplate.convertAndSend("/topic/" + TenantContext.getTenantId() + "/chat-events/" + KeycloakSecurity.getUserId(), new ChatEvent(token));
+        websocketTemplate.convertAndSend("/topic/" + TenantContext.getTenantId() + "/chat-events/" + userId, new ChatEvent(token));
     }
 
 }
diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml
index 7cfb095..3db17a4 100644
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -28,7 +28,7 @@ fforesight:
   llm-service:
     base-path: '/api/llm'
   keycloak:
-    ignored-endpoints: [ '/actuator/health', '/actuator/health/**', '/api/llm', '/api/llm/', '/internal/**', '/api/llm/docs/**', '/api/llm/docs', '/api/llm/chat-async', '/api/llm/llm-websocket' ]
+    ignored-endpoints: [ '/actuator/health', '/actuator/health/**', '/api/llm', '/api/llm/', '/internal/**', '/api/llm/docs/**', '/api/llm/docs', '/api/llm/llm-websocket' ]
     enabled: true
   springdoc:
     base-path: '/api/llm'