From 4c2c8fb7bcc0c9170c84fd193f597622e8a7d9d4 Mon Sep 17 00:00:00 2001 From: lbw Date: Tue, 31 May 2022 12:55:06 +0800 Subject: [PATCH] =?UTF-8?q?:fire:=20Removing=20code=20or=20files.=20?= =?UTF-8?q?=E5=88=A0=E9=99=A4=E6=97=A0=E7=94=A8import?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../auth/config/AuthorizationServerConfiguration.java | 10 ---------- ...th2ResourceOwnerPasswordAuthenticationProvider.java | 7 ++----- 2 files changed, 2 insertions(+), 15 deletions(-) diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java index 54043e77..67135e7e 100755 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/config/AuthorizationServerConfiguration.java @@ -27,10 +27,7 @@ import org.springframework.core.annotation.Order; import org.springframework.security.authentication.AuthenticationManager; import org.springframework.security.config.annotation.web.builders.HttpSecurity; import org.springframework.security.config.annotation.web.configurers.oauth2.server.authorization.OAuth2AuthorizationServerConfigurer; -import org.springframework.security.oauth2.server.authorization.InMemoryOAuth2AuthorizationConsentService; import org.springframework.security.oauth2.server.authorization.OAuth2AuthorizationService; -import org.springframework.security.oauth2.server.authorization.authentication.OAuth2AuthorizationCodeRequestAuthenticationProvider; -import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository; import org.springframework.security.oauth2.server.authorization.config.ProviderSettings; import org.springframework.security.oauth2.server.authorization.token.*; import org.springframework.security.oauth2.server.authorization.web.authentication.*; @@ -149,13 +146,6 @@ public class AuthorizationServerConfiguration { http.authenticationProvider(resourceOwnerPasswordAuthenticationProvider); // 处理 OAuth2ResourceOwnerSmsAuthenticationToken http.authenticationProvider(resourceOwnerSmsAuthenticationProvider); - - RegisteredClientRepository clientRepository = http.getSharedObject(RegisteredClientRepository.class); - - // 处理默认的授权模式 - http.authenticationProvider(new OAuth2AuthorizationCodeRequestAuthenticationProvider(clientRepository, - authorizationService, new InMemoryOAuth2AuthorizationConsentService())); - } } diff --git a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/OAuth2ResourceOwnerPasswordAuthenticationProvider.java b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/OAuth2ResourceOwnerPasswordAuthenticationProvider.java index 7e269a32..8e22d619 100644 --- a/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/OAuth2ResourceOwnerPasswordAuthenticationProvider.java +++ b/pig-auth/src/main/java/com/pig4cloud/pig/auth/support/OAuth2ResourceOwnerPasswordAuthenticationProvider.java @@ -24,10 +24,7 @@ import org.springframework.util.CollectionUtils; import java.security.Principal; import java.time.Instant; -import java.util.LinkedHashSet; -import java.util.Locale; -import java.util.Map; -import java.util.Set; +import java.util.*; import java.util.function.Supplier; /** @@ -196,7 +193,7 @@ public class OAuth2ResourceOwnerPasswordAuthenticationProvider implements Authen LOGGER.debug("returning OAuth2AccessTokenAuthenticationToken"); return new OAuth2AccessTokenAuthenticationToken(registeredClient, clientPrincipal, accessToken, - refreshToken, authorization.getAccessToken().getClaims()); + refreshToken, Objects.requireNonNull(authorization.getAccessToken().getClaims())); } catch (Exception ex) { -- GitLab