提交 66ec38d6 编写于 作者: 智布道's avatar 智布道 👁

🍻 Add `authorizeAutoApproveUrl` attribute in `IdsConfig`

上级 06c67aae
......@@ -64,6 +64,11 @@ public class IdsConfig {
* Authorized url, the default is {@code issuer + /oauth/authorize}
*/
private String authorizeUrl;
/**
* Automatically authorized url (do not display the authorization page), Must support get request method,
* the default is {@code issuer + /oauth/authorize/auto}
*/
private String authorizeAutoApproveUrl;
/**
* token url, the default is {@code issuer + /oauth/token}
*/
......@@ -190,6 +195,15 @@ public class IdsConfig {
return this;
}
public String getAuthorizeAutoApproveUrl() {
return null == authorizeAutoApproveUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/authorize/auto" : authorizeAutoApproveUrl;
}
public IdsConfig setAuthorizeAutoApproveUrl(String authorizeAutoApproveUrl) {
this.authorizeAutoApproveUrl = authorizeAutoApproveUrl;
return this;
}
public String getTokenUrl() {
return null == tokenUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/token" : tokenUrl;
}
......
......@@ -16,12 +16,17 @@
package com.fujieid.jap.ids.endpoint;
import cn.hutool.core.util.ObjectUtil;
import cn.hutool.core.util.StrUtil;
import com.fujieid.jap.ids.JapIds;
import com.fujieid.jap.ids.config.IdsConfig;
import com.fujieid.jap.ids.exception.IdsException;
import com.fujieid.jap.ids.model.ClientDetail;
import com.fujieid.jap.ids.model.IdsRequestParam;
import com.fujieid.jap.ids.model.IdsResponse;
import com.fujieid.jap.ids.model.UserInfo;
import com.fujieid.jap.ids.model.enums.ErrorResponse;
import com.fujieid.jap.ids.provider.IdsRequestParamProvider;
import com.fujieid.jap.ids.util.OauthUtil;
import com.fujieid.jap.ids.util.ObjectUtils;
import javax.servlet.http.HttpServletRequest;
......@@ -106,7 +111,20 @@ public class LoginEndpoint extends AbstractEndpoint {
}
JapIds.saveUserInfo(userInfo, request);
IdsRequestParam param = IdsRequestParamProvider.parseRequest(request);
ClientDetail clientDetail = JapIds.getContext().getClientDetailService().getByClientId(param.getClientId());
OauthUtil.validClientDetail(clientDetail);
String redirectUri = null;
// When the client supports automatic authorization, it will judge whether the {@code autoapprove} function is enabled
if (null != clientDetail.getAutoApprove() && clientDetail.getAutoApprove() &&
StrUtil.isNotEmpty(param.getAutoapprove()) && "TRUE".equalsIgnoreCase(param.getAutoapprove())) {
redirectUri = JapIds.getIdsConfig().getAuthorizeAutoApproveUrl();
} else {
redirectUri = JapIds.getIdsConfig().getConfirmPageUrl();
}
return new IdsResponse<String, Object>()
.data(ObjectUtils.appendIfNotEndWith(JapIds.getIdsConfig().getConfirmPageUrl(), "?") + request.getQueryString());
.data(ObjectUtils.appendIfNotEndWith(redirectUri, "?") + request.getQueryString());
}
}
......@@ -80,6 +80,7 @@ public class AbstractIdsFilter {
IdsConfig config = JapIds.getIdsConfig();
String issuer = config.getIssuer();
String authorizeUrl = config.getAuthorizeUrl();
String authorizeAutoApproveUrl = config.getAuthorizeAutoApproveUrl();
String loginUrl = config.getLoginUrl();
String loginPageUrl = config.getLoginPageUrl();
String errorUrl = config.getErrorUrl();
......@@ -91,8 +92,8 @@ public class AbstractIdsFilter {
String discoveryUrl = config.getDiscoveryUrl();
String logoutUrl = config.getLoginUrl();
String logoutRedirectUrl = config.getLogoutRedirectUrl();
String[] urls = {authorizeUrl, loginUrl, loginPageUrl, errorUrl, confirmPageUrl, tokenUrl,
registrationUrl, jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl};
String[] urls = {authorizeUrl, authorizeAutoApproveUrl, loginUrl, loginPageUrl, errorUrl, confirmPageUrl,
tokenUrl, registrationUrl, jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl};
for (String url : urls) {
if (StringUtil.isNotEmpty(url) && url.startsWith(issuer)) {
this.ignoreUrls.add(url.substring(issuer.length()));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册