@@ -241,8 +241,10 @@ public void doFilterWhenDeviceAuthorizationRequestThenDeviceAuthorizationRespons
241
241
assertThat (deviceCode .getExpiresAt ()).isAfter (deviceCode .getIssuedAt ());
242
242
}
243
243
244
+ // gh-1714
244
245
@ Test
245
- public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenDeviceAuthorizationResponse () throws Exception {
246
+ public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenVerificationUriIncludesContextPath ()
247
+ throws Exception {
246
248
Authentication authenticationResult = createAuthentication ();
247
249
given (this .authenticationManager .authenticate (any (Authentication .class ))).willReturn (authenticationResult );
248
250
@@ -256,22 +258,14 @@ public void doFilterWhenDeviceAuthorizationRequestWithContextPathThenDeviceAutho
256
258
this .filter .doFilter (request , response , filterChain );
257
259
assertThat (response .getStatus ()).isEqualTo (HttpStatus .OK .value ());
258
260
259
- ArgumentCaptor <OAuth2DeviceAuthorizationRequestAuthenticationToken > deviceAuthorizationRequestAuthenticationCaptor = ArgumentCaptor
260
- .forClass (OAuth2DeviceAuthorizationRequestAuthenticationToken .class );
261
- verify (this .authenticationManager ).authenticate (deviceAuthorizationRequestAuthenticationCaptor .capture ());
261
+ verify (this .authenticationManager ).authenticate (any (OAuth2DeviceAuthorizationRequestAuthenticationToken .class ));
262
262
verifyNoInteractions (filterChain );
263
263
264
264
OAuth2DeviceAuthorizationResponse deviceAuthorizationResponse = readDeviceAuthorizationResponse (response );
265
265
String verificationUri = ISSUER_URI + "/contextPath" + VERIFICATION_URI ;
266
266
assertThat (deviceAuthorizationResponse .getVerificationUri ()).isEqualTo (verificationUri );
267
267
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 ));
275
269
}
276
270
277
271
@ Test
0 commit comments