Fix OAuth2 Error Code

Closes gh-10319
spring-projects · Sep 28, 2021 · 1f919bc · 1f919bc
1 parent cae8990
commit 1f919bc
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 1 deletion.
diff --git a/...th2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java b/...th2-jose/src/main/java/org/springframework/security/oauth2/jwt/JwtTimestampValidator.java
@@ -90,7 +90,7 @@ public OAuth2TokenValidatorResult validate(Jwt jwt) {
 
 	private OAuth2Error createOAuth2Error(String reason) {
 		this.logger.debug(reason);
-		return new OAuth2Error(OAuth2ErrorCodes.INVALID_REQUEST, reason,
+		return new OAuth2Error(OAuth2ErrorCodes.INVALID_TOKEN, reason,
 				"https://tools.ietf.org/html/rfc6750#section-3.1");
 	}
 

diff --git a/...ose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java b/...ose/src/test/java/org/springframework/security/oauth2/jwt/JwtTimestampValidatorTests.java
@@ -28,6 +28,7 @@
 import org.junit.Test;
 
 import org.springframework.security.oauth2.core.OAuth2Error;
+import org.springframework.security.oauth2.core.OAuth2ErrorCodes;
 import org.springframework.security.oauth2.core.OAuth2TokenValidatorResult;
 import org.springframework.security.oauth2.jose.jws.JwsAlgorithms;
 
@@ -109,6 +110,7 @@ public void validateWhenConfiguredWithClockSkewThenValidatesUsingThatSkew() {
 				.collect(Collectors.toList());
 		// @formatter:on
 		assertThat(result.hasErrors()).isTrue();
+		assertThat(result.getErrors().iterator().next().getErrorCode()).isEqualTo(OAuth2ErrorCodes.INVALID_TOKEN);
 		assertThat(messages).contains("Jwt used before " + justOverOneDayFromNow);
 	}