From f0371199cbec2c08cf6fe357a2012d1ba9eb49c3 Mon Sep 17 00:00:00 2001 From: zlt Date: Mon, 15 Jul 2019 14:44:11 +0800 Subject: [PATCH] =?UTF-8?q?token=E7=A7=BB=E5=8E=BBcommon=E5=8C=85=E4=B8=AD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../token}/MobileAuthenticationToken.java | 168 +++++++++--------- .../token}/OpenIdAuthenticationToken.java | 156 ++++++++-------- .../oauth/controller/OAuth2Controller.java | 4 +- .../mobile/MobileAuthenticationProvider.java | 1 + .../openid/OpenIdAuthenticationProvider.java | 2 +- 5 files changed, 166 insertions(+), 165 deletions(-) rename {zlt-uaa/src/main/java/com/central/oauth/mobile => zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token}/MobileAuthenticationToken.java (95%) rename {zlt-uaa/src/main/java/com/central/oauth/openid => zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token}/OpenIdAuthenticationToken.java (95%) diff --git a/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationToken.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/MobileAuthenticationToken.java similarity index 95% rename from zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationToken.java rename to zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/MobileAuthenticationToken.java index 8911187..03835f4 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationToken.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/MobileAuthenticationToken.java @@ -1,84 +1,84 @@ -/** - * - */ -package com.central.oauth.mobile; - -import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.SpringSecurityCoreVersion; - -import java.util.Collection; - -/** - * @author zlt - */ -public class MobileAuthenticationToken extends AbstractAuthenticationToken { - - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - - // ~ Instance fields - // ================================================================================================ - - private final Object principal; - private Object credentials; - - // ~ Constructors - // =================================================================================================== - - /** - * This constructor can be safely used by any code that wishes to create a - * UsernamePasswordAuthenticationToken, as the {@link #isAuthenticated()} - * will return false. - * - */ - public MobileAuthenticationToken(String mobile, String password) { - super(null); - this.principal = mobile; - this.credentials = password; - setAuthenticated(false); - } - - /** - * This constructor should only be used by AuthenticationManager or - * AuthenticationProvider implementations that are satisfied with - * producing a trusted (i.e. {@link #isAuthenticated()} = true) - * authentication token. - * - * @param principal - * @param authorities - */ - public MobileAuthenticationToken(Object principal, Object credentials, - Collection authorities) { - super(authorities); - this.principal = principal; - this.credentials = credentials; - super.setAuthenticated(true); - } - - // ~ Methods - // ======================================================================================================== - - @Override - public Object getCredentials() { - return this.credentials; - } - - @Override - public Object getPrincipal() { - return this.principal; - } - - @Override - public void setAuthenticated(boolean isAuthenticated) { - if (isAuthenticated) { - throw new IllegalArgumentException( - "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead"); - } - super.setAuthenticated(false); - } - - @Override - public void eraseCredentials() { - super.eraseCredentials(); - } -} +/** + * + */ +package com.central.oauth2.common.token; + +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.SpringSecurityCoreVersion; + +import java.util.Collection; + +/** + * @author zlt + */ +public class MobileAuthenticationToken extends AbstractAuthenticationToken { + + private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + + // ~ Instance fields + // ================================================================================================ + + private final Object principal; + private Object credentials; + + // ~ Constructors + // =================================================================================================== + + /** + * This constructor can be safely used by any code that wishes to create a + * UsernamePasswordAuthenticationToken, as the {@link #isAuthenticated()} + * will return false. + * + */ + public MobileAuthenticationToken(String mobile, String password) { + super(null); + this.principal = mobile; + this.credentials = password; + setAuthenticated(false); + } + + /** + * This constructor should only be used by AuthenticationManager or + * AuthenticationProvider implementations that are satisfied with + * producing a trusted (i.e. {@link #isAuthenticated()} = true) + * authentication token. + * + * @param principal + * @param authorities + */ + public MobileAuthenticationToken(Object principal, Object credentials, + Collection authorities) { + super(authorities); + this.principal = principal; + this.credentials = credentials; + super.setAuthenticated(true); + } + + // ~ Methods + // ======================================================================================================== + + @Override + public Object getCredentials() { + return this.credentials; + } + + @Override + public Object getPrincipal() { + return this.principal; + } + + @Override + public void setAuthenticated(boolean isAuthenticated) { + if (isAuthenticated) { + throw new IllegalArgumentException( + "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead"); + } + super.setAuthenticated(false); + } + + @Override + public void eraseCredentials() { + super.eraseCredentials(); + } +} diff --git a/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationToken.java b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/OpenIdAuthenticationToken.java similarity index 95% rename from zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationToken.java rename to zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/OpenIdAuthenticationToken.java index 7c342fa..0439593 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationToken.java +++ b/zlt-commons/zlt-auth-client-spring-boot-starter/src/main/java/com/central/oauth2/common/token/OpenIdAuthenticationToken.java @@ -1,78 +1,78 @@ -package com.central.oauth.openid; - -import org.springframework.security.authentication.AbstractAuthenticationToken; -import org.springframework.security.core.GrantedAuthority; -import org.springframework.security.core.SpringSecurityCoreVersion; - -import java.util.Collection; - -/** - * @author zlt - */ -public class OpenIdAuthenticationToken extends AbstractAuthenticationToken { - - private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; - - // ~ Instance fields - // ================================================================================================ - - private final Object principal; - - // ~ Constructors - // =================================================================================================== - - /** - * This constructor can be safely used by any code that wishes to create a - * UsernamePasswordAuthenticationToken, as the {@link #isAuthenticated()} - * will return false. - * - */ - public OpenIdAuthenticationToken(String openId) { - super(null); - this.principal = openId; - setAuthenticated(false); - } - - /** - * This constructor should only be used by AuthenticationManager or - * AuthenticationProvider implementations that are satisfied with - * producing a trusted (i.e. {@link #isAuthenticated()} = true) - * authentication token. - * - * @param principal - * @param authorities - */ - public OpenIdAuthenticationToken(Object principal, - Collection authorities) { - super(authorities); - this.principal = principal; - super.setAuthenticated(true); - } - - // ~ Methods - // ======================================================================================================== - - @Override - public Object getCredentials() { - return null; - } - - @Override - public Object getPrincipal() { - return this.principal; - } - - @Override - public void setAuthenticated(boolean isAuthenticated) { - if (isAuthenticated) { - throw new IllegalArgumentException( - "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead"); - } - super.setAuthenticated(false); - } - - @Override - public void eraseCredentials() { - super.eraseCredentials(); - } -} +package com.central.oauth2.common.token; + +import org.springframework.security.authentication.AbstractAuthenticationToken; +import org.springframework.security.core.GrantedAuthority; +import org.springframework.security.core.SpringSecurityCoreVersion; + +import java.util.Collection; + +/** + * @author zlt + */ +public class OpenIdAuthenticationToken extends AbstractAuthenticationToken { + + private static final long serialVersionUID = SpringSecurityCoreVersion.SERIAL_VERSION_UID; + + // ~ Instance fields + // ================================================================================================ + + private final Object principal; + + // ~ Constructors + // =================================================================================================== + + /** + * This constructor can be safely used by any code that wishes to create a + * UsernamePasswordAuthenticationToken, as the {@link #isAuthenticated()} + * will return false. + * + */ + public OpenIdAuthenticationToken(String openId) { + super(null); + this.principal = openId; + setAuthenticated(false); + } + + /** + * This constructor should only be used by AuthenticationManager or + * AuthenticationProvider implementations that are satisfied with + * producing a trusted (i.e. {@link #isAuthenticated()} = true) + * authentication token. + * + * @param principal + * @param authorities + */ + public OpenIdAuthenticationToken(Object principal, + Collection authorities) { + super(authorities); + this.principal = principal; + super.setAuthenticated(true); + } + + // ~ Methods + // ======================================================================================================== + + @Override + public Object getCredentials() { + return null; + } + + @Override + public Object getPrincipal() { + return this.principal; + } + + @Override + public void setAuthenticated(boolean isAuthenticated) { + if (isAuthenticated) { + throw new IllegalArgumentException( + "Cannot set this token to trusted - use constructor which takes a GrantedAuthority list instead"); + } + super.setAuthenticated(false); + } + + @Override + public void eraseCredentials() { + super.eraseCredentials(); + } +} diff --git a/zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java b/zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java index 4eff35b..a5e6c56 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java +++ b/zlt-uaa/src/main/java/com/central/oauth/controller/OAuth2Controller.java @@ -2,8 +2,8 @@ package com.central.oauth.controller; import com.central.common.constant.SecurityConstants; import com.central.common.model.Result; -import com.central.oauth.mobile.MobileAuthenticationToken; -import com.central.oauth.openid.OpenIdAuthenticationToken; +import com.central.oauth2.common.token.MobileAuthenticationToken; +import com.central.oauth2.common.token.OpenIdAuthenticationToken; import com.central.oauth2.common.util.AuthUtils; import com.fasterxml.jackson.databind.ObjectMapper; import io.swagger.annotations.Api; diff --git a/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationProvider.java b/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationProvider.java index 5e2a792..0d2fc1f 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationProvider.java +++ b/zlt-uaa/src/main/java/com/central/oauth/mobile/MobileAuthenticationProvider.java @@ -1,6 +1,7 @@ package com.central.oauth.mobile; import com.central.oauth.service.ZltUserDetailsService; +import com.central.oauth2.common.token.MobileAuthenticationToken; import lombok.Setter; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.BadCredentialsException; diff --git a/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationProvider.java b/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationProvider.java index 96ee49a..759124b 100644 --- a/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationProvider.java +++ b/zlt-uaa/src/main/java/com/central/oauth/openid/OpenIdAuthenticationProvider.java @@ -1,9 +1,9 @@ package com.central.oauth.openid; +import com.central.oauth2.common.token.OpenIdAuthenticationToken; import org.springframework.security.authentication.AuthenticationProvider; import org.springframework.security.authentication.InternalAuthenticationServiceException; import org.springframework.security.core.Authentication; -import org.springframework.security.core.AuthenticationException; import org.springframework.security.core.userdetails.UserDetails; import org.springframework.social.security.SocialUserDetailsService; -- GitLab