diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java index 0ecf02428..ee012c73e 100644 --- a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java +++ b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/AuthorizeValidatorConfig.java @@ -17,7 +17,13 @@ public interface AuthorizeValidatorConfig { AuthorizeValidatorConfig setMod(Authorize.MOD mod); AuthorizeValidatorConfig addExpression(String expression, String language); + + AuthorizeValidatorConfig setApiSupport(boolean apiSupport); + + boolean isApiSupport(); + boolean isEmpty(); + default AuthorizeValidatorConfig addAnnotation(Set authorizes) { Set modules = new LinkedHashSet<>(); Set roles = new LinkedHashSet<>(); @@ -28,6 +34,7 @@ public interface AuthorizeValidatorConfig { actions.addAll(Arrays.asList(tmp.action())); setMod(tmp.mod()); addExpression(tmp.expression(), tmp.expressionLanguage()); + setApiSupport(tmp.api()); }); setActions(actions).setModules(modules).setRoles(roles); return this; diff --git a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java index 7488c5553..e5b2d5907 100644 --- a/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java +++ b/hsweb-web-core/src/main/java/org/hsweb/web/core/authorize/validator/SimpleAuthorizeValidatorConfig.java @@ -20,6 +20,13 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig protected Set actions; protected Set expressions = new LinkedHashSet<>(); protected Authorize.MOD mod; + protected boolean apiSupport; + + @Override + public AuthorizeValidatorConfig setApiSupport(boolean apiSupport) { + this.apiSupport = apiSupport; + return this; + } @Override public AuthorizeValidatorConfig setModules(Set modules) { @@ -84,6 +91,10 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig return expressions; } + public boolean isApiSupport() { + return apiSupport; + } + public void setExpressions(Set expressions) { this.expressions = expressions; } @@ -94,7 +105,7 @@ public class SimpleAuthorizeValidatorConfig implements AuthorizeValidatorConfig @Override public boolean isEmpty() { - return getModules().isEmpty() && getRoles().isEmpty() && getExpressions().isEmpty(); + return getModules().isEmpty() && getRoles().isEmpty() && getExpressions().isEmpty(); } public static class Expression {