Merge branch 'SKBotNL:main' into main

build.gradle.kts

@@ -4,8 +4,8 @@ plugins {
     kotlin("jvm")
     kotlin("plugin.allopen")
     id("com.google.devtools.ksp") version "2.3.12"
-    id("io.micronaut.application") version "4.6.2"
-    id("io.micronaut.aot") version "4.6.2"
+    id("io.micronaut.application") version "5.0.2"
+    id("io.micronaut.aot") version "5.0.2"
     id("com.gradleup.shadow") version "9.6.1"
     id("com.google.protobuf") version "0.10.0"
 }
@@ -25,6 +25,7 @@ dependencies {
     ksp("io.micronaut.security:micronaut-security-annotations")
     ksp("io.micronaut.serde:micronaut-serde-processor")
     ksp("io.micronaut.validation:micronaut-validation-processor")
+    ksp("org.slf4j:slf4j-nop:2.0.19")
     implementation("com.google.protobuf:protobuf-kotlin:4.36.2")
     implementation("io.micronaut.validation:micronaut-validation")
     implementation("io.grpc:grpc-protobuf:1.84.0")
@@ -70,7 +71,7 @@ application {
 }
 
 java {
-    sourceCompatibility = JavaVersion.toVersion("17")
+    sourceCompatibility = JavaVersion.toVersion("25")
 }
 
 graalvmNative.toolchainDetection = false

gradle.properties

@@ -1,4 +1,4 @@
-micronautVersion=4.10.18
+micronautVersion=5.1.5
 kotlinVersion=2.4.20
 org.gradle.jvmargs=-Xmx4096M
 ksp.incremental=false

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-9.7.1-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-9.3.1-bin.zip
 networkTimeout=10000
 retries=0
 retryBackOffMs=500

src/main/kotlin/net/trueog/staffauth/controller/SetupController.kt

@@ -36,8 +36,9 @@ open class SetupController(
     }
 
     @Post("/minecraft-check")
-    suspend fun minecraftCheck(@Body tokenDto: TokenDto, request: HttpRequest<*>): Boolean {
-        return setupService.minecraftCheck(tokenDto.token, clientAddressResolver.resolve(request))
+    suspend fun minecraftCheck(@Body tokenDto: TokenDto, request: HttpRequest<*>): HttpResponse<Boolean> {
+        val ip = clientAddressResolver.resolve(request) ?: return HttpResponse.badRequest()
+        return HttpResponse.ok(setupService.minecraftCheck(tokenDto.token, ip))
     }
 
     @Post("/totp-setup")

src/main/kotlin/net/trueog/staffauth/controller/oauth/LoginController.kt

@@ -34,26 +34,30 @@ class LoginController(
         loginService.loginData(loginDataRequestDto.loginChallenge)
 
     @Post("/credentials")
-    suspend fun credentials(@Body credentialsDto: CredentialsDto, request: HttpRequest<*>) {
+    suspend fun credentials(@Body credentialsDto: CredentialsDto, request: HttpRequest<*>): HttpResponse<Unit> {
+        val ip = clientAddressResolver.resolve(request) ?: return HttpResponse.badRequest()
         loginService.usernamePassword(
             credentialsDto.loginChallenge,
             credentialsDto.username,
             credentialsDto.password,
-            clientAddressResolver.resolve(request)
+            ip
         )
+        return HttpResponse.ok()
     }
 
     @Post("/minecraftcheck")
-    suspend fun minecraftCheck(@Body minecraftCheckDto: MinecraftCheckDto, request: HttpRequest<*>): Boolean {
-        return loginService.minecraftCheck(minecraftCheckDto.loginChallenge, clientAddressResolver.resolve(request))
+    suspend fun minecraftCheck(@Body minecraftCheckDto: MinecraftCheckDto, request: HttpRequest<*>): HttpResponse<Boolean> {
+        val ip = clientAddressResolver.resolve(request) ?: return HttpResponse.badRequest()
+        return HttpResponse.ok(loginService.minecraftCheck(minecraftCheckDto.loginChallenge, ip))
     }
 
     @Post("/totp")
-    suspend fun totp(@Body totpDto: TotpDto, request: HttpRequest<*>): String {
-        loginService.totp(totpDto.loginChallenge, totpDto.code, clientAddressResolver.resolve(request))
+    suspend fun totp(@Body totpDto: TotpDto, request: HttpRequest<*>): HttpResponse<String> {
+        val ip = clientAddressResolver.resolve(request) ?: return HttpResponse.badRequest()
+        loginService.totp(totpDto.loginChallenge, totpDto.code, ip)
         val redirectUrl =
-            loginService.accept(totpDto.loginChallenge, totpDto.rememberMe, clientAddressResolver.resolve(request))
-        return redirectUrl
+            loginService.accept(totpDto.loginChallenge, totpDto.rememberMe, ip)
+        return HttpResponse.ok(redirectUrl)
     }
 
     @Error(exception = IncorrectUsernameOrPasswordException::class)