From 8d659cff85d8cdbd1e373af24c4ffcef1684e5ae Mon Sep 17 00:00:00 2001
From: chenjun <jclazz@outlook.com>
Date: Sat, 23 May 2020 23:04:30 +0800
Subject: [PATCH] =?UTF-8?q?=E6=94=AF=E6=8C=81=E6=97=A0=E6=9D=83=E9=99=90?=
 =?UTF-8?q?=E7=94=A8=E6=88=B7=E7=9A=84=E8=BA=AB=E4=BB=BD=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../component/PigxUserAuthenticationConverter.java         | 2 +-
 .../listener/AuthenticationSuccessEventListener.java       | 7 ++++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
index 96f0de22e..e32beeece 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/component/PigxUserAuthenticationConverter.java
@@ -100,7 +100,7 @@ public class PigxUserAuthenticationConverter implements UserAuthenticationConver
 			return AuthorityUtils.commaSeparatedStringToAuthorityList(StringUtils
 					.collectionToCommaDelimitedString((Collection<?>) authorities));
 		}
-		throw new IllegalArgumentException("Authorities must be either a String or a Collection");
+		return AuthorityUtils.NO_AUTHORITIES;
 	}
 
 	private void validateTenantId(Map<String, ?> map) {
diff --git a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
index be478ddc6..aa0e8ee5a 100644
--- a/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
+++ b/pigx-common/pigx-common-security/src/main/java/com/pig4cloud/pigx/common/security/listener/AuthenticationSuccessEventListener.java
@@ -23,6 +23,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.ApplicationListener;
 import org.springframework.security.authentication.event.AuthenticationSuccessEvent;
 import org.springframework.security.core.Authentication;
+import org.springframework.security.core.userdetails.User;
 import org.springframework.web.context.request.RequestContextHolder;
 import org.springframework.web.context.request.ServletRequestAttributes;
 
@@ -46,7 +47,7 @@ public class AuthenticationSuccessEventListener implements ApplicationListener<A
 	@Override
 	public void onApplicationEvent(AuthenticationSuccessEvent event) {
 		Authentication authentication = (Authentication) event.getSource();
-		if (CollUtil.isNotEmpty(authentication.getAuthorities()) && successHandler != null) {
+		if (successHandler != null && isUserAuthentication(authentication)) {
 			ServletRequestAttributes requestAttributes = (ServletRequestAttributes)
 					RequestContextHolder.getRequestAttributes();
 			HttpServletRequest request = requestAttributes.getRequest();
@@ -56,4 +57,8 @@ public class AuthenticationSuccessEventListener implements ApplicationListener<A
 		}
 	}
 
+	private boolean isUserAuthentication(Authentication authentication){
+		return authentication instanceof User || CollUtil.isNotEmpty(authentication.getAuthorities());
+	}
+
 }