Skip to content

Commit 0b0f34e

Browse files
chris-santachris-santa
committed
Tester ktor 3/
1 parent 29a9099 commit 0b0f34e

File tree

7 files changed

+36
-40
lines changed

7 files changed

+36
-40
lines changed

‎buildSrc/src/main/kotlin/default/dependencies.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -109,7 +109,7 @@ interface KotliQueryDefaults: DependencyGroup {
109109
}
110110

111111
object KtorDefaults {
112-
val version get() = "2.3.12"
112+
val version get() = "3.0.1"
113113
val groupId get() = "io.ktor"
114114

115115
interface ServerDefaults: DependencyGroup {
@@ -210,7 +210,7 @@ interface TestContainersDefaults: DependencyGroup {
210210

211211
interface TmsCommonLibDefaults: DependencyGroup {
212212
override val groupId get() = "no.nav.tms.common"
213-
override val version get() = "4.0.2"
213+
override val version get() = "5.0.0"
214214

215215
val metrics get() = dependency("metrics")
216216
val observability get() = dependency("observability")
@@ -228,7 +228,7 @@ interface TmsKafkaToolsDefaults: DependencyGroup {
228228

229229
interface TmsKtorTokenSupportDefaults: DependencyGroup {
230230
override val groupId get() = "no.nav.tms.token.support"
231-
override val version get() = "4.1.2"
231+
override val version get() = "5.0.0"
232232

233233
val azureExchange get() = dependency("azure-exchange")
234234
val azureValidation get() = dependency("azure-validation")

‎src/main/kotlin/no/nav/tms/varsel/api/Application.kt‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
package no.nav.tms.varsel.api
22

3-
import io.ktor.server.engine.applicationEngineEnvironment
4-
import io.ktor.server.engine.connector
5-
import io.ktor.server.engine.embeddedServer
3+
import io.ktor.server.engine.*
64
import io.ktor.server.netty.Netty
75
import no.nav.tms.token.support.tokendings.exchange.TokendingsServiceBuilder
86
import no.nav.tms.varsel.api.varsel.VarselConsumer
@@ -14,23 +12,23 @@ fun main() {
1412

1513
embeddedServer(
1614
factory = Netty,
17-
environment = applicationEngineEnvironment {
18-
rootPath = "tms-varsel-api"
19-
module {
20-
varselApi(
21-
corsAllowedOrigins = environment.corsAllowedOrigins,
22-
httpClient = httpClient,
23-
varselConsumer = VarselConsumer(
24-
client = httpClient,
25-
varselAuthorityUrl = "http://tms-varsel-authority",
26-
varselAuthorityClientId = environment.eventhandlerClientId,
27-
tokendingsService = TokendingsServiceBuilder.buildTokendingsService(),
28-
)
29-
)
30-
}
15+
configure = {
3116
connector {
3217
port = 8080
3318
}
19+
},
20+
module = {
21+
rootPath = "tms-varsel-api"
22+
varselApi(
23+
corsAllowedOrigins = environment.corsAllowedOrigins,
24+
httpClient = httpClient,
25+
varselConsumer = VarselConsumer(
26+
client = httpClient,
27+
varselAuthorityUrl = "http://tms-varsel-authority",
28+
varselAuthorityClientId = environment.eventhandlerClientId,
29+
tokendingsService = TokendingsServiceBuilder.buildTokendingsService(),
30+
)
31+
)
3432
}
3533
).start(wait = true)
3634
}

‎src/main/kotlin/no/nav/tms/varsel/api/varsel/varselbjelleRoutes.kt‎

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,9 +5,7 @@ import io.ktor.server.application.ApplicationCall
55
import io.ktor.server.application.call
66
import io.ktor.server.request.*
77
import io.ktor.server.response.respond
8-
import io.ktor.server.routing.Route
9-
import io.ktor.server.routing.get
10-
import io.ktor.server.routing.route
8+
import io.ktor.server.routing.*
119
import io.ktor.util.pipeline.PipelineContext
1210
import no.nav.tms.token.support.idporten.sidecar.user.IdportenUser
1311
import no.nav.tms.token.support.idporten.sidecar.user.IdportenUserFactory
@@ -40,8 +38,8 @@ fun Route.bjellevarsler(varselConsumer: VarselConsumer) {
4038

4139
private val ApplicationRequest.preferertSpraak get() = queryParameters["preferert_spraak"]?.lowercase()
4240

43-
private val PipelineContext<Unit, ApplicationCall>.idportenUser: IdportenUser
41+
private val RoutingContext.idportenUser: IdportenUser
4442
get() = IdportenUserFactory.createIdportenUser(this.call)
4543

46-
private val PipelineContext<Unit, ApplicationCall>.tokenxUser: TokenXUser
44+
private val RoutingContext.tokenxUser: TokenXUser
4745
get() = TokenXUserFactory.createTokenXUser(this.call)

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ fun Application.varselApi(
9393
typealias TokenXLoa = no.nav.tms.token.support.tokenx.validation.LevelOfAssurance
9494

9595
private fun Application.configureShutdownHook(httpClient: HttpClient) {
96-
environment.monitor.subscribe(ApplicationStopping) {
96+
monitor.subscribe(ApplicationStopping) {
9797
httpClient.close()
9898
}
9999
}

‎src/test/kotlin/no/nav/tms/varsel/api/VarselbjelleRoutesTest.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class VarselbjelleRoutesTest {
3030
setupVarselAuthority(aktiveVarslerFromEventHandler = varsler)
3131
mockVarselApi(
3232
varselConsumer = setupVarselConsumer(),
33-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
33+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
3434
)
3535

3636
client.get("/varselbjelle/varsler").apply {
@@ -67,7 +67,7 @@ class VarselbjelleRoutesTest {
6767
setupVarselAuthority(aktiveVarslerFromEventHandler = varsler)
6868
mockVarselApi(
6969
varselConsumer = setupVarselConsumer(),
70-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
70+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
7171
)
7272

7373
client.get("/bjellevarsler").apply {
@@ -96,7 +96,7 @@ class VarselbjelleRoutesTest {
9696
setupVarselAuthority(expectedSpraakkodeParam = "en")
9797
mockVarselApi(
9898
varselConsumer = setupVarselConsumer(),
99-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
99+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
100100
)
101101

102102
client.get("/bjellevarsler?preferert_spraak=en").apply {

‎src/test/kotlin/no/nav/tms/varsel/api/`VarselAuthority.Varsel`RoutesTest.kt‎

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ class VarselRoutesTest {
5656

5757
mockVarselApi(
5858
varselConsumer = setupVarselConsumer(),
59-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
59+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
6060
)
6161

6262
val response = client.get("/alle")
@@ -83,7 +83,7 @@ class VarselRoutesTest {
8383
setupVarselAuthority(inaktiveVarslerFromEventHandler = varsler)
8484
mockVarselApi(
8585
varselConsumer = setupVarselConsumer(),
86-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
86+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
8787
)
8888

8989
val response = client.get("/inaktive")
@@ -127,7 +127,7 @@ class VarselRoutesTest {
127127
setupVarselAuthority(aktiveVarslerFromEventHandler = varsler)
128128
mockVarselApi(
129129
varselConsumer = setupVarselConsumer(),
130-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
130+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
131131
)
132132

133133
val response = client.get("/aktive")
@@ -160,7 +160,7 @@ class VarselRoutesTest {
160160
)
161161
mockVarselApi(
162162
varselConsumer = setupVarselConsumer(),
163-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_3)
163+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.SUBSTANTIAL)
164164
)
165165

166166
val response = client.get("/aktive")
@@ -195,7 +195,7 @@ class VarselRoutesTest {
195195
setupVarselAuthority(aktiveVarslerFromEventHandler = varsler)
196196
mockVarselApi(
197197
varselConsumer = setupVarselConsumer(),
198-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
198+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
199199
)
200200

201201
val response = client.get("/antall/aktive")
@@ -230,7 +230,7 @@ class VarselRoutesTest {
230230

231231
mockVarselApi(
232232
varselConsumer = setupVarselConsumer(),
233-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
233+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
234234
)
235235
client.post("/beskjed/inaktiver") {
236236
header(HttpHeaders.ContentType, ContentType.Application.Json)
@@ -249,7 +249,7 @@ class VarselRoutesTest {
249249
setupVarselAuthority(aktiveVarslerFromEventHandler = listOf(beskjed), inaktiveVarslerFromEventHandler = listOf(oppgave))
250250
mockVarselApi(
251251
varselConsumer = setupVarselConsumer(),
252-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
252+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
253253
)
254254

255255
val aktiveVarsler: AktiveVarsler = client.get("/aktive").bodyFromJson()
@@ -302,9 +302,11 @@ class VarselRoutesTest {
302302
}
303303
}
304304

305+
306+
305307
mockVarselApi(
306308
varselConsumer = setupVarselConsumer(),
307-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
309+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
308310
)
309311
client.post("/beskjed/inaktiver") {
310312
header(HttpHeaders.ContentType, ContentType.Application.Json)
@@ -320,7 +322,7 @@ class VarselRoutesTest {
320322
setupVarselAuthority(expectedSpraakkodeParam = "en")
321323
mockVarselApi(
322324
varselConsumer = setupVarselConsumer(),
323-
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.LEVEL_4)
325+
authMockInstaller = installAuthenticatedMock(LevelOfAssurance.HIGH)
324326
)
325327

326328
client.get("/aktive?preferert_spraak=en").apply {

‎src/test/kotlin/no/nav/tms/varsel/api/varselTestData.kt‎

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,5 @@ fun installAuthenticatedMock(
180180

181181
private fun LevelOfAssurance.toTokenxLoa() = when(this) {
182182
LevelOfAssurance.SUBSTANTIAL -> no.nav.tms.token.support.tokenx.validation.mock.LevelOfAssurance.SUBSTANTIAL
183-
LevelOfAssurance.LEVEL_3 -> no.nav.tms.token.support.tokenx.validation.mock.LevelOfAssurance.SUBSTANTIAL
184183
LevelOfAssurance.HIGH -> no.nav.tms.token.support.tokenx.validation.mock.LevelOfAssurance.HIGH
185-
LevelOfAssurance.LEVEL_4 -> no.nav.tms.token.support.tokenx.validation.mock.LevelOfAssurance.HIGH
186184
}

0 commit comments

Comments
 (0)