Skip to content

Commit 68300d4

Browse files
committed
Polish gh-1729
1 parent 8c297b1 commit 68300d4

File tree

1 file changed

+5
-11
lines changed

1 file changed

+5
-11
lines changed

Diff for: oauth2-authorization-server/src/test/java/org/springframework/security/oauth2/server/authorization/web/OAuth2DeviceAuthorizationEndpointFilterTests.java

+5-11
Original file line numberDiff line numberDiff line change
@@ -241,8 +241,10 @@ public void doFilterWhenDeviceAuthorizationRequestThenDeviceAuthorizationRespons
241241
assertThat(deviceCode.getExpiresAt()).isAfter(deviceCode.getIssuedAt());
242242
}
243243

244+
// gh-1714
244245
@Test
245-
public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenDeviceAuthorizationResponse() throws Exception {
246+
public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenVerificationUriIncludesContextPath()
247+
throws Exception {
246248
Authentication authenticationResult = createAuthentication();
247249
given(this.authenticationManager.authenticate(any(Authentication.class))).willReturn(authenticationResult);
248250

@@ -256,22 +258,14 @@ public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenDeviceAutho
256258
this.filter.doFilter(request, response, filterChain);
257259
assertThat(response.getStatus()).isEqualTo(HttpStatus.OK.value());
258260

259-
ArgumentCaptor<OAuth2DeviceAuthorizationRequestAuthenticationToken> deviceAuthorizationRequestAuthenticationCaptor = ArgumentCaptor
260-
.forClass(OAuth2DeviceAuthorizationRequestAuthenticationToken.class);
261-
verify(this.authenticationManager).authenticate(deviceAuthorizationRequestAuthenticationCaptor.capture());
261+
verify(this.authenticationManager).authenticate(any(OAuth2DeviceAuthorizationRequestAuthenticationToken.class));
262262
verifyNoInteractions(filterChain);
263263

264264
OAuth2DeviceAuthorizationResponse deviceAuthorizationResponse = readDeviceAuthorizationResponse(response);
265265
String verificationUri = ISSUER_URI + "/contextPath" + VERIFICATION_URI;
266266
assertThat(deviceAuthorizationResponse.getVerificationUri()).isEqualTo(verificationUri);
267267
assertThat(deviceAuthorizationResponse.getVerificationUriComplete())
268-
.isEqualTo("%s?%s=%s".formatted(verificationUri, OAuth2ParameterNames.USER_CODE, USER_CODE));
269-
OAuth2DeviceCode deviceCode = deviceAuthorizationResponse.getDeviceCode();
270-
assertThat(deviceCode.getTokenValue()).isEqualTo(DEVICE_CODE);
271-
assertThat(deviceCode.getExpiresAt()).isAfter(deviceCode.getIssuedAt());
272-
OAuth2UserCode userCode = deviceAuthorizationResponse.getUserCode();
273-
assertThat(userCode.getTokenValue()).isEqualTo(USER_CODE);
274-
assertThat(deviceCode.getExpiresAt()).isAfter(deviceCode.getIssuedAt());
268+
.isEqualTo("%s?%s=%s".formatted(verificationUri, OAuth2ParameterNames.USER_CODE, USER_CODE));
275269
}
276270

277271
@Test

0 commit comments

Comments
 (0)