v 2.9.0 & 企业微信&钉钉扫描登录

v 2.9.0 & 企业微信&钉钉扫描登录
This commit is contained in:
MaxKey
2021-08-07 18:25:25 +08:00
parent c8244038b9
commit c70b44ca87
10 changed files with 87 additions and 12 deletions

View File

@@ -36,6 +36,7 @@ public class SocialSignOnProvider {
private String lastLoginTime;
private String state;
private int sortOrder;
private boolean hidden;
private boolean userBind;
@@ -159,7 +160,15 @@ public class SocialSignOnProvider {
this.state = state;
}
@Override
public boolean isHidden() {
return hidden;
}
public void setHidden(boolean hidden) {
this.hidden = hidden;
}
@Override
public String toString() {
StringBuilder builder = new StringBuilder();
builder.append("SocialSignOnProvider [provider=");

View File

@@ -17,6 +17,7 @@
package org.maxkey.authn.support.socialsignon.service;
import java.util.ArrayList;
import java.util.HashMap;
import java.util.List;
@@ -34,7 +35,7 @@ import me.zhyd.oauth.request.*;
public class SocialSignOnProviderService{
private static Logger _logger = LoggerFactory.getLogger(SocialSignOnProviderService.class);
List<SocialSignOnProvider> socialSignOnProviders;
List<SocialSignOnProvider> socialSignOnProviders = new ArrayList<SocialSignOnProvider>();
HashMap<String ,SocialSignOnProvider>socialSignOnProviderMaps=new HashMap<String ,SocialSignOnProvider>();
@@ -135,14 +136,16 @@ public class SocialSignOnProviderService{
public void setSocialSignOnProviders(
List<SocialSignOnProvider> socialSignOnProviders) {
this.socialSignOnProviders = socialSignOnProviders;
for(SocialSignOnProvider socialSignOnProvider : socialSignOnProviders){
socialSignOnProviderMaps.put(socialSignOnProvider.getProvider(), socialSignOnProvider);
socialSignOnProviderMaps.put(socialSignOnProvider.getProvider(), socialSignOnProvider);
if(!socialSignOnProvider.isHidden()) {
this.socialSignOnProviders.add(socialSignOnProvider);
}
}
_logger.debug(""+socialSignOnProviders);
_logger.debug(""+this.socialSignOnProviders);
}
}

View File

@@ -58,6 +58,7 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
String clientSecret=applicationProperty.getProperty("maxkey.socialsignon."+provider+".client.secret");
String sortOrder = applicationProperty.getProperty("maxkey.socialsignon."+provider+".sortorder");
String agentId = applicationProperty.getProperty("maxkey.socialsignon."+provider+".agent.id");
String hidden = applicationProperty.getProperty("maxkey.socialsignon."+provider+".hidden");
SocialSignOnProvider socialSignOnProvider = new SocialSignOnProvider();
socialSignOnProvider.setProvider(provider);
@@ -68,6 +69,12 @@ public class SocialSignOnAutoConfiguration implements InitializingBean {
socialSignOnProvider.setSortOrder(Integer.valueOf(sortOrder));
socialSignOnProvider.setAgentId(agentId);
if(hidden == null || hidden.equalsIgnoreCase("false")) {
socialSignOnProvider.setHidden(false);
}else if(hidden.equalsIgnoreCase("true")){
socialSignOnProvider.setHidden(true);
}
_logger.debug("socialSignOnProvider " + socialSignOnProvider.getProvider()
+ "(" + socialSignOnProvider.getProviderName()+")");
_logger.trace("socialSignOnProvider " + socialSignOnProvider);