Fix failing tests

javaBin · Nov 26, 2023 · 45970c3 · 45970c3
1 parent b853c2f
commit 45970c3
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 7 deletions.
diff --git a/src/main/kotlin/no/java/partner/Application.kt b/src/main/kotlin/no/java/partner/Application.kt
@@ -51,10 +51,8 @@ fun Application.module() {
         version = VersionConfig.version,
         port = environment.config.property("ktor.deployment.port").getString().toInt(),
     )
-    //if (environment.config.property("jwt.security_on").getString() != "false") {
-        configureSecurity(
-            httpClient,
-        )
-    //}
+    configureSecurity(
+        httpClient,
+    )
     configureServices(dataSource)
 }
diff --git a/src/main/kotlin/no/java/partner/plugins/ListRouting.kt b/src/main/kotlin/no/java/partner/plugins/ListRouting.kt
@@ -20,7 +20,7 @@ import no.java.partner.plugins.openapi.ListRoutingDoc
 import no.java.partner.service.ListService
 
 fun Application.configureListRouting(service: ListService) {
-    val optionalSec = (environment.config.property("jwt.security_on").getString() != "false")
+    val optionalSec = (environment.config.property("jwt.security_on").getString() != "true")
     routing {
         authenticate("auth-jwt", optional = optionalSec) {
             route("/list") {

diff --git a/src/main/kotlin/no/java/partner/plugins/PartnerRouting.kt b/src/main/kotlin/no/java/partner/plugins/PartnerRouting.kt
@@ -20,7 +20,7 @@ import no.java.partner.service.PartnerService
 
 
 fun Application.configurePartnerRouting(service: PartnerService) {
-    val optionalSec = (environment.config.property("jwt.security_on").getString() != "false")
+    val optionalSec = (environment.config.property("jwt.security_on").getString() != "true")
     routing {
         authenticate("auth-jwt", optional = optionalSec) {
             route("/partner") {

diff --git a/src/test/kotlin/no/java/partner/TestApplicationBuilder.kt b/src/test/kotlin/no/java/partner/TestApplicationBuilder.kt
@@ -19,6 +19,7 @@ val appConfig = HoconApplicationConfig(
     ConfigFactory.parseMap(
         mapOf(
             "jwt" to mapOf(
+                "security_on" to "true",
                 "secret" to "secret",
                 "issuer" to "issuer",
                 "audience" to "audience",