Polish One-Time Token API Names and Doc
The names of variables and methods have been adjusted in accordance with the names of the one-time token login API components. Issue gh-15114
This commit is contained in:
committed by
Josh Cummings
parent
e9fe6360bc
commit
d37d41c130
+5
-5
@@ -43,13 +43,13 @@ public final class GenerateOneTimeTokenWebFilter implements WebFilter {
|
||||
|
||||
private ServerWebExchangeMatcher matcher = ServerWebExchangeMatchers.pathMatchers(HttpMethod.POST, "/ott/generate");
|
||||
|
||||
private final ServerOneTimeTokenGenerationSuccessHandler generatedOneTimeTokenHandler;
|
||||
private final ServerOneTimeTokenGenerationSuccessHandler oneTimeTokenGenerationSuccessHandler;
|
||||
|
||||
public GenerateOneTimeTokenWebFilter(ReactiveOneTimeTokenService oneTimeTokenService,
|
||||
ServerOneTimeTokenGenerationSuccessHandler generatedOneTimeTokenHandler) {
|
||||
Assert.notNull(generatedOneTimeTokenHandler, "generatedOneTimeTokenHandler cannot be null");
|
||||
ServerOneTimeTokenGenerationSuccessHandler oneTimeTokenGenerationSuccessHandler) {
|
||||
Assert.notNull(oneTimeTokenGenerationSuccessHandler, "oneTimeTokenGenerationSuccessHandler cannot be null");
|
||||
Assert.notNull(oneTimeTokenService, "oneTimeTokenService cannot be null");
|
||||
this.generatedOneTimeTokenHandler = generatedOneTimeTokenHandler;
|
||||
this.oneTimeTokenGenerationSuccessHandler = oneTimeTokenGenerationSuccessHandler;
|
||||
this.oneTimeTokenService = oneTimeTokenService;
|
||||
}
|
||||
|
||||
@@ -63,7 +63,7 @@ public final class GenerateOneTimeTokenWebFilter implements WebFilter {
|
||||
.mapNotNull((data) -> data.getFirst(USERNAME))
|
||||
.switchIfEmpty(chain.filter(exchange).then(Mono.empty()))
|
||||
.flatMap((username) -> this.oneTimeTokenService.generate(new GenerateOneTimeTokenRequest(username)))
|
||||
.flatMap((token) -> this.generatedOneTimeTokenHandler.handle(exchange, token));
|
||||
.flatMap((token) -> this.oneTimeTokenGenerationSuccessHandler.handle(exchange, token));
|
||||
// @formatter:on
|
||||
}
|
||||
|
||||
|
||||
+5
-5
@@ -45,7 +45,7 @@ public class GenerateOneTimeTokenWebFilterTests {
|
||||
|
||||
private final ReactiveOneTimeTokenService oneTimeTokenService = mock(ReactiveOneTimeTokenService.class);
|
||||
|
||||
private final ServerRedirectOneTimeTokenGenerationSuccessHandler generatedOneTimeTokenHandler = new ServerRedirectOneTimeTokenGenerationSuccessHandler(
|
||||
private final ServerRedirectOneTimeTokenGenerationSuccessHandler oneTimeTokenGenerationSuccessHandler = new ServerRedirectOneTimeTokenGenerationSuccessHandler(
|
||||
"/login/ott");
|
||||
|
||||
private static final String TOKEN = "token";
|
||||
@@ -60,7 +60,7 @@ public class GenerateOneTimeTokenWebFilterTests {
|
||||
.contentType(MediaType.APPLICATION_FORM_URLENCODED)
|
||||
.body("username=user"));
|
||||
GenerateOneTimeTokenWebFilter filter = new GenerateOneTimeTokenWebFilter(this.oneTimeTokenService,
|
||||
this.generatedOneTimeTokenHandler);
|
||||
this.oneTimeTokenGenerationSuccessHandler);
|
||||
|
||||
filter.filter(exchange, (e) -> Mono.empty()).block();
|
||||
|
||||
@@ -75,7 +75,7 @@ public class GenerateOneTimeTokenWebFilterTests {
|
||||
MockServerHttpRequest.BaseBuilder<?> request = MockServerHttpRequest.post("/ott/generate");
|
||||
MockServerWebExchange exchange = MockServerWebExchange.from(request);
|
||||
GenerateOneTimeTokenWebFilter filter = new GenerateOneTimeTokenWebFilter(this.oneTimeTokenService,
|
||||
this.generatedOneTimeTokenHandler);
|
||||
this.oneTimeTokenGenerationSuccessHandler);
|
||||
|
||||
filter.filter(exchange, (e) -> Mono.empty()).block();
|
||||
|
||||
@@ -86,14 +86,14 @@ public class GenerateOneTimeTokenWebFilterTests {
|
||||
public void constructorWhenOneTimeTokenServiceNullThenIllegalArgumentException() {
|
||||
// @formatter:off
|
||||
assertThatIllegalArgumentException()
|
||||
.isThrownBy(() -> new GenerateOneTimeTokenWebFilter(null, this.generatedOneTimeTokenHandler));
|
||||
.isThrownBy(() -> new GenerateOneTimeTokenWebFilter(null, this.oneTimeTokenGenerationSuccessHandler));
|
||||
// @formatter:on
|
||||
}
|
||||
|
||||
@Test
|
||||
public void setWhenRequestMatcherNullThenIllegalArgumentException() {
|
||||
GenerateOneTimeTokenWebFilter filter = new GenerateOneTimeTokenWebFilter(this.oneTimeTokenService,
|
||||
this.generatedOneTimeTokenHandler);
|
||||
this.oneTimeTokenGenerationSuccessHandler);
|
||||
// @formatter:off
|
||||
assertThatIllegalArgumentException()
|
||||
.isThrownBy(() -> filter.setRequestMatcher(null));
|
||||
|
||||
Reference in New Issue
Block a user