Decouple alleVarsler route fra andre varsler route, da alleVarsler skal bruke tokenX

Author: Amirhlotfi

src/main/kotlin/no/nav/tms/varsel/api/varsel/varselRoutes.kt

@@ -8,10 +8,8 @@ import io.ktor.server.response.respond
 import io.ktor.server.routing.Route
 import io.ktor.server.routing.get
 import io.ktor.server.routing.post
-import io.ktor.util.pipeline.PipelineContext
 import kotlinx.serialization.Serializable
 import no.nav.tms.token.support.idporten.sidecar.user.IdportenUserFactory
-import no.nav.tms.token.support.tokenx.validation.user.TokenXUser
 import no.nav.tms.token.support.tokenx.validation.user.TokenXUserFactory
 
 fun Route.varsel(
@@ -35,15 +33,6 @@ fun Route.varsel(
         }
     }
 
-    get("alle"){
-        varselConsumer.getAlleVarsler(
-            userToken = call.tokenXUser.tokenString,
-            preferertSpraak = call.request.preferertSpraak
-        ).let { alleVarsler ->
-            call.respond(HttpStatusCode.OK, alleVarsler)
-        }
-    }
-
     get("antall/aktive") {
         varselConsumer.getAktiveVarsler(
             userToken = call.userToken,
@@ -66,6 +55,19 @@ fun Route.varsel(
     }
 }
 
+fun Route.alleVarsler(
+    varselConsumer: VarselConsumer
+) {
+    get("alle"){
+        varselConsumer.getAlleVarsler(
+            userToken = call.tokenXUser.tokenString,
+            preferertSpraak = call.request.preferertSpraak
+        ).let { alleVarsler ->
+            call.respond(HttpStatusCode.OK, alleVarsler)
+        }
+    }
+}
+
 private val ApplicationCall.userToken get() = IdportenUserFactory.createIdportenUser(this).tokenString
 private val ApplicationCall.tokenXUser get() = TokenXUserFactory.createTokenXUser(this)
 

src/main/kotlin/no/nav/tms/varsel/api/varselApi.kt

@@ -27,6 +27,7 @@ import no.nav.tms.varsel.api.varsel.VarselConsumer
 import no.nav.tms.varsel.api.varsel.bjellevarsler
 import no.nav.tms.varsel.api.varsel.varsel
 import no.nav.tms.varsel.api.varsel.varselbjelle
+import no.nav.tms.varsel.api.varsel.alleVarsler
 
 fun Application.varselApi(
     corsAllowedOrigins: String,
@@ -81,6 +82,7 @@ fun Application.varselApi(
         }
         authenticate(TokenXAuthenticator.name) {
             bjellevarsler(varselConsumer)
+            alleVarsler(varselConsumer)
         }
 
     }