ilgrosso commented on a change in pull request #186:
URL: https://github.com/apache/syncope/pull/186#discussion_r422092397
##########
File path:
common/am/lib/src/main/java/org/apache/syncope/common/lib/wa/WAClientApp.java
##########
@@ -36,6 +38,8 @@
private AttrReleasePolicyConf attrReleasePolicyConf;
+ private final Map<String, Object> releaseAttributes = new HashMap<>();
Review comment:
please rename as `releaseAttrs` to follow the conventions
##########
File path:
common/am/lib/src/main/java/org/apache/syncope/common/lib/wa/WAClientApp.java
##########
@@ -67,4 +71,8 @@ public AttrReleasePolicyConf getAttrReleasePolicyConf() {
public void setAttrReleasePolicyConf(final AttrReleasePolicyConf
attrReleasePolicyConf) {
this.attrReleasePolicyConf = attrReleasePolicyConf;
}
+
+ public Map<String, Object> getReleaseAttributes() {
Review comment:
Same as above
##########
File path:
core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/wa/WAClientAppBinderImpl.java
##########
@@ -35,15 +39,21 @@
@Autowired
private ClientAppDataBinder clientAppDataBinder;
+ @Autowired
+ private AuthModuleDAO authModuleDAO;
+
@Override
public WAClientApp getWAClientApp(final ClientApp clientApp) {
WAClientApp waClientApp = new WAClientApp();
waClientApp.setClientAppTO(clientAppDataBinder.getClientAppTO(clientApp));
try {
+ AuthPolicyConf authPolicyConf = null;
if (clientApp.getAuthPolicy() != null) {
+ authPolicyConf = clientApp.getAuthPolicy().getConf();
waClientApp.setAuthPolicyConf((clientApp.getAuthPolicy()).getConf());
Review comment:
this line must be removed
##########
File path:
core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/wa/WAClientAppBinderImpl.java
##########
@@ -35,15 +39,21 @@
@Autowired
private ClientAppDataBinder clientAppDataBinder;
+ @Autowired
+ private AuthModuleDAO authModuleDAO;
+
@Override
public WAClientApp getWAClientApp(final ClientApp clientApp) {
WAClientApp waClientApp = new WAClientApp();
waClientApp.setClientAppTO(clientAppDataBinder.getClientAppTO(clientApp));
try {
+ AuthPolicyConf authPolicyConf = null;
if (clientApp.getAuthPolicy() != null) {
+ authPolicyConf = clientApp.getAuthPolicy().getConf();
waClientApp.setAuthPolicyConf((clientApp.getAuthPolicy()).getConf());
} else if (clientApp.getRealm().getAuthPolicy() != null) {
+ authPolicyConf = clientApp.getAuthPolicy().getConf();
waClientApp.setAuthPolicyConf((clientApp.getRealm().getAuthPolicy()).getConf());
Review comment:
this line must be moved right after the subsequent `}`
##########
File path:
core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/wa/WAClientAppBinderImpl.java
##########
@@ -58,6 +68,26 @@ public WAClientApp getWAClientApp(final ClientApp clientApp)
{
} else if (clientApp.getRealm().getAttrReleasePolicy() != null) {
waClientApp.setAttrReleasePolicyConf((clientApp.getRealm().getAttrReleasePolicy()).getConf());
}
+
+ if (authPolicyConf != null && authPolicyConf instanceof
DefaultAuthPolicyConf
Review comment:
Please remove `authPolicyConf != null &&` - `instanceof` will do the job
##########
File path: docker/wa/src/main/resources/application.properties
##########
@@ -26,8 +26,17 @@ spring.http.encoding.force=true
server.servlet.contextPath=/syncope-wa
-spring.resources.static-locations=classpath:/syncope/static,classpath:/static
-spring.thymeleaf.templateResolverOrder=1
+spring.resources.static-locations=classpath:/thymeleaf/static,classpath:/static
Review comment:
Can you please check that
* `docker/wa/src/main/resources/application.properties`
* `docker/wa/src/main/resources/wa.properties`
are aligned with
* `wa/starter/src/main/resources/application.properties`
* `wa/starter/src/main/resources/wa.properties`
?
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
