Downgraded spring boot to support open api docs

Several fixes

Author: Cors00

README.md

@@ -16,8 +16,8 @@ cd ./code/kafka-web-gateway/
 
 * PostgreSQL Database
 * 2 Gateway's
-* 3 Apache Kafka's
-* 3 ZooKeeper's
+* 3 Apache Kafka Servers/Nodes
+* 3 ZooKeeper's Servers
 * Nginx
 
 ```

code/kafka-web-gateway/build.gradle.kts

@@ -1,7 +1,7 @@
 import org.jetbrains.kotlin.gradle.tasks.KotlinCompile
 
 plugins {
-    id("org.springframework.boot") version "3.0.6"
+    id("org.springframework.boot") version "2.7.12"
     id("io.spring.dependency-management") version "1.1.0"
     kotlin("jvm") version "1.7.22"
     kotlin("plugin.spring") version "1.7.22"
@@ -28,6 +28,9 @@ dependencies {
     annotationProcessor("org.springframework.boot:spring-boot-configuration-processor")
     runtimeOnly("org.postgresql:postgresql")
 
+    implementation("org.springdoc:springdoc-openapi-ui:1.6.15")
+    runtimeOnly("org.springdoc:springdoc-openapi-kotlin:1.6.15")
+
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.kafka:spring-kafka-test")
 }

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/auth/AuthenticationProvider.kt

@@ -1,6 +1,8 @@
 package com.isel.ps.gateway.auth
 
+import com.isel.ps.gateway.model.Client
+
 interface AuthenticationProvider {
-    fun validateToken(token: String): String?
+    fun validateToken(token: String): Client?
 }
 

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/auth/HandlerAuthenticationInterceptor.kt

@@ -2,10 +2,10 @@ package com.isel.ps.gateway.auth
 
 import com.isel.ps.gateway.model.AdminToken
 import com.isel.ps.gateway.service.AdminService
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import org.springframework.stereotype.Component
 import org.springframework.web.servlet.HandlerInterceptor
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
 
 @Component
 class HandlerAuthenticationInterceptor(val adminService: AdminService) : HandlerInterceptor {

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/auth/HttpAuthenticationProvider.kt

@@ -1,29 +1,39 @@
 package com.isel.ps.gateway.auth
 
 import com.fasterxml.jackson.databind.ObjectMapper
+import com.isel.ps.gateway.model.Client
 import org.springframework.http.HttpHeaders
 import org.springframework.http.HttpStatus
 import org.springframework.web.client.RestTemplate
 
 class HttpAuthenticationProvider(private val authUrl: String, private val restTemplate: RestTemplate = RestTemplate()) :
     AuthenticationProvider {
-    override fun validateToken(token: String): String? {
+    override fun validateToken(token: String): Client? {
         val headers = HttpHeaders()
         headers.setBearerAuth(token)
 
         val response = restTemplate.getForEntity(authUrl, Void::class.java)
 
         return if (response.statusCode === HttpStatus.OK) {
-            extractUserFromRequestBody(response.body as String)
+            val clientId = extractClientFromRequestBody(response.body as String?) ?: return null
+            Client(clientId)
         } else {
-            return null
+            null
         }
     }
 
-    private fun extractUserFromRequestBody(requestBody: String): String {
-        val objectMapper = ObjectMapper()
-        val jsonNode = objectMapper.readTree(requestBody) // Parse request body JSON
-        return jsonNode["user"].asText() // Extract "user" parameter as string
+    private fun extractClientFromRequestBody(requestBody: String?): Long? {
+        if (requestBody == null) {
+            return null
+        }
+
+        return try {
+            val objectMapper = ObjectMapper()
+            val jsonNode = objectMapper.readTree(requestBody) // Parse request body JSON
+            jsonNode["clientId"].asLong() // Extract "user" parameter as string
+        } catch (ex: Exception) {
+            null
+        }
     }
 }
 

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/config/GatewayConfig.kt

@@ -2,10 +2,10 @@ package com.isel.ps.gateway.config
 
 import com.isel.ps.gateway.model.Gateway
 import com.isel.ps.gateway.service.GatewayService
-import jakarta.annotation.PostConstruct
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Component
+import javax.annotation.PostConstruct
 
 @Component
 class GatewayConfig(private val gatewayService: GatewayService) {

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/controller/AdminController.kt

@@ -5,10 +5,10 @@ import com.isel.ps.gateway.model.Admin
 import com.isel.ps.gateway.model.Err
 import com.isel.ps.gateway.service.AdminService
 import com.isel.ps.gateway.utils.Result
-import jakarta.servlet.http.HttpServletRequest
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import javax.servlet.http.HttpServletRequest
 
 @RestController
 @RequestMapping("/api/admin")

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/controller/SettingController.kt

@@ -7,10 +7,10 @@ import com.isel.ps.gateway.model.Setting
 import com.isel.ps.gateway.service.AdminService
 import com.isel.ps.gateway.service.SettingService
 import com.isel.ps.gateway.utils.Result
-import jakarta.servlet.http.HttpServletRequest
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
 import org.springframework.web.bind.annotation.*
+import javax.servlet.http.HttpServletRequest
 
 @RestController
 @RequestMapping("/api/setting")

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/logging/LogInterceptor.kt

@@ -1,16 +1,16 @@
 package com.isel.ps.gateway.logging
 
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import org.springframework.http.HttpMethod
 import org.springframework.stereotype.Component
 import org.springframework.web.servlet.HandlerInterceptor
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
 
 @Component
 class LogInterceptor(val logService: LoggingService) : HandlerInterceptor {
 
     override fun preHandle(request: HttpServletRequest, response: HttpServletResponse, handler: Any): Boolean {
-        if (request.method == HttpMethod.GET.name() || request.method == HttpMethod.DELETE.name() || request.method == HttpMethod.PUT.name()) {
+        if (request.method == HttpMethod.GET.name || request.method == HttpMethod.DELETE.name || request.method == HttpMethod.PUT.name) {
             logService.displayReq(request, null)
         }
         return true

code/kafka-web-gateway/src/main/kotlin/com/isel/ps/gateway/logging/LoggingService.kt

@@ -1,11 +1,11 @@
 package com.isel.ps.gateway.logging
 
-import jakarta.servlet.http.HttpServletRequest
-import jakarta.servlet.http.HttpServletResponse
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 import java.util.*
+import javax.servlet.http.HttpServletRequest
+import javax.servlet.http.HttpServletResponse
 
 @Service
 class LoggingService {