Skip to content

MaxKey
MaxKey

yujianwangzivayy / MaxKey
与 Fork 源项目一致

Fork自 MaxKey单点登录官方(MaxKeyTop) / MaxKey

通知 1
Star 0
Fork 0
MaxKey
MaxKey

体验新版 GitCode，发现更多精彩内容 >>

提交 58fc6cc3 编写于 作者: MaxKey单点登录官方's avatar MaxKey单点登录官方
浏览文件
操作

fix

上级 600f7c98
隐藏空白更改
内联 并排
Showing with 168 addition and 56 deletion
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/AbstractSocialSignOnEndpoint.java
浏览文件 @ 58fc6cc3
...@@ -5,7 +5,7 @@ package org.maxkey.authn.support.socialsignon; ...@@ -5,7 +5,7 @@ package org.maxkey.authn.support.socialsignon;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnUserTokenService; import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService;
import org.maxkey.web.WebContext; import org.maxkey.web.WebContext;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
...@@ -53,7 +53,7 @@ public class AbstractSocialSignOnEndpoint { ...@@ -53,7 +53,7 @@ public class AbstractSocialSignOnEndpoint {
protected SocialSignOnProviderService socialSignOnProviderService; protected SocialSignOnProviderService socialSignOnProviderService;
@Autowired @Autowired
protected SocialSignOnUserTokenService socialSignOnUserTokenService; protected SocialsAssociateService socialsAssociateService;
......
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/SocialSignOnEndpoint.java
浏览文件 @ 58fc6cc3
...@@ -6,7 +6,7 @@ package org.maxkey.authn.support.socialsignon; ...@@ -6,7 +6,7 @@ package org.maxkey.authn.support.socialsignon;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import org.maxkey.authn.realm.AbstractAuthenticationRealm; import org.maxkey.authn.realm.AbstractAuthenticationRealm;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnUserToken; import org.maxkey.authn.support.socialsignon.service.SocialsAssociate;
import org.maxkey.constants.ConstantsLoginType; import org.maxkey.constants.ConstantsLoginType;
import org.maxkey.web.WebContext; import org.maxkey.web.WebContext;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -62,13 +62,13 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ ...@@ -62,13 +62,13 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
public ModelAndView unbind(HttpServletRequest request, public ModelAndView unbind(HttpServletRequest request,
@PathVariable String provider) { @PathVariable String provider) {
WebContext.setAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI, request.getParameter(SOCIALSIGNON_REDIRECT_URI)); WebContext.setAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI, request.getParameter(SOCIALSIGNON_REDIRECT_URI));
SocialSignOnUserToken socialSignOnUser =new SocialSignOnUserToken(); SocialsAssociate socialSignOnUser =new SocialsAssociate();
socialSignOnUser.setProvider(provider); socialSignOnUser.setProvider(provider);
socialSignOnUser.setUid(WebContext.getUserInfo().getId()); socialSignOnUser.setUid(WebContext.getUserInfo().getId());
socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername()); socialSignOnUser.setUsername(WebContext.getUserInfo().getUsername());
_logger.debug("Social Sign On unbind "+provider+" from user "+WebContext.getUserInfo().getUsername()); _logger.debug("Social Sign On unbind "+provider+" from user "+WebContext.getUserInfo().getUsername());
socialSignOnUserTokenService.delete(socialSignOnUser); socialsAssociateService.delete(socialSignOnUser);
if(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI)!=null){ if(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI)!=null){
return WebContext.redirect(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI).toString()); return WebContext.redirect(WebContext.getAttribute(SOCIALSIGNON_SESSION_REDIRECT_URI).toString());
...@@ -92,7 +92,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ ...@@ -92,7 +92,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
this.provider=provider; this.provider=provider;
this.authCallback(); this.authCallback();
_logger.debug(this.accountId); _logger.debug(this.accountId);
SocialSignOnUserToken socialSignOnUserToken =new SocialSignOnUserToken(); SocialsAssociate socialSignOnUserToken =new SocialsAssociate();
socialSignOnUserToken.setProvider(provider); socialSignOnUserToken.setProvider(provider);
socialSignOnUserToken.setSocialuid(this.accountId); socialSignOnUserToken.setSocialuid(this.accountId);
...@@ -117,21 +117,21 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ ...@@ -117,21 +117,21 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
} }
public boolean socialBind(SocialSignOnUserToken socialSignOnUserToken){ public boolean socialBind(SocialsAssociate socialSignOnUserToken){
socialSignOnUserToken.setSocialUserInfo(accountJsonString); socialSignOnUserToken.setSocialUserInfo(accountJsonString);
socialSignOnUserToken.setUid(WebContext.getUserInfo().getId()); socialSignOnUserToken.setUid(WebContext.getUserInfo().getId());
socialSignOnUserToken.setUsername(WebContext.getUserInfo().getUsername()); socialSignOnUserToken.setUsername(WebContext.getUserInfo().getUsername());
//socialSignOnUserToken.setAccessToken(JsonUtils.object2Json(accessToken)); //socialSignOnUserToken.setAccessToken(JsonUtils.object2Json(accessToken));
//socialSignOnUserToken.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); //socialSignOnUserToken.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject()));
_logger.debug("Social Bind : "+socialSignOnUserToken); _logger.debug("Social Bind : "+socialSignOnUserToken);
this.socialSignOnUserTokenService.delete(socialSignOnUserToken); this.socialsAssociateService.delete(socialSignOnUserToken);
this.socialSignOnUserTokenService.insert(socialSignOnUserToken); this.socialsAssociateService.insert(socialSignOnUserToken);
return true; return true;
} }
public boolean socialSignOn(SocialSignOnUserToken socialSignOnUserToken){ public boolean socialSignOn(SocialsAssociate socialSignOnUserToken){
socialSignOnUserToken=this.socialSignOnUserTokenService.get(socialSignOnUserToken); socialSignOnUserToken=this.socialsAssociateService.get(socialSignOnUserToken);
_logger.debug("callback SocialSignOn User Token : "+socialSignOnUserToken); _logger.debug("callback SocialSignOn User Token : "+socialSignOnUserToken);
if(null !=socialSignOnUserToken){ if(null !=socialSignOnUserToken){
...@@ -143,7 +143,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{ ...@@ -143,7 +143,7 @@ public class SocialSignOnEndpoint extends AbstractSocialSignOnEndpoint{
socialSignOnUserToken.setSocialUserInfo(accountJsonString); socialSignOnUserToken.setSocialUserInfo(accountJsonString);
//socialSignOnUserToken.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject())); //socialSignOnUserToken.setExAttribute(JsonUtils.object2Json(accessToken.getResponseObject()));
this.socialSignOnUserTokenService.update(socialSignOnUserToken); this.socialsAssociateService.update(socialSignOnUserToken);
} }
}else{ }else{
......
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialSignOnUserTokenService.java → maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/JdbcSocialsAssociateService.java
浏览文件 @ 58fc6cc3
...@@ -11,98 +11,98 @@ import org.slf4j.LoggerFactory; ...@@ -11,98 +11,98 @@ import org.slf4j.LoggerFactory;
import org.springframework.jdbc.core.JdbcTemplate; import org.springframework.jdbc.core.JdbcTemplate;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
public class JdbcSocialSignOnUserTokenService implements SocialSignOnUserTokenService{ public class JdbcSocialsAssociateService implements SocialsAssociateService{
private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialSignOnUserTokenService.class); private static final Logger _logger = LoggerFactory.getLogger(JdbcSocialsAssociateService.class);
private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "INSERT INTO SOCIALSIGNON_USERS_TOKEN(ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE )VALUES( ? , ? , ? , ? , ?, ? , ? , ?)"; private static final String DEFAULT_DEFAULT_INSERT_STATEMENT = "INSERT INTO SOCIALS_ASSOCIATE(ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE )VALUES( ? , ? , ? , ? , ?, ? , ? , ?)";
private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALSIGNON_USERS_TOKEN WHERE PROVIDER = ? AND SOCIALUID = ?"; private static final String DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALS_ASSOCIATE WHERE PROVIDER = ? AND SOCIALUID = ?";
private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALSIGNON_USERS_TOKEN WHERE UID = ?" ; private static final String DEFAULT_DEFAULT_BIND_SELECT_STATEMENT = "SELECT ID, UID , USERNAME , PROVIDER , SOCIALUID , ACCESSTOKEN , SOCIALUSERINFO , EXATTRIBUTE FROM SOCIALS_ASSOCIATE WHERE UID = ?" ;
private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "DELETE FROM SOCIALSIGNON_USERS_TOKEN WHERE UID = ? AND PROVIDER = ?"; private static final String DEFAULT_DEFAULT_DELETE_STATEMENT = "DELETE FROM SOCIALS_ASSOCIATE WHERE UID = ? AND PROVIDER = ?";
private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "UPDATE SOCIALSIGNON_USERS_TOKEN SET ACCESSTOKEN = ? , SOCIALUSERINFO = ? , EXATTRIBUTE = ? ,UPDATEDDATE = ? WHERE ID = ?"; private static final String DEFAULT_DEFAULT_UPDATE_STATEMENT= "UPDATE SOCIALS_ASSOCIATE SET ACCESSTOKEN = ? , SOCIALUSERINFO = ? , EXATTRIBUTE = ? ,UPDATEDDATE = ? WHERE ID = ?";
private final JdbcTemplate jdbcTemplate; private final JdbcTemplate jdbcTemplate;
public JdbcSocialSignOnUserTokenService(JdbcTemplate jdbcTemplate) { public JdbcSocialsAssociateService(JdbcTemplate jdbcTemplate) {
this.jdbcTemplate=jdbcTemplate; this.jdbcTemplate=jdbcTemplate;
} }
@Override @Override
public boolean insert(SocialSignOnUserToken socialSignOnUserToken) { public boolean insert(SocialsAssociate socialsAssociate) {
socialSignOnUserToken.setId(socialSignOnUserToken.generateId()); socialsAssociate.setId(socialsAssociate.generateId());
jdbcTemplate.update(DEFAULT_DEFAULT_INSERT_STATEMENT, jdbcTemplate.update(DEFAULT_DEFAULT_INSERT_STATEMENT,
new Object[] { new Object[] {
socialSignOnUserToken.getId(), socialsAssociate.getId(),
socialSignOnUserToken.getUid(), socialsAssociate.getUid(),
socialSignOnUserToken.getUsername(), socialsAssociate.getUsername(),
socialSignOnUserToken.getProvider(), socialsAssociate.getProvider(),
socialSignOnUserToken.getSocialuid(), socialsAssociate.getSocialuid(),
socialSignOnUserToken.getAccessToken(), socialsAssociate.getAccessToken(),
socialSignOnUserToken.getSocialUserInfo(), socialsAssociate.getSocialUserInfo(),
socialSignOnUserToken.getExAttribute()}, socialsAssociate.getExAttribute()},
new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR }); new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.VARCHAR,Types.VARCHAR });
return true; return true;
} }
@Override @Override
public boolean delete(SocialSignOnUserToken socialSignOnUserToken) { public boolean delete(SocialsAssociate socialsAssociate) {
jdbcTemplate.update(DEFAULT_DEFAULT_DELETE_STATEMENT, jdbcTemplate.update(DEFAULT_DEFAULT_DELETE_STATEMENT,
new Object[] { new Object[] {
socialSignOnUserToken.getUid(), socialsAssociate.getUid(),
socialSignOnUserToken.getProvider() socialsAssociate.getProvider()
}, },
new int[] {Types.VARCHAR, Types.VARCHAR}); new int[] {Types.VARCHAR, Types.VARCHAR});
return true; return true;
} }
@Override @Override
public SocialSignOnUserToken get(SocialSignOnUserToken socialSignOnUserToken) { public SocialsAssociate get(SocialsAssociate socialsAssociate) {
List<SocialSignOnUserToken> listSocialSignOnUserToken=jdbcTemplate.query( List<SocialsAssociate> listsocialsAssociate=jdbcTemplate.query(
DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT, DEFAULT_DEFAULT_SIGNON_SELECT_STATEMENT,
new SocialSignOnUserTokenRowMapper(), new SocialsAssociateRowMapper(),
socialSignOnUserToken.getProvider(), socialsAssociate.getProvider(),
socialSignOnUserToken.getSocialuid()); socialsAssociate.getSocialuid());
_logger.debug("list SocialSignOnUserToken "+listSocialSignOnUserToken); _logger.debug("list socialsAssociate "+listsocialsAssociate);
return (listSocialSignOnUserToken.size()>0)?listSocialSignOnUserToken.get(0):null; return (listsocialsAssociate.size()>0)?listsocialsAssociate.get(0):null;
} }
@Override @Override
public List<SocialSignOnUserToken> query( public List<SocialsAssociate> query(
SocialSignOnUserToken socialSignOnUserToken) { SocialsAssociate socialsAssociate) {
List<SocialSignOnUserToken> listSocialSignOnUserToken=jdbcTemplate.query( List<SocialsAssociate> listsocialsAssociate=jdbcTemplate.query(
DEFAULT_DEFAULT_BIND_SELECT_STATEMENT, DEFAULT_DEFAULT_BIND_SELECT_STATEMENT,
new SocialSignOnUserTokenRowMapper(), new SocialsAssociateRowMapper(),
socialSignOnUserToken.getUid()); socialsAssociate.getUid());
_logger.debug("query bind SocialSignOnUser "+listSocialSignOnUserToken); _logger.debug("query bind SocialSignOnUser "+listsocialsAssociate);
return listSocialSignOnUserToken; return listsocialsAssociate;
} }
@Override @Override
public boolean update(SocialSignOnUserToken socialSignOnUserToken) { public boolean update(SocialsAssociate socialsAssociate) {
jdbcTemplate.update(DEFAULT_DEFAULT_UPDATE_STATEMENT, jdbcTemplate.update(DEFAULT_DEFAULT_UPDATE_STATEMENT,
new Object[] {socialSignOnUserToken.getAccessToken(),socialSignOnUserToken.getSocialUserInfo(),socialSignOnUserToken.getExAttribute(),new Date(),socialSignOnUserToken.getId()}, new Object[] {socialsAssociate.getAccessToken(),socialsAssociate.getSocialUserInfo(),socialsAssociate.getExAttribute(),new Date(),socialsAssociate.getId()},
new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.TIMESTAMP,Types.VARCHAR }); new int[] {Types.VARCHAR, Types.VARCHAR,Types.VARCHAR, Types.TIMESTAMP,Types.VARCHAR });
return false; return false;
} }
private final class SocialSignOnUserTokenRowMapper implements RowMapper<SocialSignOnUserToken> { private final class SocialsAssociateRowMapper implements RowMapper<SocialsAssociate> {
@Override @Override
public SocialSignOnUserToken mapRow(ResultSet rs, int rowNum) public SocialsAssociate mapRow(ResultSet rs, int rowNum)
throws SQLException { throws SQLException {
SocialSignOnUserToken socialSignOnUserToken=new SocialSignOnUserToken(); SocialsAssociate socialsAssociate=new SocialsAssociate();
socialSignOnUserToken.setId(rs.getString(1)); socialsAssociate.setId(rs.getString(1));
socialSignOnUserToken.setUid(rs.getString(2)); socialsAssociate.setUid(rs.getString(2));
socialSignOnUserToken.setUsername(rs.getString(3)); socialsAssociate.setUsername(rs.getString(3));
socialSignOnUserToken.setProvider(rs.getString(4)); socialsAssociate.setProvider(rs.getString(4));
socialSignOnUserToken.setSocialuid(rs.getString(5)); socialsAssociate.setSocialuid(rs.getString(5));
socialSignOnUserToken.setAccessToken(rs.getString(6)); socialsAssociate.setAccessToken(rs.getString(6));
socialSignOnUserToken.setSocialUserInfo(rs.getString(7)); socialsAssociate.setSocialUserInfo(rs.getString(7));
socialSignOnUserToken.setExAttribute(rs.getString(8)); socialsAssociate.setExAttribute(rs.getString(8));
return socialSignOnUserToken; return socialsAssociate;
} }
} }
......
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnUserTokenService.java 已删除 100644 → 0
浏览文件 @ 600f7c98
package org.maxkey.authn.support.socialsignon.service;
import java.util.List;
public interface SocialSignOnUserTokenService{
public boolean insert(SocialSignOnUserToken socialSignOnUserToken);
public List<SocialSignOnUserToken> query (SocialSignOnUserToken socialSignOnUserToken);
public SocialSignOnUserToken get (SocialSignOnUserToken socialSignOnUserToken);
public boolean delete (SocialSignOnUserToken socialSignOnUserToken);
public boolean update (SocialSignOnUserToken socialSignOnUserToken);
}
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialSignOnUserToken.java → maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociate.java
浏览文件 @ 58fc6cc3
...@@ -6,7 +6,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain; ...@@ -6,7 +6,7 @@ import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
* *
* @author Crystal.Sea * @author Crystal.Sea
*/ */
public class SocialSignOnUserToken extends JpaBaseDomain { public class SocialsAssociate extends JpaBaseDomain {
/** /**
* *
...@@ -21,7 +21,7 @@ public class SocialSignOnUserToken extends JpaBaseDomain { ...@@ -21,7 +21,7 @@ public class SocialSignOnUserToken extends JpaBaseDomain {
private String accessToken; private String accessToken;
private String exAttribute; private String exAttribute;
public SocialSignOnUserToken() {} public SocialsAssociate() {}
/** /**
* @return the id * @return the id
......
maxkey-authentications/src/main/java/org/maxkey/authn/support/socialsignon/service/SocialsAssociateService.java 0 → 100644
浏览文件 @ 58fc6cc3
package org.maxkey.authn.support.socialsignon.service;
import java.util.List;
public interface SocialsAssociateService{
public boolean insert(SocialsAssociate socialsAssociate);
public List<SocialsAssociate> query (SocialsAssociate socialsAssociate);
public SocialsAssociate get (SocialsAssociate socialsAssociate);
public boolean delete (SocialsAssociate socialsAssociate);
public boolean update (SocialsAssociate socialsAssociate);
}
maxkey-core/src/main/java/org/maxkey/persistence/db/PasswordPolicyRowMapper.java
浏览文件 @ 58fc6cc3
...@@ -6,24 +6,24 @@ import java.sql.SQLException; ...@@ -6,24 +6,24 @@ import java.sql.SQLException;
import org.maxkey.domain.PasswordPolicy; import org.maxkey.domain.PasswordPolicy;
import org.springframework.jdbc.core.RowMapper; import org.springframework.jdbc.core.RowMapper;
public class PasswordPolicyRowMapper implements RowMapper<PasswordPolicy> { public class PasswordPolicyRowMapper implements RowMapper<PasswordPolicy> {
@Override @Override
public PasswordPolicy mapRow(ResultSet rs, int rowNum) throws SQLException { public PasswordPolicy mapRow(ResultSet rs, int rowNum) throws SQLException {
PasswordPolicy passwordPolicy=new PasswordPolicy(); PasswordPolicy passwordPolicy = new PasswordPolicy();
passwordPolicy.setId(rs.getString("ID")); passwordPolicy.setId(rs.getString("ID"));
passwordPolicy.setMinLength(rs.getInt("MINLENGTH")); passwordPolicy.setMinLength(rs.getInt("MINLENGTH"));
passwordPolicy.setMaxLength(rs.getInt("MAXLENGTH")); passwordPolicy.setMaxLength(rs.getInt("MAXLENGTH"));
passwordPolicy.setLowerCase(rs.getInt("LOWERCASE")); passwordPolicy.setLowerCase(rs.getInt("LOWERCASE"));
passwordPolicy.setUpperCase(rs.getInt("UPPERCASE")); passwordPolicy.setUpperCase(rs.getInt("UPPERCASE"));
passwordPolicy.setDigits(rs.getInt("DIGITS")); passwordPolicy.setDigits(rs.getInt("DIGITS"));
passwordPolicy.setSpecialChar(rs.getInt("SPECIALCHAR")); passwordPolicy.setSpecialChar(rs.getInt("SPECIALCHAR"));
passwordPolicy.setAttempts(rs.getInt("ATTEMPTS")); passwordPolicy.setAttempts(rs.getInt("ATTEMPTS"));
passwordPolicy.setDuration(rs.getInt("DURATION")); passwordPolicy.setDuration(rs.getInt("DURATION"));
passwordPolicy.setExpiration(rs.getInt("EXPIRATION")); passwordPolicy.setExpiration(rs.getInt("EXPIRATION"));
passwordPolicy.setUsername(rs.getInt("USERNAME")); passwordPolicy.setUsername(rs.getInt("USERNAME"));
passwordPolicy.setSimplePasswords(rs.getString("SIMPLEPASSWORDS")); passwordPolicy.setSimplePasswords(rs.getString("SIMPLEPASSWORDS"));
return passwordPolicy; return passwordPolicy;
} }
} }
maxkey-web-maxkey/src/main/java/org/maxkey/web/contorller/SocialSignOnListController.java
浏览文件 @ 58fc6cc3
...@@ -5,8 +5,8 @@ import java.util.List; ...@@ -5,8 +5,8 @@ import java.util.List;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProvider;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService; import org.maxkey.authn.support.socialsignon.service.SocialSignOnProviderService;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnUserToken; import org.maxkey.authn.support.socialsignon.service.SocialsAssociate;
import org.maxkey.authn.support.socialsignon.service.SocialSignOnUserTokenService; import org.maxkey.authn.support.socialsignon.service.SocialsAssociateService;
import org.maxkey.config.ApplicationConfig; import org.maxkey.config.ApplicationConfig;
import org.maxkey.web.WebContext; import org.maxkey.web.WebContext;
import org.slf4j.Logger; import org.slf4j.Logger;
...@@ -27,7 +27,7 @@ public class SocialSignOnListController { ...@@ -27,7 +27,7 @@ public class SocialSignOnListController {
SocialSignOnProviderService socialSignOnProviderService; SocialSignOnProviderService socialSignOnProviderService;
@Autowired @Autowired
protected SocialSignOnUserTokenService socialSignOnUserService; protected SocialsAssociateService socialSignOnUserService;
@Autowired @Autowired
@Qualifier("applicationConfig") @Qualifier("applicationConfig")
...@@ -40,9 +40,9 @@ public class SocialSignOnListController { ...@@ -40,9 +40,9 @@ public class SocialSignOnListController {
if(applicationConfig.getLoginConfig().isSocialSignOn()){ if(applicationConfig.getLoginConfig().isSocialSignOn()){
List<SocialSignOnProvider> listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders(); List<SocialSignOnProvider> listSocialSignOnProvider= socialSignOnProviderService.getSocialSignOnProviders();
SocialSignOnUserToken socialSignOnUser=new SocialSignOnUserToken(); SocialsAssociate socialSignOnUser=new SocialsAssociate();
socialSignOnUser.setUid(WebContext.getUserInfo().getId()); socialSignOnUser.setUid(WebContext.getUserInfo().getId());
List<SocialSignOnUserToken> listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser); List<SocialsAssociate> listSocialSignOnUserToken= socialSignOnUserService.query(socialSignOnUser);
List<SocialSignOnProvider> listBindSocialSignOnProvider=new ArrayList<SocialSignOnProvider>(); List<SocialSignOnProvider> listBindSocialSignOnProvider=new ArrayList<SocialSignOnProvider>();
_logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider); _logger.debug("list SocialSignOnProvider : "+listSocialSignOnProvider);
_logger.debug("list SocialSignOnUserToken : "+listSocialSignOnUserToken); _logger.debug("list SocialSignOnUserToken : "+listSocialSignOnUserToken);
...@@ -51,7 +51,7 @@ public class SocialSignOnListController { ...@@ -51,7 +51,7 @@ public class SocialSignOnListController {
socialSignOnProvider.setProvider(ssop.getProvider()); socialSignOnProvider.setProvider(ssop.getProvider());
socialSignOnProvider.setProviderName(ssop.getProviderName()); socialSignOnProvider.setProviderName(ssop.getProviderName());
socialSignOnProvider.setIcon(ssop.getIcon()); socialSignOnProvider.setIcon(ssop.getIcon());
for(SocialSignOnUserToken ssout :listSocialSignOnUserToken){ for(SocialsAssociate ssout :listSocialSignOnUserToken){
if(ssout.getProvider().equals(ssop.getProvider())){ if(ssout.getProvider().equals(ssop.getProvider())){
socialSignOnProvider.setUserBind(true); socialSignOnProvider.setUserBind(true);
_logger.debug("binded provider : "+ssout.getProvider()); _logger.debug("binded provider : "+ssout.getProvider());
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或