diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/config/IdsConfig.java b/jap-ids/src/main/java/com/fujieid/jap/ids/config/IdsConfig.java index 0c2bedb680a23ecc1949b28e5c8087c721c849d0..9e00c6c268f34d552cd9260f39402eda76dd0dbd 100644 --- a/jap-ids/src/main/java/com/fujieid/jap/ids/config/IdsConfig.java +++ b/jap-ids/src/main/java/com/fujieid/jap/ids/config/IdsConfig.java @@ -59,7 +59,7 @@ public class IdsConfig { /** * 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} */ @@ -172,12 +172,12 @@ public class IdsConfig { return this; } - public String getConfirmUrl() { - return null == confirmUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/confirm" : confirmUrl; + public String getConfirmPageUrl() { + return null == confirmPageUrl ? ObjectUtils.appendIfNotEndWith(issuer, IdsConsts.SLASH) + "oauth/confirm" : confirmPageUrl; } - public IdsConfig setConfirmUrl(String confirmUrl) { - this.confirmUrl = confirmUrl; + public IdsConfig setConfirmPageUrl(String confirmPageUrl) { + this.confirmPageUrl = confirmPageUrl; return this; } diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java index fb656aafbb39f3c3727f614af70e27342f8400b0..643fb4d252b9da6568a332eedd471eea5de13965 100644 --- a/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java +++ b/jap-ids/src/main/java/com/fujieid/jap/ids/endpoint/LoginEndpoint.java @@ -107,6 +107,6 @@ public class LoginEndpoint extends AbstractEndpoint { JapIds.saveUserInfo(userInfo, request); return new IdsResponse() - .data(ObjectUtils.appendIfNotEndWith(JapIds.getIdsConfig().getConfirmUrl(), "?") + request.getQueryString()); + .data(ObjectUtils.appendIfNotEndWith(JapIds.getIdsConfig().getConfirmPageUrl(), "?") + request.getQueryString()); } } diff --git a/jap-ids/src/main/java/com/fujieid/jap/ids/filter/AbstractIdsFilter.java b/jap-ids/src/main/java/com/fujieid/jap/ids/filter/AbstractIdsFilter.java index b01f041dea00032b9c25f958579f14ce87614fd1..97b4091eb183309a186c9c47fe514aaf97698358 100644 --- a/jap-ids/src/main/java/com/fujieid/jap/ids/filter/AbstractIdsFilter.java +++ b/jap-ids/src/main/java/com/fujieid/jap/ids/filter/AbstractIdsFilter.java @@ -83,7 +83,7 @@ public class AbstractIdsFilter { String loginUrl = config.getLoginUrl(); String loginPageUrl = config.getLoginPageUrl(); String errorUrl = config.getErrorUrl(); - String confirmUrl = config.getConfirmUrl(); + String confirmPageUrl = config.getConfirmPageUrl(); String tokenUrl = config.getTokenUrl(); String registrationUrl = config.getRegistrationUrl(); String checkSessionUrl = config.getCheckSessionUrl(); @@ -91,8 +91,8 @@ public class AbstractIdsFilter { String discoveryUrl = config.getDiscoveryUrl(); String logoutUrl = config.getLoginUrl(); String logoutRedirectUrl = config.getLogoutRedirectUrl(); - String[] urls = {authorizeUrl, loginUrl, loginPageUrl, errorUrl, confirmUrl, tokenUrl, registrationUrl, - jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl}; + String[] urls = {authorizeUrl, 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()));