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

📝 Add `loginPageUrl` attribute in `IdsConfig` to distinguish it from `loginUrl`.

上级 293f1d81
......@@ -48,6 +48,10 @@ public class IdsConfig {
* Login url, the default is {@code issuer + /oauth/login}
*/
private String loginUrl;
/**
* Login page url, the default is {@link com.fujieid.jap.ids.config.IdsConfig#loginUrl}
*/
private String loginPageUrl;
/**
* error url
*/
......@@ -150,6 +154,15 @@ public class IdsConfig {
return this;
}
public String getLoginPageUrl() {
return null == loginPageUrl ? this.getLoginUrl() : loginPageUrl;
}
public IdsConfig setLoginPageUrl(String loginPageUrl) {
this.loginPageUrl = loginPageUrl;
return this;
}
public String getErrorUrl() {
return errorUrl;
}
......
......@@ -75,7 +75,7 @@ public class AuthorizationEndpoint extends AbstractEndpoint {
}
return new IdsResponse<String, Object>()
.data(OauthUtil.createAuthorizeUrl(JapIds.getIdsConfig().getLoginUrl(), param));
.data(OauthUtil.createAuthorizeUrl(JapIds.getIdsConfig().getLoginPageUrl(), param));
}
/**
......
......@@ -81,6 +81,7 @@ public class AbstractIdsFilter {
String issuer = config.getIssuer();
String authorizeUrl = config.getAuthorizeUrl();
String loginUrl = config.getLoginUrl();
String loginPageUrl = config.getLoginPageUrl();
String errorUrl = config.getErrorUrl();
String confirmUrl = config.getConfirmUrl();
String tokenUrl = config.getTokenUrl();
......@@ -90,7 +91,8 @@ public class AbstractIdsFilter {
String discoveryUrl = config.getDiscoveryUrl();
String logoutUrl = config.getLoginUrl();
String logoutRedirectUrl = config.getLogoutRedirectUrl();
String[] urls = {authorizeUrl, loginUrl, errorUrl, confirmUrl, tokenUrl, registrationUrl, jwksUrl, discoveryUrl, logoutUrl, logoutRedirectUrl, checkSessionUrl};
String[] urls = {authorizeUrl, loginUrl, loginPageUrl, errorUrl, confirmUrl, 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.
先完成此消息的编辑!
想要评论请 注册