Skip to content

Commit 8c0f3a4

Browse files
authored
Fix creds validation endpoint (#740) [ci skip]
Signed-off-by: Paolo Di Tommaso <[email protected]>
1 parent 5d594a2 commit 8c0f3a4

File tree

2 files changed

+10
-14
lines changed

2 files changed

+10
-14
lines changed

src/main/groovy/io/seqera/wave/controller/ValidateController.groovy

+2-6
Original file line numberDiff line numberDiff line change
@@ -18,15 +18,13 @@
1818

1919
package io.seqera.wave.controller
2020

21-
import io.micronaut.http.annotation.Body
2221
import io.micronaut.http.annotation.Controller
2322
import io.micronaut.http.annotation.Post
2423
import io.micronaut.scheduling.TaskExecutors
2524
import io.micronaut.scheduling.annotation.ExecuteOn
2625
import io.seqera.wave.auth.RegistryAuthService
2726
import jakarta.inject.Inject
2827
import jakarta.validation.Valid
29-
import reactor.core.publisher.Mono
3028

3129
@ExecuteOn(TaskExecutors.IO)
3230
@Controller("/validate-creds")
@@ -35,10 +33,8 @@ class ValidateController {
3533
@Inject RegistryAuthService loginService
3634

3735
@Post
38-
Mono<Boolean> validateCreds(@Valid @Body ValidateRegistryCredsRequest request){
39-
Mono.just(
40-
loginService.validateUser(request.registry, request.userName, request.password)
41-
)
36+
Boolean validateCreds(@Valid ValidateRegistryCredsRequest request){
37+
loginService.validateUser(request.registry, request.userName, request.password)
4238
}
4339

4440
}

src/test/groovy/io/seqera/wave/controller/ValidateCredsControllerTest.groovy

+8-8
Original file line numberDiff line numberDiff line change
@@ -67,30 +67,30 @@ class ValidateCredsControllerTest extends Specification implements SecureDockerR
6767

6868
void 'should validate username required'() {
6969
when:
70-
HttpRequest request = HttpRequest.POST("/validate-creds", [
70+
HttpRequest request = HttpRequest.POST("/validate-creds", [request: [
7171
password: 'test',
72-
])
72+
]])
7373
client.toBlocking().exchange(request, Boolean)
7474
then:
7575
def e = thrown(HttpClientResponseException)
7676
}
7777

7878
void 'should validate pwd required'() {
7979
when:
80-
HttpRequest request = HttpRequest.POST("/validate-creds", [
80+
HttpRequest request = HttpRequest.POST("/validate-creds", [request:[
8181
userName: 'test',
82-
])
82+
]])
8383
client.toBlocking().exchange(request, Boolean)
8484
then:
8585
def e = thrown(HttpClientResponseException)
8686
}
8787

8888
void 'should validate the test user'() {
8989
given:
90-
def req = [
90+
def req = [request: [
9191
userName:'test',
9292
password:'test',
93-
registry: getTestRegistryUrl('test') ]
93+
registry: getTestRegistryUrl('test') ]]
9494
and:
9595
HttpRequest request = HttpRequest.POST("/validate-creds", req)
9696
when:
@@ -103,11 +103,11 @@ class ValidateCredsControllerTest extends Specification implements SecureDockerR
103103

104104
void 'test validateController valid login'() {
105105
given:
106-
def req = [
106+
def req = [request: [
107107
userName: USER,
108108
password: PWD,
109109
registry: getTestRegistryUrl(REGISTRY_URL)
110-
]
110+
]]
111111
HttpRequest request = HttpRequest.POST("/validate-creds", req)
112112
when:
113113
HttpResponse<Boolean> response = client.toBlocking().exchange(request, Boolean)

0 commit comments

Comments
 (0)