Polish "Configure Issuer Validator for Resource Server"

See spring-projectsgh-17952
xiaoguyu · Aug 24, 2019 · 28d374d · 28d374d
1 parent b3d189c
commit 28d374d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 6 deletions.
diff --git a/...igure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java b/...igure/security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerJwkConfiguration.java
@@ -32,6 +32,7 @@
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
+ * @author HaiTao Zhang
  */
 @Configuration
 class ReactiveOAuth2ResourceServerJwkConfiguration {
@@ -48,9 +49,9 @@ class ReactiveOAuth2ResourceServerJwkConfiguration {
 	public ReactiveJwtDecoder jwtDecoder() {
 		NimbusReactiveJwtDecoder nimbusReactiveJwtDecoder = new NimbusReactiveJwtDecoder(
 				this.properties.getJwt().getJwkSetUri());
-		if (this.properties.getJwt().getIssuerUri() != null) {
-			nimbusReactiveJwtDecoder
-					.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.properties.getJwt().getIssuerUri()));
+		String issuerUri = this.properties.getJwt().getIssuerUri();
+		if (issuerUri != null) {
+			nimbusReactiveJwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuerUri));
 		}
 		return nimbusReactiveJwtDecoder;
 	}

diff --git a/.../autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java b/.../autoconfigure/security/oauth2/resource/servlet/OAuth2ResourceServerJwtConfiguration.java
@@ -33,6 +33,7 @@
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
+ * @author HaiTao Zhang
  */
 @Configuration
 class OAuth2ResourceServerJwtConfiguration {
@@ -49,9 +50,9 @@ class OAuth2ResourceServerJwtConfiguration {
 	public JwtDecoder jwtDecoderByJwkKeySetUri() {
 		NimbusJwtDecoderJwkSupport nimbusJwtDecoder = new NimbusJwtDecoderJwkSupport(
 				this.properties.getJwt().getJwkSetUri());
-		if (this.properties.getJwt().getIssuerUri() != null) {
-			nimbusJwtDecoder
-					.setJwtValidator(JwtValidators.createDefaultWithIssuer(this.properties.getJwt().getIssuerUri()));
+		String issuerUri = this.properties.getJwt().getIssuerUri();
+		if (issuerUri != null) {
+			nimbusJwtDecoder.setJwtValidator(JwtValidators.createDefaultWithIssuer(issuerUri));
 		}
 		return nimbusJwtDecoder;
 	}

diff --git a/...security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java b/...security/oauth2/resource/reactive/ReactiveOAuth2ResourceServerAutoConfigurationTests.java
@@ -65,6 +65,7 @@
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
+ * @author HaiTao Zhang
  */
 public class ReactiveOAuth2ResourceServerAutoConfigurationTests {
 

diff --git a/...onfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java b/...onfigure/security/oauth2/resource/servlet/OAuth2ResourceServerAutoConfigurationTests.java
@@ -61,6 +61,7 @@
  *
  * @author Madhura Bhave
  * @author Artsiom Yudovin
+ * @author HaiTao Zhang
  */
 public class OAuth2ResourceServerAutoConfigurationTests {