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

🍻 Modify `IdsConfig.confirmUrl` to `confirmPageUrl`.

上级 917de17a
...@@ -59,7 +59,7 @@ public class IdsConfig { ...@@ -59,7 +59,7 @@ public class IdsConfig {
/** /**
* The user confirms the authorized url, the default is {@code issuer + /oauth/confirm} * The user confirms the authorized url, the default is {@code issuer + /oauth/confirm}
*/ */
private String confirmUrl; private String confirmPageUrl;
/** /**
* Authorized url, the default is {@code issuer + /oauth/authorize} * Authorized url, the default is {@code issuer + /oauth/authorize}
*/ */
...@@ -172,12 +172,12 @@ public class IdsConfig { ...@@ -172,12 +172,12 @@ public class IdsConfig {
return this; return this;
} }
public String getConfirmUrl() { public String getConfirmPageUrl() {
return null == confirmUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/confirm" : confirmUrl; return null == confirmPageUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/confirm" : confirmPageUrl;
} }
public IdsConfig setConfirmUrl(String confirmUrl) { public IdsConfig setConfirmPageUrl(String confirmPageUrl) {
this.confirmUrl = confirmUrl; this.confirmPageUrl = confirmPageUrl;
return this; return this;
} }
......
...@@ -107,6 +107,6 @@ public class LoginEndpoint extends AbstractEndpoint { ...@@ -107,6 +107,6 @@ public class LoginEndpoint extends AbstractEndpoint {
JapIds.saveUserInfo(userInfo, request); JapIds.saveUserInfo(userInfo, request);
return new IdsResponse<String, Object>() return new IdsResponse<String, Object>()
.data(ObjectUtils.appendIfNotEndWith(JapIds.getIdsConfig().getConfirmUrl(), "?") + request.getQueryString()); .data(ObjectUtils.appendIfNotEndWith(JapIds.getIdsConfig().getConfirmPageUrl(), "?") + request.getQueryString());
} }
} }
...@@ -83,7 +83,7 @@ public class AbstractIdsFilter { ...@@ -83,7 +83,7 @@ public class AbstractIdsFilter {
String loginUrl = config.getLoginUrl(); String loginUrl = config.getLoginUrl();
String loginPageUrl = config.getLoginPageUrl(); String loginPageUrl = config.getLoginPageUrl();
String errorUrl = config.getErrorUrl(); String errorUrl = config.getErrorUrl();
String confirmUrl = config.getConfirmUrl(); String confirmPageUrl = config.getConfirmPageUrl();
String tokenUrl = config.getTokenUrl(); String tokenUrl = config.getTokenUrl();
String registrationUrl = config.getRegistrationUrl(); String registrationUrl = config.getRegistrationUrl();
String checkSessionUrl = config.getCheckSessionUrl(); String checkSessionUrl = config.getCheckSessionUrl();
...@@ -91,8 +91,8 @@ public class AbstractIdsFilter { ...@@ -91,8 +91,8 @@ public class AbstractIdsFilter {
String discoveryUrl = config.getDiscoveryUrl(); String discoveryUrl = config.getDiscoveryUrl();
String logoutUrl = config.getLoginUrl(); String logoutUrl = config.getLoginUrl();
String logoutRedirectUrl = config.getLogoutRedirectUrl(); String logoutRedirectUrl = config.getLogoutRedirectUrl();
String[] urls = {authorizeUrl, loginUrl, loginPageUrl, errorUrl, confirmUrl, tokenUrl, registrationUrl, String[] urls = {authorizeUrl, loginUrl, loginPageUrl, errorUrl, confirmPageUrl, tokenUrl,
jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl}; registrationUrl, jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl};
for (String url : urls) { for (String url : urls) {
if (StringUtil.isNotEmpty(url) && url.startsWith(issuer)) { if (StringUtil.isNotEmpty(url) && url.startsWith(issuer)) {
this.ignoreUrls.add(url.substring(issuer.length())); this.ignoreUrls.add(url.substring(issuer.length()));
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册