[syncope] branch master updated: [SYNCOPE-1555] Allow WA as SAMLs IdP to fetch metadata over REST (#178)
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new a77e29d [SYNCOPE-1555] Allow WA as SAMLs IdP to fetch metadata over
REST (#178)
a77e29d is described below
commit a77e29d673296b43681f3e7039e55921cb5edda0
Author: Matteo
AuthorDate: Thu Apr 30 17:33:58 2020 +0200
[SYNCOPE-1555] Allow WA as SAMLs IdP to fetch metadata over REST (#178)
---
.../syncope/common/lib/to/SAML2IdPMetadataTO.java | 182 +
.../syncope/common/lib/types/AMEntitlement.java| 6 +
.../common/rest/api/service/AuthModuleService.java | 6 +-
.../api/service/SAML2IdPMetadataConfService.java | 63 +++
.../rest/api/service/SAML2IdPMetadataService.java | 97 +++
.../syncope/core/logic/SAML2IdPMetadataLogic.java | 120 ++
.../service/SAML2IdPMetadataConfServiceImpl.java | 37 +
.../cxf/service/SAML2IdPMetadataServiceImpl.java | 54 ++
.../api/dao/auth/SAML2IdPMetadataDAO.java | 32
.../api/entity/auth/SAML2IdPMetadata.java | 49 ++
.../jpa/dao/auth/JPASAML2IdPMetadataDAO.java | 62 +++
.../persistence/jpa/entity/JPAEntityFactory.java | 4 +
.../jpa/entity/auth/JPASAML2IdPMetadata.java | 119 ++
.../jpa/inner/SAML2IdPMetadataTest.java| 84 ++
.../api/data/SAML2IdPMetadataBinder.java | 32
.../java/data/SAML2IdPMetadataBinderImpl.java | 80 +
.../org/apache/syncope/fit/AbstractITCase.java | 21 +++
.../syncope/fit/core/SAML2IdPMetadataITCase.java | 113 +
.../java/org/apache/syncope/wa/WARestClient.java | 14 +-
.../bootstrap/SyncopeWABootstrapConfiguration.java | 1 +
.../bootstrap/SyncopeWAPropertySourceLocator.java | 2 +-
.../metadata/RestfulSamlIdPMetadataGenerator.java | 97 +++
.../metadata/RestfulSamlIdPMetadataLocator.java| 97 +++
.../syncope/wa/starter/SyncopeWAApplication.java | 32 +---
.../syncope/wa/starter/SyncopeWAConfiguration.java | 49 +-
.../wa/starter/SyncopeWARefreshContextJob.java | 64
26 files changed, 1479 insertions(+), 38 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPMetadataTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPMetadataTO.java
new file mode 100644
index 000..54c0030
--- /dev/null
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/SAML2IdPMetadataTO.java
@@ -0,0 +1,182 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.syncope.common.lib.to;
+
+import javax.ws.rs.PathParam;
+import org.apache.commons.lang3.builder.EqualsBuilder;
+import org.apache.commons.lang3.builder.HashCodeBuilder;
+import org.apache.syncope.common.lib.BaseBean;
+import javax.xml.bind.annotation.XmlRootElement;
+import javax.xml.bind.annotation.XmlType;
+
+@XmlRootElement(name = "saml2idpMetadata")
+@XmlType
+public class SAML2IdPMetadataTO extends BaseBean implements EntityTO {
+
+private static final long serialVersionUID = 7215073386484048953L;
+
+private String key;
+
+private String metadata;
+
+private String signingCertificate;
+
+private String signingKey;
+
+private String encryptionCertificate;
+
+private String encryptionKey;
+
+private String appliesTo;
+
+public static class Builder {
+
+private final SAML2IdPMetadataTO instance = new SAML2IdPMetadataTO();
+
+public Builder metadata(final String metadata) {
+instance.setMetadata(metadata);
+return this;
+}
+
+public Builder signingCertificate(final String signingCertificate) {
+instance.setSigningCertificate(signingCertificate);
+return this;
+}
+
+public Builder signingKey(final String signingKey) {
+instance.setSigningKey(signingKey);
+return this;
+}
+
+public Builder encryptionCertificate(final
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-160] Some new tests for authentication modules
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new f1e3b82 [SYNCOPE-160] Some new tests for authentication modules
f1e3b82 is described below
commit f1e3b820c33fc0596f53ba1a3b8b570b4519b037
Author: skylark17
AuthorDate: Mon Apr 6 11:54:57 2020 +0200
[SYNCOPE-160] Some new tests for authentication modules
---
.../core/persistence/jpa/inner/AuthModuleTest.java | 129 ++
.../apache/syncope/fit/core/AuthModuleITCase.java | 187 -
2 files changed, 314 insertions(+), 2 deletions(-)
diff --git
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
index 0b198fa..27c0d22 100644
---
a/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
+++
b/core/persistence-jpa/src/test/java/org/apache/syncope/core/persistence/jpa/inner/AuthModuleTest.java
@@ -327,6 +327,135 @@ public class AuthModuleTest extends AbstractTest {
}
@Test
+public void updateWithGoogleMfaModule() {
+AuthModule module =
authModuleDAO.find("4c3ed4e6-7008-11ea-bc55-0242ac130003");
+assertNotNull(module);
+AuthModuleConf conf = module.getConf();
+GoogleMfaAuthModuleConf.class.cast(conf).setLabel("newLabel");
+module.setConf(conf);
+
+module = authModuleDAO.save(module);
+assertNotNull(module);
+assertNotNull(module.getKey());
+AuthModule found = authModuleDAO.find(module.getKey());
+assertNotNull(found);
+assertEquals("newLabel",
GoogleMfaAuthModuleConf.class.cast(found.getConf()).getLabel());
+}
+
+@Test
+public void updateWithSAML2IdPModule() {
+AuthModule module =
authModuleDAO.find("4c3ed9d2-7008-11ea-bc55-0242ac130003");
+assertNotNull(module);
+AuthModuleConf conf = module.getConf();
+
SAML2IdPAuthModuleConf.class.cast(conf).setServiceProviderEntityId("newEntityId");
+module.setConf(conf);
+
+module = authModuleDAO.save(module);
+assertNotNull(module);
+assertNotNull(module.getKey());
+AuthModule found = authModuleDAO.find(module.getKey());
+assertNotNull(found);
+assertEquals("newEntityId",
SAML2IdPAuthModuleConf.class.cast(found.getConf()).getServiceProviderEntityId());
+}
+
+@Test
+public void updateWithOIDCModule() {
+AuthModule module =
authModuleDAO.find("4c3ed8f6-7008-11ea-bc55-0242ac130003");
+assertNotNull(module);
+AuthModuleConf conf = module.getConf();
+OIDCAuthModuleConf.class.cast(conf).setResponseType("newCode");
+module.setConf(conf);
+
+module = authModuleDAO.save(module);
+assertNotNull(module);
+assertNotNull(module.getKey());
+AuthModule found = authModuleDAO.find(module.getKey());
+assertNotNull(found);
+assertEquals("newCode",
OIDCAuthModuleConf.class.cast(found.getConf()).getResponseType());
+}
+
+@Test
+public void updateWithJaasModule() {
+AuthModule module =
authModuleDAO.find("4c3edbbc-7008-11ea-bc55-0242ac130003");
+assertNotNull(module);
+AuthModuleConf conf = module.getConf();
+JaasAuthModuleConf.class.cast(conf).setRealm("SYNCOPE_NEW");
+module.setConf(conf);
+
+module = authModuleDAO.save(module);
+assertNotNull(module);
+assertNotNull(module.getKey());
+AuthModule found = authModuleDAO.find(module.getKey());
+assertNotNull(found);
+assertEquals("SYNCOPE_NEW",
JaasAuthModuleConf.class.cast(found.getConf()).getRealm());
+}
+
+@Test
+public void updateWithStaticModule() {
+AuthModule module =
authModuleDAO.find("4c3edc98-7008-11ea-bc55-0242ac130003");
+assertNotNull(module);
+assertEquals(1,
StaticAuthModuleConf.class.cast(module.getConf()).getUsers().size());
+AuthModuleConf conf = module.getConf();
+StaticAuthModuleConf.class.cast(conf).getUsers().put("user3",
"user3Password123");
+module.setConf(conf);
+
+module = authModuleDAO.save(module);
+assertNotNull(module);
+assertNotNull(module.getKey());
+AuthModule found = authModuleDAO.find(module.getKey());
+assertNotNull(found);
+assertEquals(2,
StaticAuthModuleConf.class.cast(found.getConf()).getUsers().size());
+}
+
+@Test
+public void updateWithRadiusModule() {
+AuthModule module =
authModuleDAO.find("07c528f3-63
[syncope] branch 2_0_X updated: Small improvement in showing notification messages in Enduser
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 83ba461 Small improvement in showing notification messages in Enduser
83ba461 is described below
commit 83ba461220dca735a30ca4a36790bb4193f365ae
Author: Matteo Alessandroni
AuthorDate: Thu Apr 2 11:01:42 2020 +0200
Small improvement in showing notification messages in Enduser
---
.../src/main/resources/META-INF/resources/app/js/app.js | 17 +
1 file changed, 13 insertions(+), 4 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 41f6c21..1553a55 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -382,9 +382,11 @@ app.run(['$rootScope', '$state', 'AuthService',
'$transitions',
}
};
}]);
-app.controller('ApplicationController', ['$scope', '$rootScope', '$translate',
'InfoService', 'SAML2IdPService',
+app.controller('ApplicationController', ['$scope', '$rootScope', '$translate',
'$sce', 'InfoService', 'SAML2IdPService',
'OIDCProviderService', 'DynamicTemplateService',
- function ($scope, $rootScope, $translate, InfoService, SAML2IdPService,
OIDCProviderService, DynamicTemplateService) {
+ function ($scope, $rootScope, $translate, $sce, InfoService,
SAML2IdPService, OIDCProviderService,
+ DynamicTemplateService) {
+
$scope.initApplication = function () {
/*
* disable by default wizard buttons in self-registration
@@ -576,7 +578,7 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
// forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = $scope.notificationSuccessTimeout;
- component.show(String(message).replace(/<[^>]+>/gm, ''), "success");
+ component.show($scope.sanitizeUrl(String(message)), "success");
}
};
$scope.showError = function (message, component) {
@@ -584,7 +586,7 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
// forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = 0;
- component.show(String(message).replace(/<[^>]+>/gm, ''), "error");
+ component.show($scope.sanitizeUrl(String(message)), "error");
}
};
$scope.hideError = function (message, component) {
@@ -658,5 +660,12 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
$scope.clearCache = function () {
$templateCache.removeAll();
};
+
+ $scope.sanitizeUrl = function (message) {
+var tmp = document.createElement("DIV");
+tmp.innerHTML = $sce.trustAsHtml(message);
+var strippedOutMessage = tmp.textContent || tmp.innerText || "";
+return strippedOutMessage.trim();
+ };
};
}]);
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163-1] Added AuthModule REST service
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 39eb21e [SYNCOPE-163-1] Added AuthModule REST service
39eb21e is described below
commit 39eb21e8a74641473202a6549805bf8ded1cfc8c
Author: skylark17
AuthorDate: Fri Apr 3 16:19:44 2020 +0200
[SYNCOPE-163-1] Added AuthModule REST service
---
.../common/lib/auth/AbstractAuthModuleConf.java| 34 +-
.../syncope/common/lib/auth/AuthModuleConf.java| 18 +-
.../common/lib/auth/JDBCAuthModuleConf.java| 99 +
.../common/lib/auth/LDAPAuthModuleConf.java| 17 +-
.../common/lib/auth/OIDCAuthModuleConf.java| 2 +-
.../common/lib/auth/SAML2IdPAuthModuleConf.java| 4 +-
.../common/lib/auth/StaticAuthModuleConf.java | 8 +-
...hModuleConf.java => SyncopeAuthModuleConf.java} | 47 ++-
.../apache/syncope/common/lib/to/AuthModuleTO.java | 132 +++
.../syncope/common/lib/to/client/ClientAppTO.java | 3 +-
.../syncope/common/lib/types/AMEntitlement.java| 20 +-
.../common/lib/types/AMImplementationType.java | 4 -
.../common/lib/types/AuthModuleConfPropSchema.java | 157
.../common/lib/types/AuthModuleConfProperty.java | 100 -
...lientAppService.java => AuthModuleService.java} | 68 ++--
.../common/rest/api/service/ClientAppService.java | 8 +-
.../apache/syncope/core/logic/AuthModuleLogic.java | 131 +++
.../init/ClassPathScanImplementationLookup.java| 14 -
.../rest/cxf/service/AuthModuleServiceImpl.java| 65
.../persistence/api/dao/auth/AuthModuleDAO.java| 3 -
.../persistence/api/entity/auth/AuthModule.java| 22 +-
.../auth/{AuthModule.java => AuthModuleItem.java} | 13 +-
.../src/test/resources/domains/MasterContent.xml | 23 +-
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 24 +-
.../persistence/jpa/dao/auth/JPAAuthModuleDAO.java | 14 +-
.../persistence/jpa/entity/JPAEntityFactory.java | 6 +-
.../persistence/jpa/entity/auth/JPAAuthModule.java | 77 ++--
.../{JPAAuthModule.java => JPAAuthModuleItem.java} | 64 ++--
.../jpa/entity/policy/JPAAccessPolicy.java | 2 +-
.../jpa/entity/policy/JPAAttrReleasePolicy.java| 2 +-
.../jpa/entity/policy/JPAAuthPolicy.java | 2 +-
.../core/persistence/jpa/inner/AuthModuleTest.java | 331 +
.../core/persistence/jpa/outer/PolicyTest.java | 7 +-
.../src/test/resources/domains/MasterContent.xml | 27 +-
.../api/data/AuthModuleDataBinder.java}| 27 +-
.../java/data/AuthModuleDataBinderImpl.java| 79
.../java/data/ConnInstanceDataBinderImpl.java | 4 -
.../java/data/ImplementationDataBinderImpl.java| 14 -
.../org/apache/syncope/fit/AbstractITCase.java | 17 +
.../apache/syncope/fit/core/AuthModuleITCase.java | 406 +
.../wa/starter/rest/SyncopeServiceRegistry.java| 1 +
41 files changed, 1446 insertions(+), 650 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
index edec434..a4399d6 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/auth/AbstractAuthModuleConf.java
@@ -18,29 +18,20 @@
*/
package org.apache.syncope.common.lib.auth;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import java.io.Serializable;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-import java.io.Serializable;
-import java.util.ArrayList;
-import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import org.apache.syncope.common.lib.to.ItemTO;
@XmlType
-@XmlSeeAlso({ JaasAuthModuleConf.class, StaticAuthModuleConf.class,
LDAPAuthModuleConf.class, OIDCAuthModuleConf.class,
-GoogleMfaAuthModuleConf.class, SAML2IdPAuthModuleConf.class })
+@XmlSeeAlso({ JaasAuthModuleConf.class, StaticAuthModuleConf.class,
LDAPAuthModuleConf.class,
+OIDCAuthModuleConf.class, GoogleMfaAuthModuleConf.class,
SAML2IdPAuthModuleConf.class, U2FAuthModuleConf.class,
+JDBCAuthModuleConf.class, SyncopeAuthModuleConf.class,
RadiusAuthModuleConf.class })
public abstract class AbstractAuthModuleConf implements Serializable,
AuthModuleConf {
private static final long serialVersionUID = 4153200197344709778L;
private String name;
-private int order;
-
-private List profileItems = new ArrayList<>();
-
public AbstractAuthModuleConf() {
setName(getClass().getName());
}
@@ -54,21 +45,4 @@ public abstract class AbstractAuthModuleConf implem
[syncope] branch 2_1_X updated (2733c07 -> 23d7cf7)
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from 2733c07 Upgrading CXF and Elasticsearch add 23d7cf7 Small improvement in showing notification messages in Enduser No new revisions were added by this update. Summary of changes: .../src/main/resources/META-INF/resources/app/js/app.js | 17 + 1 file changed, 13 insertions(+), 4 deletions(-)
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-160] Added new attributes for OIDC RPs and SAML2 SPs
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new b52b588 [SYNCOPE-160] Added new attributes for OIDC RPs and SAML2 SPs
b52b588 is described below
commit b52b588614d7c8e527eb8c970396ba8207e7eee0
Author: skylark17
AuthorDate: Wed Mar 18 14:40:47 2020 +0100
[SYNCOPE-160] Added new attributes for OIDC RPs and SAML2 SPs
---
.../common/lib/to/client/OIDCRelyingPartyTO.java | 68 +-
.../lib/to/client/SAML2ServiceProviderTO.java | 136 ++-
.../syncope/common/lib/types/OIDCSubjectType.java | 17 +--
.../lib/types/SAML2ServiceProviderNameId.java | 43 ++
.../entity/authentication/OIDCRelyingParty.java| 19 ++-
.../authentication/SAML2ServiceProvider.java | 47 +++
.../dao/authentication/JPAOIDCRelyingPartyDAO.java | 3 +-
.../entity/authentication/JPAOIDCRelyingParty.java | 81 ++--
.../authentication/JPASAML2ServiceProvider.java| 145 +
.../jpa/inner/OIDCRelyingPartyTest.java| 20 +--
.../jpa/inner/SAML2ServiceProviderTest.java| 4 +
.../core/persistence/jpa/outer/PolicyTest.java | 6 +-
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 20 ++-
.../data/SAML2ServiceProviderDataBinderImpl.java | 24 +++-
.../syncope/fit/core/OIDCRelyingPartyITCase.java | 13 +-
.../fit/core/SAML2ServiceProviderITCase.java | 11 +-
16 files changed, 610 insertions(+), 47 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
index 54f473f..e8f5f57 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/OIDCRelyingPartyTO.java
@@ -20,17 +20,20 @@ package org.apache.syncope.common.lib.to.client;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import java.util.ArrayList;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
-import java.util.ArrayList;
+import java.util.HashSet;
import java.util.List;
+import java.util.Set;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
+import org.apache.syncope.common.lib.types.OIDCSubjectType;
-@XmlRootElement(name = "openIdConnectRelyingParty")
+@XmlRootElement(name = "oidcRelyingParty")
@XmlType
@Schema(allOf = { ClientAppTO.class })
public class OIDCRelyingPartyTO extends ClientAppTO {
@@ -41,11 +44,22 @@ public class OIDCRelyingPartyTO extends ClientAppTO {
private String clientSecret;
+private boolean signIdToken;
+
+private String jwks;
+
+private OIDCSubjectType subjectType;
+
private final List redirectUris = new ArrayList<>();
+private final Set supportedGrantTypes = new HashSet<>();
+
+private final Set supportedResponseTypes = new HashSet<>();
+
@XmlTransient
@JsonProperty("@class")
-@Schema(name = "@class", required = true, example =
"org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO")
+@Schema(name = "@class", required = true,
+example =
"org.apache.syncope.common.lib.to.client.OIDCRelyingPartyTO")
@Override
public String getDiscriminator() {
return getClass().getName();
@@ -74,6 +88,44 @@ public class OIDCRelyingPartyTO extends ClientAppTO {
return redirectUris;
}
+@XmlElementWrapper(name = "supportedGrantTypes")
+@XmlElement(name = "supportedGrantType")
+@JsonProperty("supportedGrantTypes")
+public Set getSupportedGrantTypes() {
+return supportedGrantTypes;
+}
+
+@XmlElementWrapper(name = "supportedResponseTypes")
+@XmlElement(name = "supportedResponseType")
+@JsonProperty("supportedResponseTypes")
+public Set getSupportedResponseTypes() {
+return supportedResponseTypes;
+}
+
+public boolean isSignIdToken() {
+return signIdToken;
+}
+
+public void setSignIdToken(final boolean signIdToken) {
+this.signIdToken = signIdToken;
+}
+
+public String getJwks() {
+return jwks;
+}
+
+public void setJwks(final String jwks) {
+this.jwks = jwks;
+}
+
+public OIDCSubjectType getSubjectType() {
+return subjectType;
+}
+
+public void setSubjectTy
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-160] Added support to authentication modules for profile items
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new f0d8f31 [SYNCOPE-160] Added support to authentication modules for
profile items
f0d8f31 is described below
commit f0d8f31ac92ff75865ca7bf310c51dd712795f3e
Author: skylark17
AuthorDate: Wed Mar 18 10:17:55 2020 +0100
[SYNCOPE-160] Added support to authentication modules for profile items
---
.../module/AbstractAuthModuleConf.java | 21 ++-
.../lib/authentication/module/AuthModuleConf.java | 11 +++-
.../syncope/common/lib/to/ProfileItemTO.java | 16 +
.../api/entity/policy/AttrReleasePolicy.java | 1 -
.../persistence/api/entity/policy/AuthPolicy.java | 1 -
.../core/persistence/jpa/inner/AuthModuleTest.java | 70 --
6 files changed, 72 insertions(+), 48 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
index bc24376..5ca2010 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AbstractAuthModuleConf.java
@@ -18,13 +18,19 @@
*/
package org.apache.syncope.common.lib.authentication.module;
+import com.fasterxml.jackson.annotation.JsonProperty;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
+import org.apache.syncope.common.lib.to.ProfileItemTO;
@XmlType
-@XmlSeeAlso({ JaasAuthModuleConf.class, StaticAuthModuleConf.class,
-LDAPAuthModuleConf.class })
+@XmlSeeAlso({ JaasAuthModuleConf.class, StaticAuthModuleConf.class,
LDAPAuthModuleConf.class, OIDCAuthModuleConf.class,
+GoogleMfaAuthModuleConf.class, SAML2IdPAuthModuleConf.class })
public abstract class AbstractAuthModuleConf implements Serializable,
AuthModuleConf {
private static final long serialVersionUID = 4153200197344709778L;
@@ -33,6 +39,8 @@ public abstract class AbstractAuthModuleConf implements
Serializable, AuthModule
private int order;
+private List profileItems = new ArrayList<>();
+
public AbstractAuthModuleConf() {
setName(getClass().getName());
}
@@ -54,4 +62,13 @@ public abstract class AbstractAuthModuleConf implements
Serializable, AuthModule
public void setOrder(final int order) {
this.order = order;
}
+
+@XmlElementWrapper(name = "profileItems")
+@XmlElement(name = "profileItem")
+@JsonProperty("profileItems")
+@Override
+public List getProfileItems() {
+return profileItems;
+}
+
}
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
index a6e66db..0858313 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/module/AuthModuleConf.java
@@ -20,12 +20,14 @@ package org.apache.syncope.common.lib.authentication.module;
import com.fasterxml.jackson.annotation.JsonTypeInfo;
import java.io.Serializable;
+import java.util.List;
+import org.apache.syncope.common.lib.to.ProfileItemTO;
@JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY,
property = "@class")
public interface AuthModuleConf extends Serializable {
/**
- * Give name of related authentication module instance.
+ * Given name of related authentication module instance.
*
* @return name of this authentication module instance
*/
@@ -37,4 +39,11 @@ public interface AuthModuleConf extends Serializable {
* @return numeric order
*/
int getOrder();
+
+/**
+ * Specify the mapping items for the attributes fetched from the source.
+ *
+ * @return list of mapping items
+ */
+List getProfileItems();
}
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthPolicy.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ProfileItemTO.java
similarity index 68%
copy from
core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/policy/AuthPolicy.java
copy to
common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ProfileItemTO.java
index c4beae1..f0768
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-160] fixes to collections for JAX-RS compatibility
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 2c6ff17 [SYNCOPE-160] fixes to collections for JAX-RS compatibility
2c6ff17 is described below
commit 2c6ff173cf5ca69cc25cb00a677ee0c8eafefd9b
Author: skylark17
AuthorDate: Mon Mar 16 14:58:09 2020 +0100
[SYNCOPE-160] fixes to collections for JAX-RS compatibility
---
.../lib/access/AbstractAccessPolicyConf.java | 11 +++--
.../lib/attrs/AllowedAttrReleasePolicyConf.java| 12 --
.../module/LdapAuthenticationModuleConf.java | 14 ---
.../module/SAML2IdPAuthenticationModuleConf.java | 47 ++
.../policy/DefaultAuthenticationPolicyConf.java| 12 +++---
.../common/lib/to/client/OIDCRelyingPartyTO.java | 34
.../jpa/inner/AbstractClientAppTest.java | 4 +-
.../jpa/inner/AuthenticationModuleTest.java| 10 ++---
.../core/persistence/jpa/inner/PolicyTest.java | 14 +++
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 2 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 6 +--
.../org/apache/syncope/fit/core/RealmITCase.java | 4 +-
12 files changed, 89 insertions(+), 81 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
index a0be8bb..43ee5df 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/access/AbstractAccessPolicyConf.java
@@ -18,12 +18,15 @@
*/
package org.apache.syncope.common.lib.access;
+import com.fasterxml.jackson.annotation.JsonProperty;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
@XmlType
@XmlSeeAlso({ DefaultAccessPolicyConf.class })
@@ -37,7 +40,7 @@ public abstract class AbstractAccessPolicyConf implements
Serializable, AccessPo
private boolean ssoEnabled = true;
-private Map> requiredAttributes = new
LinkedHashMap<>();
+private final Map> requiredAttributes = new
LinkedHashMap<>();
public AbstractAccessPolicyConf() {
setName(getClass().getName());
@@ -70,12 +73,12 @@ public abstract class AbstractAccessPolicyConf implements
Serializable, AccessPo
this.ssoEnabled = ssoEnabled;
}
+@XmlElementWrapper(name = "requiredAttributes")
+@XmlElement(name = "requiredAttribute")
+@JsonProperty("requiredAttributes")
@Override
public Map> getRequiredAttributes() {
return requiredAttributes;
}
-public void setRequiredAttributes(final Map>
requiredAttributes) {
-this.requiredAttributes = requiredAttributes;
-}
}
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
index 9dd3762..53e716d 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/attrs/AllowedAttrReleasePolicyConf.java
@@ -18,28 +18,32 @@
*/
package org.apache.syncope.common.lib.attrs;
+import com.fasterxml.jackson.annotation.JsonProperty;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
import java.util.ArrayList;
import java.util.List;
+import javax.xml.bind.annotation.XmlElement;
+import javax.xml.bind.annotation.XmlElementWrapper;
@XmlRootElement(name = "AllowedAttrReleasePolicyConf")
@XmlType
public class AllowedAttrReleasePolicyConf extends
AbstractAttrReleasePolicyConf implements AttrReleasePolicyConf {
+
private static final long serialVersionUID = -1969836661359025380L;
/**
* Specify the list of allowed attribute to release.
* Use the special {@code *} to release everything.
*/
-private List allowedAttributes = new ArrayList<>();
+private final List allowedAttributes = new ArrayList<>();
+@XmlElementWrapper(name = "allowedAttributes")
+@XmlElement(name = "allowedAttribute")
+@JsonProperty("allowedAttributes")
public List getAllowedAttributes() {
return allowedAttributes;
}
-public void setAllowedAttributes(final List allowedAttributes) {
-this.allowedAttributes = allowedAttribute
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Improvements in the IT case for realm and new policies
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 90eed7e [SYNCOPE-163] Improvements in the IT case for realm and new
policies
90eed7e is described below
commit 90eed7e99bdc59bbb75869e2e8087295fa01d03e
Author: skylark17
AuthorDate: Tue Mar 10 10:27:07 2020 +0100
[SYNCOPE-163] Improvements in the IT case for realm and new policies
---
.../org/apache/syncope/fit/core/RealmITCase.java | 159 -
1 file changed, 158 insertions(+), 1 deletion(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
index 7f3f7e4..43ffd71 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/RealmITCase.java
@@ -32,12 +32,19 @@ import javax.ws.rs.core.GenericType;
import javax.ws.rs.core.Response;
import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.SyncopeConstants;
+import org.apache.syncope.common.lib.access.DefaultAccessPolicyConf;
+import org.apache.syncope.common.lib.attrs.AllowedAttrReleasePolicyConf;
+import
org.apache.syncope.common.lib.authentication.policy.DefaultAuthenticationPolicyConf;
import org.apache.syncope.common.lib.policy.AccountPolicyTO;
import org.apache.syncope.common.lib.to.RealmTO;
import org.apache.syncope.common.lib.policy.DefaultAccountRuleConf;
+import org.apache.syncope.common.lib.to.AccessPolicyTO;
+import org.apache.syncope.common.lib.to.AttrReleasePolicyTO;
+import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.to.ImplementationTO;
import org.apache.syncope.common.lib.to.PagedResult;
import org.apache.syncope.common.lib.to.ProvisioningResult;
+import org.apache.syncope.common.lib.types.AMImplementationType;
import org.apache.syncope.common.lib.types.ClientExceptionType;
import org.apache.syncope.common.lib.types.ImplementationEngine;
import org.apache.syncope.common.lib.types.PolicyType;
@@ -176,7 +183,7 @@ public class RealmITCase extends AbstractITCase {
// 2. create realm with policy assigned
RealmTO realm = new RealmTO();
-realm.setName("withppolicy");
+realm.setName("withPolicy");
response = realmService.create(SyncopeConstants.ROOT_REALM, realm);
RealmTO[] actuals = getObject(response.getLocation(),
RealmService.class, RealmTO[].class);
@@ -204,6 +211,156 @@ public class RealmITCase extends AbstractITCase {
}
@Test
+public void deletingAuthenticationPolicy() {
+// 1. create authentication policy
+DefaultAuthenticationPolicyConf ruleConf = new
DefaultAuthenticationPolicyConf();
+ruleConf.setAuthenticationModules(List.of("LdapAuthentication1"));
+
+ImplementationTO rule = new ImplementationTO();
+rule.setKey("TestAuthenticationPolicy" + getUUIDString());
+rule.setEngine(ImplementationEngine.JAVA);
+rule.setType(AMImplementationType.AUTH_POLICY_CONFIGURATIONS);
+rule.setBody(POJOHelper.serialize(ruleConf));
+Response response = implementationService.create(rule);
+rule.setKey(response.getHeaderString(RESTHeaders.RESOURCE_KEY));
+
+AuthenticationPolicyTO policy = new AuthenticationPolicyTO();
+policy.setDescription("Test Authentication policy");
+policy.setKey(rule.getKey());
+policy = createPolicy(PolicyType.AUTHENTICATION, policy);
+assertNotNull(policy);
+
+// 2. create realm with policy assigned
+RealmTO realm = new RealmTO();
+realm.setName("withAuthPolicy");
+
+response = realmService.create(SyncopeConstants.ROOT_REALM, realm);
+RealmTO[] actuals = getObject(response.getLocation(),
RealmService.class, RealmTO[].class);
+assertNotNull(actuals);
+assertTrue(actuals.length > 0);
+realm = actuals[0];
+
+String existingAuthenticationPolicy = realm.getAuthenticationPolicy();
+
+realm.setAuthenticationPolicy(policy.getKey());
+realmService.update(realm);
+
+actuals = getObject(response.getLocation(), RealmService.class,
RealmTO[].class);
+assertNotNull(actuals);
+assertTrue(actuals.length > 0);
+RealmTO actual = actuals[0];
+assertEquals(policy.getKey(), actual.getAuthenticationPolicy());
+
+// 3. remove policy
+policyService.delete(PolicyType.AUTHENTICATION, policy.getKey());
+
+// 4. verify
+actual = getRealm(actual.getFullPath()).get();
+assertEquals(existingAuthenticationPolicy,
actua
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Added Access, Authentication and AttrRelease policies to Realm object
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 1a7186c [SYNCOPE-163] Added Access, Authentication and AttrRelease
policies to Realm object
1a7186c is described below
commit 1a7186c56a9f5e852b74405c7477070bd5dc57a2
Author: skylark17
AuthorDate: Mon Mar 9 17:17:13 2020 +0100
[SYNCOPE-163] Added Access, Authentication and AttrRelease policies to
Realm object
---
.../syncope/common/lib/to/AccessPolicyTO.java | 1 -
.../syncope/common/lib/to/AttrReleasePolicyTO.java | 6 +-
.../org/apache/syncope/common/lib/to/RealmTO.java | 36 +
.../api/entity/policy/AccessPolicy.java| 1 -
.../src/test/resources/domains/MasterContent.xml | 5 ++
.../jpa/entity/policy/JPAAccessPolicy.java | 4 +-
.../jpa/entity/policy/JPAAttrReleasePolicy.java| 14 ++--
.../src/test/resources/domains/MasterContent.xml | 2 +-
.../java/data/RealmDataBinderImpl.java | 86 +-
.../org/apache/syncope/fit/core/PolicyITCase.java | 60 ---
.../org/apache/syncope/fit/core/RealmITCase.java | 6 ++
11 files changed, 176 insertions(+), 45 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AccessPolicyTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AccessPolicyTO.java
index c0182e4..c555106 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AccessPolicyTO.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AccessPolicyTO.java
@@ -21,7 +21,6 @@ package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.syncope.common.lib.policy.PolicyTO;
-
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AttrReleasePolicyTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AttrReleasePolicyTO.java
index e0f8144..2394da9 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AttrReleasePolicyTO.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/AttrReleasePolicyTO.java
@@ -16,13 +16,11 @@
* under the License.
*
*/
-
package org.apache.syncope.common.lib.to;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
import org.apache.syncope.common.lib.policy.PolicyTO;
-
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -35,11 +33,9 @@ public class AttrReleasePolicyTO extends PolicyTO {
@XmlTransient
@JsonProperty("@class")
-@Schema(name = "@class", required = true,
-example = "org.apache.syncope.common.lib.to.AttrReleasePolicyTO")
+@Schema(name = "@class", required = true, example =
"org.apache.syncope.common.lib.to.AttrReleasePolicyTO")
@Override
public String getDiscriminator() {
return getClass().getName();
}
}
-
diff --git
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
index 910043f..e0514eb 100644
---
a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
+++
b/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/to/RealmTO.java
@@ -54,6 +54,12 @@ public class RealmTO extends BaseBean implements
NamedEntityTO, TemplatableTO {
private String passwordPolicy;
+private String authenticationPolicy;
+
+private String accessPolicy;
+
+private String attrReleasePolicy;
+
private final List actions = new ArrayList<>();
@XmlJavaTypeAdapter(XmlGenericMapAdapter.class)
@@ -114,6 +120,30 @@ public class RealmTO extends BaseBean implements
NamedEntityTO, TemplatableTO {
this.passwordPolicy = passwordPolicy;
}
+public String getAuthenticationPolicy() {
+return authenticationPolicy;
+}
+
+public void setAuthenticationPolicy(final String authenticationPolicy) {
+this.authenticationPolicy = authenticationPolicy;
+}
+
+public String getAccessPolicy() {
+return accessPolicy;
+}
+
+public void setAccessPolicy(final String accessPolicy) {
+this.accessPolicy = accessPolicy;
+}
+
+public String getAttrReleasePolicy() {
+return attrReleasePolicy;
+}
+
+public void setAttrReleasePolicy(final String attrReleasePolicy) {
+this.attrReleasePolicy = attrReleasePolicy;
+}
+
@X
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Added IT case for SAML 2 service provider
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 878c270 [SYNCOPE-163] Added IT case for SAML 2 service provider
878c270 is described below
commit 878c270f9b02589c06175098e774662b92568a8f
Author: skylark17
AuthorDate: Mon Mar 9 12:04:14 2020 +0100
[SYNCOPE-163] Added IT case for SAML 2 service provider
---
.../java/data/OIDCRelyingPartyDataBinderImpl.java | 5 ++-
.../data/SAML2ServiceProviderDataBinderImpl.java | 52 +-
.../org/apache/syncope/fit/AbstractITCase.java | 23 +++---
.../syncope/fit/core/OIDCRelyingPartyITCase.java | 22 -
.../fit/core/SAML2ServiceProviderITCase.java | 45 ++-
5 files changed, 116 insertions(+), 31 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
index d2a5d1b..c96ea2a 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/OIDCRelyingPartyDataBinderImpl.java
@@ -52,8 +52,8 @@ public class OIDCRelyingPartyDataBinderImpl implements
OIDCRelyingPartyDataBinde
@Override
public OIDCRelyingParty update(
-final OIDCRelyingParty toBeUpdated,
-final OIDCRelyingPartyTO applicationTO) {
+final OIDCRelyingParty toBeUpdated,
+final OIDCRelyingPartyTO applicationTO) {
OIDCRelyingParty application =
openIdConnectRelyingPartyDAO.save(toBeUpdated);
@@ -101,6 +101,7 @@ public class OIDCRelyingPartyDataBinderImpl implements
OIDCRelyingPartyDataBinde
accessPolicyTO.setKey(rp.getAccessPolicy().getKey());
applicationTO.setAccessPolicy(accessPolicyTO);
}
+
return applicationTO;
}
}
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
index dda8370..bedfc98 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/SAML2ServiceProviderDataBinderImpl.java
@@ -16,14 +16,19 @@
* under the License.
*
*/
-
package org.apache.syncope.core.provisioning.java.data;
+import org.apache.syncope.common.lib.SyncopeClientException;
+import org.apache.syncope.common.lib.to.AccessPolicyTO;
+import org.apache.syncope.common.lib.to.AuthenticationPolicyTO;
import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
+import org.apache.syncope.common.lib.types.ClientExceptionType;
+import
org.apache.syncope.core.persistence.api.dao.authentication.AccessPolicyDAO;
import
org.apache.syncope.core.persistence.api.dao.authentication.AuthenticationPolicyDAO;
import
org.apache.syncope.core.persistence.api.dao.authentication.SAML2ServiceProviderDAO;
import org.apache.syncope.core.persistence.api.entity.EntityFactory;
import
org.apache.syncope.core.persistence.api.entity.authentication.SAML2ServiceProvider;
+import org.apache.syncope.core.persistence.api.entity.policy.AccessPolicy;
import
org.apache.syncope.core.persistence.api.entity.policy.AuthenticationPolicy;
import
org.apache.syncope.core.provisioning.api.data.SAML2ServiceProviderDataBinder;
import org.springframework.beans.factory.annotation.Autowired;
@@ -31,6 +36,7 @@ import org.springframework.stereotype.Component;
@Component
public class SAML2ServiceProviderDataBinderImpl implements
SAML2ServiceProviderDataBinder {
+
@Autowired
private SAML2ServiceProviderDAO saml2ServiceProviderDAO;
@@ -40,14 +46,19 @@ public class SAML2ServiceProviderDataBinderImpl implements
SAML2ServiceProviderD
@Autowired
private AuthenticationPolicyDAO authenticationPolicyDAO;
+@Autowired
+private AccessPolicyDAO accessPolicyDAO;
+
@Override
public SAML2ServiceProvider create(final SAML2ServiceProviderTO
applicationTO) {
return update(entityFactory.newEntity(SAML2ServiceProvider.class),
applicationTO);
}
@Override
-public SAML2ServiceProvider update(final SAML2ServiceProvider toBeUpdated,
- final SAML2ServiceProviderTO
applicationTO) {
+public SAML2ServiceProvider update(
+final SAML2ServiceProvider toBeUpdated,
+final SAML2ServiceProviderTO applicationTO
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Removed access and authentication policies from external resource
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 20464c8 [SYNCOPE-163] Removed access and authentication policies from
external resource
20464c8 is described below
commit 20464c844b502e7ba30f79f353dc3fe50ccf01e7
Author: skylark17
AuthorDate: Fri Mar 6 09:11:13 2020 +0100
[SYNCOPE-163] Removed access and authentication policies from external
resource
---
.../lib/to/client/SAML2ServiceProviderTO.java | 23 -
.../service/saml/SAML2ServiceProviderService.java | 4 +-
.../api/entity/resource/ExternalResource.java | 10
.../src/test/resources/domains/MasterContent.xml | 2 +-
.../jpa/dao/JPAExternalResourceDAO.java| 6 ---
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 55 +++---
.../entity/authentication/AbstractClientApp.java | 1 -
.../jpa/entity/resource/JPAExternalResource.java | 32 -
.../src/test/resources/domains/MasterContent.xml | 2 +-
.../java/data/PolicyDataBinderImpl.java| 12 +++--
.../java/data/ResourceDataBinderImpl.java | 18 ---
.../org/apache/syncope/fit/core/SAML2SPITCase.java | 31
12 files changed, 80 insertions(+), 116 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
index 7bf5289..f292a22 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/client/SAML2ServiceProviderTO.java
@@ -16,15 +16,13 @@
* under the License.
*
*/
-
package org.apache.syncope.common.lib.to.client;
import com.fasterxml.jackson.annotation.JsonProperty;
import io.swagger.v3.oas.annotations.media.Schema;
+import javax.xml.bind.annotation.XmlRootElement;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-
-import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlTransient;
import javax.xml.bind.annotation.XmlType;
@@ -32,6 +30,7 @@ import javax.xml.bind.annotation.XmlType;
@XmlType
@Schema(allOf = { ClientAppTO.class })
public class SAML2ServiceProviderTO extends ClientAppTO {
+
private static final long serialVersionUID = -6370888503924521351L;
private String entityId;
@@ -62,7 +61,6 @@ public class SAML2ServiceProviderTO extends ClientAppTO {
this.metadataLocation = metadataLocation;
}
-
@Override
public boolean equals(final Object obj) {
if (obj == null) {
@@ -76,19 +74,18 @@ public class SAML2ServiceProviderTO extends ClientAppTO {
}
SAML2ServiceProviderTO rhs = (SAML2ServiceProviderTO) obj;
return new EqualsBuilder()
-.appendSuper(super.equals(obj))
-.append(this.entityId, rhs.entityId)
-.append(this.metadataLocation, rhs.metadataLocation)
-.isEquals();
+.appendSuper(super.equals(obj))
+.append(this.entityId, rhs.entityId)
+.append(this.metadataLocation, rhs.metadataLocation)
+.isEquals();
}
@Override
public int hashCode() {
return new HashCodeBuilder()
-.appendSuper(super.hashCode())
-.append(entityId)
-.append(metadataLocation)
-.toHashCode();
+.appendSuper(super.hashCode())
+.append(entityId)
+.append(metadataLocation)
+.toHashCode();
}
}
-
diff --git
a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
index e99aa23..c16183f 100644
---
a/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
+++
b/common/am/rest-api/src/main/java/org/apache/syncope/common/rest/api/service/saml/SAML2ServiceProviderService.java
@@ -16,7 +16,6 @@
* under the License.
*
*/
-
package org.apache.syncope.common.rest.api.service.saml;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -24,13 +23,12 @@ import
io.swagger.v3.oas.annotations.security.SecurityRequirements;
import io.swagger.v3.oas.annotations.tags.Tag;
import org.apache.syncope.common.lib.to.client.SAML2ServiceProviderTO;
import org.apache.syncope.common.rest.api.service.ClientAppService;
-
import javax.ws.rs.Path;
@Tag(name = "SAML2ServiceProviders")
@SecurityRequirements({
@SecurityRequir
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Preparing for SAML2 SP IT case
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 03caca5 [SYNCOPE-163] Preparing for SAML2 SP IT case
03caca5 is described below
commit 03caca59d7b96fc65f1328731bb85011c93bd326
Author: skylark17
AuthorDate: Wed Mar 4 17:54:56 2020 +0100
[SYNCOPE-163] Preparing for SAML2 SP IT case
---
.../fit/core/OpenIdConnectRelyingPartyITCase.java| 3 +--
...ServiceProviderITCase.java => SAML2SPITCase.java} | 20 +---
2 files changed, 18 insertions(+), 5 deletions(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
index 2e26f46..f212ef0 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
@@ -24,7 +24,6 @@ import
org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
import org.apache.syncope.common.lib.types.PolicyType;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
import org.apache.syncope.common.lib.policy.AccessPolicyTO;
import static org.junit.jupiter.api.Assertions.*;
@@ -34,7 +33,7 @@ import org.apache.syncope.common.lib.SyncopeClientException;
public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
@Test
-public void create() throws IOException {
+public void create() {
createOpenIdConnectRelyingParty(buildRelyingParty());
}
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2SPITCase.java
similarity index 81%
rename from
fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
rename to
fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2SPITCase.java
index 7ef2fe4..775fdcb 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2ServiceProviderITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/SAML2SPITCase.java
@@ -20,12 +20,26 @@ package org.apache.syncope.fit.core;
import org.apache.syncope.fit.AbstractITCase;
import org.junit.jupiter.api.Test;
-import java.io.IOException;
-public class SAML2ServiceProviderITCase extends AbstractITCase {
+public class SAML2SPITCase extends AbstractITCase {
@Test
-public void createSAMLSP() throws IOException {
+public void create() {
+
+}
+
+@Test
+public void read() {
+
+}
+
+@Test
+public void update() {
+
+}
+
+@Test
+public void delete() {
}
}
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Renaming methods
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new f72c831 [SYNCOPE-163] Renaming methods
f72c831 is described below
commit f72c831904bbde16d9fdfc746b3c20addd705c9c
Author: skylark17
AuthorDate: Wed Mar 4 17:36:24 2020 +0100
[SYNCOPE-163] Renaming methods
---
.../apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java | 8
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
index 7dc03cf..2e26f46 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/core/OpenIdConnectRelyingPartyITCase.java
@@ -34,12 +34,12 @@ import org.apache.syncope.common.lib.SyncopeClientException;
public class OpenIdConnectRelyingPartyITCase extends AbstractITCase {
@Test
-public void createRelyingParty() throws IOException {
+public void create() throws IOException {
createOpenIdConnectRelyingParty(buildRelyingParty());
}
@Test
-public void findRelyingParty() {
+public void read() {
OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
@@ -52,7 +52,7 @@ public class OpenIdConnectRelyingPartyITCase extends
AbstractITCase {
}
@Test
-public void updateRelyingParty() {
+public void update() {
OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
@@ -75,7 +75,7 @@ public class OpenIdConnectRelyingPartyITCase extends
AbstractITCase {
}
@Test
-public void deleteRelyingParty() {
+public void delete() {
OpenIdConnectRelyingPartyTO rpTO = buildRelyingParty();
rpTO = createOpenIdConnectRelyingParty(rpTO);
[syncope] branch SYNCOPE-163-1 updated: [SYNCOPE-163] Added IT case for OIDC relying parties
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 98dda34 [SYNCOPE-163] Added IT case for OIDC relying parties
98dda34 is described below
commit 98dda34927757d42625beb8f13665819dc170c20
Author: skylark17
AuthorDate: Wed Mar 4 17:26:41 2020 +0100
[SYNCOPE-163] Added IT case for OIDC relying parties
---
.../init/ClassPathScanImplementationLookup.java| 2 +-
.../core/logic/OpenIdConnectRelyingPartyLogic.java | 8 +--
.../authentication/OpenIdConnectRelyingParty.java | 2 +-
.../JPAOpenIdConnectRelyingPartyDAO.java | 29
.../authentication/AbstractClientApplication.java | 11 ++-
.../JPAOpenIdConnectRelyingParty.java | 5 +-
.../jpa/inner/OpenIdConnectRelyingPartyTest.java | 4 +-
.../OpenIdConnectRelyingPartyDataBinderImpl.java | 9 +--
.../org/apache/syncope/fit/AbstractITCase.java | 15 +++-
.../fit/core/OpenIdConnectRelyingPartyITCase.java | 82 +++---
.../fit/core/SAML2ServiceProviderITCase.java | 21 +++---
11 files changed, 125 insertions(+), 63 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
index 3064747..f1733f5 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java
@@ -241,7 +241,7 @@ public class ClassPathScanImplementationLookup {
idmPages.sort(Comparator.comparing(o ->
o.getAnnotation(IdMPage.class).priority()));
idmPages = Collections.unmodifiableList(idmPages);
-amPages.sort(Comparator.comparing(o ->
o.getAnnotation(IdMPage.class).priority()));
+amPages.sort(Comparator.comparing(o ->
o.getAnnotation(AMPage.class).priority()));
amPages = Collections.unmodifiableList(amPages);
extPages.sort(Comparator.comparing(o ->
o.getAnnotation(ExtPage.class).priority()));
diff --git
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
index 3d7a2e8..2ebc1e5 100644
---
a/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
+++
b/core/am/logic/src/main/java/org/apache/syncope/core/logic/OpenIdConnectRelyingPartyLogic.java
@@ -16,7 +16,6 @@
* under the License.
*
*/
-
package org.apache.syncope.core.logic;
import org.apache.syncope.common.lib.to.OpenIdConnectRelyingPartyTO;
@@ -36,6 +35,7 @@ import org.apache.syncope.common.lib.types.AMEntitlement;
@Component
public class OpenIdConnectRelyingPartyLogic extends
AbstractClientApplicationLogic {
+
@Autowired
private OpenIdConnectRelyingPartyDAO openIdConnectRelyingPartyDAO;
@@ -61,7 +61,7 @@ public class OpenIdConnectRelyingPartyLogic extends
AbstractClientApplicationLog
@Override
public List list() {
return openIdConnectRelyingPartyDAO.findAll()
-
.stream().map(binder::getClientApplicationTO).collect(Collectors.toList());
+
.stream().map(binder::getClientApplicationTO).collect(Collectors.toList());
}
@PreAuthorize("hasRole('" + AMEntitlement.OIDC_RELYING_PARTY_CREATE + "')")
@@ -79,7 +79,7 @@ public class OpenIdConnectRelyingPartyLogic extends
AbstractClientApplicationLog
throw new NotFoundException(applicationTO.getKey());
}
return binder.getClientApplicationTO(
-openIdConnectRelyingPartyDAO.save(binder.update(application,
applicationTO)));
+openIdConnectRelyingPartyDAO.save(binder.update(application,
applicationTO)));
}
@Override
@@ -96,5 +96,5 @@ public class OpenIdConnectRelyingPartyLogic extends
AbstractClientApplicationLog
openIdConnectRelyingPartyDAO.delete(key);
return deleted;
}
-
+
}
diff --git
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OpenIdConnectRelyingParty.java
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OpenIdConnectRelyingParty.java
index 6ad2cc5..90d2025 100644
---
a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OpenIdConnectRelyingParty.java
+++
b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/authentication/OpenIdConnectRelyingParty.java
@@ -16,12 +16,12 @@
* under
[syncope] branch SYNCOPE-163-1 updated: Fixes for Access policy and Authentication policy, added IT for both policies
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-163-1
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push:
new 0f7b7d2 Fixes for Access policy and Authentication policy, added IT
for both policies
0f7b7d2 is described below
commit 0f7b7d201c92b1f4ab60364222c5aed8d933cbea
Author: skylark17
AuthorDate: Wed Mar 4 10:13:09 2020 +0100
Fixes for Access policy and Authentication policy, added IT for both
policies
---
.../authentication/AbstractAccessPolicyConf.java | 3 +-
.../AbstractAuthenticationPolicyConf.java | 4 +-
.../lib/authentication/AccessPolicyConf.java | 3 +-
.../authentication/AuthenticationModuleConf.java | 1 -
.../authentication/AuthenticationPolicyConf.java | 2 +-
.../authentication/DefaultAccessPolicyConf.java| 7 +-
.../DefaultAuthenticationPolicyConf.java | 7 +-
.../syncope/common/lib/policy/AccessPolicyTO.java | 3 +-
.../common/lib/policy/AuthenticationPolicyTO.java | 1 -
.../apache/syncope/common/lib/to/ResourceTO.java | 26 +++
.../init/ClassPathScanImplementationLookup.java| 141
.../core/persistence/api/dao/PolicyDAO.java| 6 +
.../syncope/core/persistence/api/entity/Realm.java | 11 +-
.../api/entity/resource/ExternalResource.java | 10 ++
.../src/test/resources/domains/MasterContent.xml | 15 ++
.../jpa/dao/JPAExternalResourceDAO.java| 6 +
.../core/persistence/jpa/dao/JPAPolicyDAO.java | 50 --
.../core/persistence/jpa/dao/JPARealmDAO.java | 3 +
.../authentication/JPAAuthenticationPolicyDAO.java | 4 +-
.../core/persistence/jpa/entity/JPARealm.java | 32
.../jpa/entity/policy/JPAAccessPolicy.java | 14 +-
.../jpa/entity/policy/JPAAuthenticationPolicy.java | 14 +-
.../jpa/entity/resource/JPAExternalResource.java | 32
.../jpa/inner/AuthenticationPolicyTest.java| 6 +-
.../persistence/jpa/inner/ImplementationTest.java | 8 +-
.../src/test/resources/domains/MasterContent.xml | 20 ++-
.../java/data/ImplementationDataBinderImpl.java| 20 ++-
.../java/data/PolicyDataBinderImpl.java| 28
.../java/data/ResourceDataBinderImpl.java | 14 ++
.../org/apache/syncope/fit/core/PolicyITCase.java | 183 +++--
30 files changed, 600 insertions(+), 74 deletions(-)
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
index 3e4ed98..d0eb6d0 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java
@@ -18,14 +18,15 @@
*/
package org.apache.syncope.common.lib.authentication;
+import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-
import java.io.Serializable;
import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
@XmlType
+@XmlSeeAlso({ DefaultAccessPolicyConf.class })
public abstract class AbstractAccessPolicyConf implements Serializable,
AccessPolicyConf {
private static final long serialVersionUID = 1153200197344709778L;
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
index fc9352b..1fa4367 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java
@@ -16,16 +16,14 @@
* under the License.
*
*/
-
package org.apache.syncope.common.lib.authentication;
import javax.xml.bind.annotation.XmlSeeAlso;
import javax.xml.bind.annotation.XmlType;
-
import java.io.Serializable;
@XmlType
-@XmlSeeAlso({DefaultAuthenticationPolicyConf.class})
+@XmlSeeAlso({ DefaultAuthenticationPolicyConf.class })
public abstract class AbstractAuthenticationPolicyConf implements
Serializable, AuthenticationPolicyConf {
private static final long serialVersionUID = 9185127128182430142L;
diff --git
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
index c8a30c0..d5702bb 100644
---
a/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
+++
b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AccessPolicyConf.java
@@ -16,17 +16,16
[syncope] branch SYNCOPE-163-1 updated: Moving AM stuff to specific module
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch SYNCOPE-163-1 in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/SYNCOPE-163-1 by this push: new 8c72a4a Moving AM stuff to specific module 8c72a4a is described below commit 8c72a4a05897eac47931cc25ecffce0f43cc1638 Author: skylark17 AuthorDate: Fri Feb 28 17:25:28 2020 +0100 Moving AM stuff to specific module --- .../rest/OpenIdConnectRelyingPartyRestClient.java | 0 .../rest/SAML2ServiceProviderRestClient.java | 0 .../authentication/AbstractAccessPolicyConf.java | 0 .../AbstractAuthenticationModuleConf.java | 0 .../AbstractAuthenticationPolicyConf.java | 0 .../lib/authentication/AccessPolicyConf.java | 0 .../authentication/AuthenticationModuleConf.java | 0 .../authentication/AuthenticationPolicyConf.java | 0 .../authentication/DefaultAccessPolicyConf.java| 0 .../DefaultAuthenticationPolicyConf.java | 0 .../JaasAuthenticationModuleConf.java | 0 .../PredefinedAuthenticationModuleConf.java| 0 .../syncope/common/lib/policy/AccessPolicyTO.java | 0 .../common/lib/policy/AuthenticationPolicyTO.java | 2 +- .../syncope/common/lib/to/ClientApplicationTO.java | 0 .../common/lib/to/OpenIdConnectRelyingPartyTO.java | 0 .../common/lib/to/SAML2ServiceProviderTO.java | 0 .../syncope/common/lib/types/AMEntitlement.java| 16 +++ .../rest/api/service/ClientApplicationService.java | 23 +++--- .../service/OpenIdConnectRelyingPartyService.java | 0 .../api/service/SAML2ServiceProviderService.java | 0 .../common/lib/types/IdRepoEntitlement.java| 16 --- core/am/logic/pom.xml | 6 ++ .../core/logic/AbstractClientApplicationLogic.java | 5 ++--- .../core/logic/OpenIdConnectRelyingPartyLogic.java | 9 + .../core/logic/SAML2ServiceProviderLogic.java | 13 ++-- .../logic/init/AMImplementationTypeLoader.java}| 7 ++- .../AbstractClientApplicationServiceImpl.java | 9 - .../OpenIdConnectRelyingPartyServiceImpl.java | 2 +- .../service/SAML2ServiceProviderServiceImpl.java | 2 +- .../logic/init/IdMImplementationTypeLoader.java| 5 + .../authentication/JPASAML2ServiceProviderDAO.java | 11 ++- .../OpenIdConnectRelyingPartyDataBinderImpl.java | 11 +++ 33 files changed, 69 insertions(+), 68 deletions(-) diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java similarity index 100% rename from client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java rename to client/am/console/src/main/java/org/apache/syncope/client/console/rest/OpenIdConnectRelyingPartyRestClient.java diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java b/client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java similarity index 100% rename from client/idrepo/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java rename to client/am/console/src/main/java/org/apache/syncope/client/console/rest/SAML2ServiceProviderRestClient.java diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java similarity index 100% rename from common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAccessPolicyConf.java diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java similarity index 100% rename from common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java rename to common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationModuleConf.java diff --git a/common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java similarity index 100% rename from common/idrepo/lib/src/main/java/org/apache/syncope/common/lib/authentication/AbstractAuthenticationPolicyConf.java rename
[syncope] branch 2_1_X updated: Removed printing added by mistake
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 8da82c9 Removed printing added by mistake 8da82c9 is described below commit 8da82c9ae3002475792d7c2ec10062f0a7481b84 Author: skylark17 AuthorDate: Wed Feb 26 17:25:37 2020 +0100 Removed printing added by mistake --- .../syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java | 1 - 1 file changed, 1 deletion(-) diff --git a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java index 61c45e6..0670892 100644 --- a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java +++ b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java @@ -81,7 +81,6 @@ public class LinkedAccountPlainAttrsPanel extends AbstractAttrsWizardStep
[syncope] 03/03: [SYNCOPE-1544] Also removed readonly attributes from showing in the list of plain attributes for linkedaccounts
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-1537
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 7aefff395d612da6831bfbf1e66d48b432800d64
Author: skylark17
AuthorDate: Wed Feb 26 12:33:26 2020 +0100
[SYNCOPE-1544] Also removed readonly attributes from showing in the list of
plain attributes for linkedaccounts
---
.../wizards/any/LinkedAccountCredentialsPanel.java | 15 +++-
.../wizards/any/LinkedAccountPlainAttrsPanel.java | 43 ++
2 files changed, 41 insertions(+), 17 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
index 089968b..b8d0d89 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
@@ -42,6 +42,10 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
private static final long serialVersionUID = 5116461957402341603L;
+private String usernameValue;
+
+private String passwordValue;
+
private final LinkedAccountTO linkedAccountTO;
public LinkedAccountCredentialsPanel(final EntityWrapper
modelObject) {
@@ -68,7 +72,6 @@ public class LinkedAccountCredentialsPanel extends WizardStep
{
new PropertyModel<>(linkedAccountTO, "password"),
false);
passwordField.setMarkupId("password");
-passwordField.setPlaceholder("password");
passwordField.setRequired(true);
FieldPanel.class.cast(passwordField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getPassword()));
LinkedAccountPlainAttrProperty passwordProperty = new
LinkedAccountPlainAttrProperty();
@@ -102,10 +105,18 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
FieldPanel.class.cast(panel).setReadOnly(!model.getObject());
-if (!model.getObject()) {
+if (model.getObject()) {
+if (property.getSchema().equals("password")) {
+linkedAccountTO.setPassword(passwordValue);
+} else if
(property.getSchema().equals("username")) {
+linkedAccountTO.setUsername(usernameValue);
+}
+} else {
if (property.getSchema().equals("password")) {
+passwordValue = linkedAccountTO.getPassword();
linkedAccountTO.setPassword(null);
} else if
(property.getSchema().equals("username")) {
+usernameValue = linkedAccountTO.getUsername();
linkedAccountTO.setUsername(null);
}
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
index fec7bfa..61c45e6 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountPlainAttrsPanel.java
@@ -81,9 +81,12 @@ public class LinkedAccountPlainAttrsPanel extends
AbstractAttrsWizardStep checkIsReadonlyAttr(attrTO.getSchema())).
+collect(Collectors.toList()));
this.userTO = userTO;
add(new Accordion("plainSchemas", Collections.singletonList(new
AbstractTab(
@@ -166,11 +169,12 @@ public class LinkedAccountPlainAttrsPanel extends
AbstractAttrsWizardStep withoutCurrentSChema = new
HashSet<>(linkedAccountTO.getPlainAttrs().stream().
-filter(attr -> !attr.getSchema().equals(property.getSchema())).
+Set withoutCurrentSchema = new
HashSet<>(linkedAccountTO.getPlainAttrs().stream().
+filter(attrTO ->
!attrTO.getSchema().equals(property.getSchema())
+&& checkIsReadonlyAttr(attrTO.getSchema())).
collect(Collectors.toSet()));
linkedAccountTO.getPlainAttrs().clear();
-linkedAccountTO.getPlainAttrs().addAll(withoutCurrentSChema);
+linkedAccountTO.getPlainAttrs().addAll(withoutCurrentSchema);
if (modelObject) {
linkedAcc
[syncope] 01/03: [SYNCOPE-1537] Password and username of LinkedAccounts now saved properly from Admin Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-1537
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 6d367b89059f1216947331ebd599f491d8a545be
Author: skylark17
AuthorDate: Tue Feb 25 12:50:36 2020 +0100
[SYNCOPE-1537] Password and username of LinkedAccounts now saved properly
from Admin Console
---
.../wizards/any/LinkedAccountCredentialsPanel.java | 52 +-
.../wizards/any/LinkedAccountWizardBuilder.java| 10 ++---
2 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
index bb04ada..089968b 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
@@ -42,39 +42,42 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
private static final long serialVersionUID = 5116461957402341603L;
-public LinkedAccountCredentialsPanel(final LinkedAccountTO
linkedAccountTO) {
+private final LinkedAccountTO linkedAccountTO;
+
+public LinkedAccountCredentialsPanel(final EntityWrapper
modelObject) {
super();
setOutputMarkupId(true);
+linkedAccountTO = modelObject.getInnerObject();
+
AjaxTextFieldPanel usernameField = new AjaxTextFieldPanel(
"username",
"username",
-new PropertyModel<>(linkedAccountTO, "username"),
-false);
-usernameField.setOutputMarkupId(true);
+new PropertyModel<>(linkedAccountTO, "username"));
FieldPanel.class.cast(usernameField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getUsername()));
-LinkedAccountPlainAttrProperty property = new
LinkedAccountPlainAttrProperty();
-
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
-property.setSchema("username");
-property.getValues().add(linkedAccountTO.getUsername());
-usernameField.showExternAction(checkboxToggle(property,
usernameField));
-add(usernameField);
+LinkedAccountPlainAttrProperty usernameProperty = new
LinkedAccountPlainAttrProperty();
+
usernameProperty.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
+usernameProperty.setSchema("username");
+usernameProperty.getValues().add(linkedAccountTO.getUsername());
+usernameField.showExternAction(checkboxToggle(usernameProperty,
usernameField));
+add(usernameField.setOutputMarkupId(true));
AjaxPasswordFieldPanel passwordField = new AjaxPasswordFieldPanel(
"password",
"password",
-new PropertyModel<>(linkedAccountTO, "password"));
-passwordField.setOutputMarkupId(true);
-passwordField.setRequired(true);
+new PropertyModel<>(linkedAccountTO, "password"),
+false);
passwordField.setMarkupId("password");
+passwordField.setPlaceholder("password");
+passwordField.setRequired(true);
FieldPanel.class.cast(passwordField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getPassword()));
-property = new LinkedAccountPlainAttrProperty();
-
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
-property.setSchema("password");
-property.getValues().add(linkedAccountTO.getPassword());
-passwordField.showExternAction(checkboxToggle(property,
passwordField));
-((PasswordTextField) passwordField.getField()).setResetPassword(true);
-add(passwordField);
+LinkedAccountPlainAttrProperty passwordProperty = new
LinkedAccountPlainAttrProperty();
+
passwordProperty.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
+passwordProperty.setSchema("password");
+passwordProperty.getValues().add(linkedAccountTO.getPassword());
+passwordField.showExternAction(checkboxToggle(passwordProperty,
passwordField));
+((PasswordTextField) passwordField.getField()).setResetPassword(false);
+add(passwordField.setOutputMarkupId(true));
}
private FormComponent checkboxToggle(
@@ -98,7 +101,14 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
-panel.se
[syncope] branch SYNCOPE-1537 updated (6bacad7 -> 7aefff3)
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a change to branch SYNCOPE-1537
in repository https://gitbox.apache.org/repos/asf/syncope.git.
discard 6bacad7 [SYNCOPE-1537] Ensure proper password management for Linked
Accounts
discard f4bdffc [SYNCOPE-1537] Password and username of LinkedAccounts now
saved properly from Admin Console
add 747fbe7 [SYNCOPE-1541] XmlAdapter + FastDateFormat
add 98e97e2 Upgrading Spring
add 0ff254d Minor fix to AjaxPalettePanel appearance
new 6d367b8 [SYNCOPE-1537] Password and username of LinkedAccounts now
saved properly from Admin Console
new 5e4af6a [SYNCOPE-1537] Ensure proper password management for Linked
Accounts
new 7aefff3 [SYNCOPE-1544] Also removed readonly attributes from showing
in the list of plain attributes for linkedaccounts
This update added new revisions after undoing existing revisions.
That is to say, some revisions that were in the old version of the
branch are not in the new version. This situation occurs
when a user --force pushes a change and generates a repository
containing something like this:
* -- * -- B -- O -- O -- O (6bacad7)
\
N -- N -- N refs/heads/SYNCOPE-1537 (7aefff3)
You should already have received notification emails for all of the O
revisions, and so the following emails describe only the N revisions
from the common base, B.
Any revisions marked "omit" are not gone; other references still
refer to them. Any revisions marked "discard" are gone forever.
The 3 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../wizards/any/LinkedAccountCredentialsPanel.java | 15 +++-
.../wizards/any/LinkedAccountPlainAttrsPanel.java | 43 ++
.../wicket/markup/html/form/AjaxPalettePanel.html | 4 +-
.../syncope/common/lib/info/package-info.java | 5 +++
.../DateAdapter.java} | 25 +++--
.../syncope/common/lib/jaxb/package-info.java | 4 ++
.../syncope/common/lib/log/package-info.java | 5 +++
.../apache/syncope/common/lib/package-info.java| 5 +++
.../syncope/common/lib/patch/package-info.java | 5 +++
.../syncope/common/lib/policy/package-info.java| 5 +++
.../syncope/common/lib/report/package-info.java| 5 +++
.../syncope/common/lib/search/package-info.java| 5 +++
.../apache/syncope/common/lib/to/package-info.java | 5 +++
.../syncope/common/lib/types/package-info.java | 5 +++
.../org/apache/syncope/common/lib/JAXBTest.java| 22 +++
pom.xml| 2 +-
16 files changed, 129 insertions(+), 31 deletions(-)
copy
common/lib/src/main/java/org/apache/syncope/common/lib/{patch/BooleanReplacePatchItem.java
=> jaxb/DateAdapter.java} (61%)
[syncope] 02/03: [SYNCOPE-1537] Ensure proper password management for Linked Accounts
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-1537
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit 5e4af6a9ca68211f9db0761f55c7bc9f849dc4f3
Author: Francesco Chicchiriccò
AuthorDate: Tue Feb 25 12:58:55 2020 +0100
[SYNCOPE-1537] Ensure proper password management for Linked Accounts
---
.../provisioning/java/data/UserDataBinderImpl.java | 29 +-
1 file changed, 17 insertions(+), 12 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
index c04495a..771c3df 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/UserDataBinderImpl.java
@@ -181,7 +181,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
}.get();
account.setUsername(accountTO.getUsername());
-if (StringUtils.isNotBlank(accountTO.getPassword())) {
+if (StringUtils.isBlank(accountTO.getPassword())) {
+account.setEncodedPassword(null, null);
+} else if (!accountTO.getPassword().equals(account.getPassword()))
{
account.setPassword(accountTO.getPassword(),
CipherAlgorithm.AES);
}
account.setSuspended(accountTO.isSuspended());
@@ -366,13 +368,18 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
setRealm(user, userPatch);
// password
-if (userPatch.getPassword() != null &&
StringUtils.isNotBlank(userPatch.getPassword().getValue())) {
-if (userPatch.getPassword().isOnSyncope()) {
-setPassword(user, userPatch.getPassword().getValue(), scce);
-user.setChangePwdDate(new Date());
-}
+if (userPatch.getPassword() != null) {
+if (userPatch.getPassword().getOperation() ==
PatchOperation.DELETE) {
+user.setEncodedPassword(null, null);
+propByRes.addAll(ResourceOperation.UPDATE,
userPatch.getPassword().getResources());
+} else if
(StringUtils.isNotBlank(userPatch.getPassword().getValue())) {
+if (userPatch.getPassword().isOnSyncope()) {
+setPassword(user, userPatch.getPassword().getValue(),
scce);
+user.setChangePwdDate(new Date());
+}
-propByRes.addAll(ResourceOperation.UPDATE,
userPatch.getPassword().getResources());
+propByRes.addAll(ResourceOperation.UPDATE,
userPatch.getPassword().getResources());
+}
}
// username
@@ -620,11 +627,9 @@ public class UserDataBinderImpl extends
AbstractAnyDataBinder implements UserDat
invalidValues);
}
});
-user.getLinkedAccounts().forEach(account -> {
-propByLinkedAccount.add(
-ResourceOperation.CREATE,
-Pair.of(account.getResource().getKey(),
account.getConnObjectKeyValue()));
-});
+user.getLinkedAccounts().forEach(account -> propByLinkedAccount.add(
+ResourceOperation.CREATE,
+Pair.of(account.getResource().getKey(),
account.getConnObjectKeyValue(;
// finalize resource management
reasons.entrySet().stream().
[syncope] 01/01: [SYNCOPE-1537] Password and username of LinkedAccounts now saved properly from Admin Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch SYNCOPE-1537
in repository https://gitbox.apache.org/repos/asf/syncope.git
commit f4bdffcb2715c44c422989ea27b77a25161e3f4f
Author: skylark17
AuthorDate: Tue Feb 25 12:50:36 2020 +0100
[SYNCOPE-1537] Password and username of LinkedAccounts now saved properly
from Admin Console
---
.../wizards/any/LinkedAccountCredentialsPanel.java | 52 +-
.../wizards/any/LinkedAccountWizardBuilder.java| 10 ++---
2 files changed, 36 insertions(+), 26 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
index bb04ada..089968b 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
@@ -42,39 +42,42 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
private static final long serialVersionUID = 5116461957402341603L;
-public LinkedAccountCredentialsPanel(final LinkedAccountTO
linkedAccountTO) {
+private final LinkedAccountTO linkedAccountTO;
+
+public LinkedAccountCredentialsPanel(final EntityWrapper
modelObject) {
super();
setOutputMarkupId(true);
+linkedAccountTO = modelObject.getInnerObject();
+
AjaxTextFieldPanel usernameField = new AjaxTextFieldPanel(
"username",
"username",
-new PropertyModel<>(linkedAccountTO, "username"),
-false);
-usernameField.setOutputMarkupId(true);
+new PropertyModel<>(linkedAccountTO, "username"));
FieldPanel.class.cast(usernameField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getUsername()));
-LinkedAccountPlainAttrProperty property = new
LinkedAccountPlainAttrProperty();
-
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
-property.setSchema("username");
-property.getValues().add(linkedAccountTO.getUsername());
-usernameField.showExternAction(checkboxToggle(property,
usernameField));
-add(usernameField);
+LinkedAccountPlainAttrProperty usernameProperty = new
LinkedAccountPlainAttrProperty();
+
usernameProperty.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
+usernameProperty.setSchema("username");
+usernameProperty.getValues().add(linkedAccountTO.getUsername());
+usernameField.showExternAction(checkboxToggle(usernameProperty,
usernameField));
+add(usernameField.setOutputMarkupId(true));
AjaxPasswordFieldPanel passwordField = new AjaxPasswordFieldPanel(
"password",
"password",
-new PropertyModel<>(linkedAccountTO, "password"));
-passwordField.setOutputMarkupId(true);
-passwordField.setRequired(true);
+new PropertyModel<>(linkedAccountTO, "password"),
+false);
passwordField.setMarkupId("password");
+passwordField.setPlaceholder("password");
+passwordField.setRequired(true);
FieldPanel.class.cast(passwordField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getPassword()));
-property = new LinkedAccountPlainAttrProperty();
-
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
-property.setSchema("password");
-property.getValues().add(linkedAccountTO.getPassword());
-passwordField.showExternAction(checkboxToggle(property,
passwordField));
-((PasswordTextField) passwordField.getField()).setResetPassword(true);
-add(passwordField);
+LinkedAccountPlainAttrProperty passwordProperty = new
LinkedAccountPlainAttrProperty();
+
passwordProperty.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
+passwordProperty.setSchema("password");
+passwordProperty.getValues().add(linkedAccountTO.getPassword());
+passwordField.showExternAction(checkboxToggle(passwordProperty,
passwordField));
+((PasswordTextField) passwordField.getField()).setResetPassword(false);
+add(passwordField.setOutputMarkupId(true));
}
private FormComponent checkboxToggle(
@@ -98,7 +101,14 @@ public class LinkedAccountCredentialsPanel extends
WizardStep {
@Override
protected void onUpdate(final AjaxRequestTarget target) {
-panel.se
[syncope] branch SYNCOPE-1537 created (now f4bdffc)
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a change to branch SYNCOPE-1537 in repository https://gitbox.apache.org/repos/asf/syncope.git. at f4bdffc [SYNCOPE-1537] Password and username of LinkedAccounts now saved properly from Admin Console This branch includes the following new commits: new f4bdffc [SYNCOPE-1537] Password and username of LinkedAccounts now saved properly from Admin Console The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[syncope] branch master updated: [SYNCOPE-1544] Fixed 'Override?' flag not properly set for password and username fields of LinkedAccounts
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new c9b2ec1 [SYNCOPE-1544] Fixed 'Override?' flag not properly set for
password and username fields of LinkedAccounts
c9b2ec1 is described below
commit c9b2ec1eac71ff88a50a81553167418060ff0c31
Author: skylark17
AuthorDate: Mon Feb 24 14:24:43 2020 +0100
[SYNCOPE-1544] Fixed 'Override?' flag not properly set for password and
username fields of LinkedAccounts
---
.../console/wizards/any/LinkedAccountCredentialsPanel.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
index 4ae7049..237504f 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.wizards.any;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggle;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggleConfig;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.to.LinkedAccountTO;
import
org.apache.syncope.client.console.commons.LinkedAccountPlainAttrProperty;
import org.apache.syncope.client.ui.commons.Constants;
@@ -51,9 +52,9 @@ public class LinkedAccountCredentialsPanel extends WizardStep
{
new PropertyModel<>(linkedAccountTO, "username"),
false);
usernameField.setOutputMarkupId(true);
-FieldPanel.class.cast(usernameField).setReadOnly(true);
+
FieldPanel.class.cast(usernameField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getUsername()));
LinkedAccountPlainAttrProperty property = new
LinkedAccountPlainAttrProperty();
-property.setOverridable(false);
+
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
property.setSchema("username");
property.getValues().add(linkedAccountTO.getUsername());
usernameField.showExternAction(checkboxToggle(property,
usernameField));
@@ -66,9 +67,9 @@ public class LinkedAccountCredentialsPanel extends WizardStep
{
passwordField.setOutputMarkupId(true);
passwordField.setRequired(true);
passwordField.setMarkupId("password");
-FieldPanel.class.cast(passwordField).setReadOnly(true);
+
FieldPanel.class.cast(passwordField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getPassword()));
property = new LinkedAccountPlainAttrProperty();
-property.setOverridable(false);
+
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
property.setSchema("password");
property.getValues().add(linkedAccountTO.getPassword());
passwordField.showExternAction(checkboxToggle(property,
passwordField));
[syncope] branch 2_1_X updated: [SYNCOPE-1544] Fixed 'Override?' flag not properly set for password and username fields of LinkedAccounts
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 4cbed09 [SYNCOPE-1544] Fixed 'Override?' flag not properly set for
password and username fields of LinkedAccounts
4cbed09 is described below
commit 4cbed0914456661a15625e008f86c1d50383038e
Author: skylark17
AuthorDate: Mon Feb 24 12:40:27 2020 +0100
[SYNCOPE-1544] Fixed 'Override?' flag not properly set for password and
username fields of LinkedAccounts
---
.../console/wizards/any/LinkedAccountCredentialsPanel.java | 9 +
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
index 4ad319a..bb04ada 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/LinkedAccountCredentialsPanel.java
@@ -20,6 +20,7 @@ package org.apache.syncope.client.console.wizards.any;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggle;
import
de.agilecoders.wicket.extensions.markup.html.bootstrap.form.checkbox.bootstraptoggle.BootstrapToggleConfig;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.console.commons.Constants;
import
org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import
org.apache.syncope.client.console.wicket.markup.html.form.AjaxPasswordFieldPanel;
@@ -51,9 +52,9 @@ public class LinkedAccountCredentialsPanel extends WizardStep
{
new PropertyModel<>(linkedAccountTO, "username"),
false);
usernameField.setOutputMarkupId(true);
-FieldPanel.class.cast(usernameField).setReadOnly(true);
+
FieldPanel.class.cast(usernameField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getUsername()));
LinkedAccountPlainAttrProperty property = new
LinkedAccountPlainAttrProperty();
-property.setOverridable(false);
+
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getUsername()));
property.setSchema("username");
property.getValues().add(linkedAccountTO.getUsername());
usernameField.showExternAction(checkboxToggle(property,
usernameField));
@@ -66,9 +67,9 @@ public class LinkedAccountCredentialsPanel extends WizardStep
{
passwordField.setOutputMarkupId(true);
passwordField.setRequired(true);
passwordField.setMarkupId("password");
-FieldPanel.class.cast(passwordField).setReadOnly(true);
+
FieldPanel.class.cast(passwordField).setReadOnly(StringUtils.isBlank(linkedAccountTO.getPassword()));
property = new LinkedAccountPlainAttrProperty();
-property.setOverridable(false);
+
property.setOverridable(StringUtils.isNotBlank(linkedAccountTO.getPassword()));
property.setSchema("password");
property.getValues().add(linkedAccountTO.getPassword());
passwordField.showExternAction(checkboxToggle(property,
passwordField));
[syncope] branch 2_1_X updated: [SYNCOPE-957] Removed unused constant
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_1_X by this push: new 7d56a81 [SYNCOPE-957] Removed unused constant 7d56a81 is described below commit 7d56a8171455c8c70a334a15e214f313cfed3c7a Author: skylark17 AuthorDate: Wed Dec 11 15:55:07 2019 +0100 [SYNCOPE-957] Removed unused constant --- .../provisioning/java/pushpull/AbstractProvisioningJobDelegate.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java index e74f163..5f06bfd 100644 --- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java +++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java @@ -48,8 +48,6 @@ public abstract class AbstractProvisioningJobDelegate
[syncope] branch 2_1_X updated: [SYNCOPE-957] Fixed missing Pull report for linked accounts
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 9e36bcc [SYNCOPE-957] Fixed missing Pull report for linked accounts
9e36bcc is described below
commit 9e36bcc1b6239ae3e073227a5ea1da1de9d7014a
Author: skylark17
AuthorDate: Wed Dec 11 14:36:37 2019 +0100
[SYNCOPE-957] Fixed missing Pull report for linked accounts
---
.../pushpull/AbstractProvisioningJobDelegate.java | 139 +
.../syncope/fit/core/LinkedAccountITCase.java | 3 +
2 files changed, 115 insertions(+), 27 deletions(-)
diff --git
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
index 7a3140e..e74f163 100644
---
a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
+++
b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/pushpull/AbstractProvisioningJobDelegate.java
@@ -23,12 +23,12 @@ import java.util.ArrayList;
import java.util.Collection;
import java.util.List;
import javax.annotation.Resource;
+import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.common.lib.types.AnyTypeKind;
import org.apache.syncope.common.lib.types.TraceLevel;
import org.apache.syncope.core.persistence.api.dao.AnyTypeDAO;
import org.apache.syncope.core.persistence.api.dao.ExternalResourceDAO;
import org.apache.syncope.core.persistence.api.dao.PolicyDAO;
-import org.apache.syncope.core.persistence.api.entity.AnyType;
import
org.apache.syncope.core.persistence.api.entity.resource.ExternalResource;
import org.apache.syncope.core.persistence.api.entity.resource.Mapping;
import org.apache.syncope.core.persistence.api.entity.resource.Provision;
@@ -44,6 +44,14 @@ import
org.springframework.beans.factory.annotation.Autowired;
public abstract class AbstractProvisioningJobDelegate extends AbstractSchedTaskJobDelegate {
+private static final String USER = "USER";
+
+private static final String GROUP = "GROUP";
+
+private static final String ANY_OBJECT = "ANY_OBJECT";
+
+private static final String LINKED_ACCOUNT = "LINKED_ACCOUNT";
+
@Resource(name = "adminUser")
protected String adminUser;
@@ -53,6 +61,9 @@ public abstract class AbstractProvisioningJobDelegate aFailDelete = new ArrayList<>();
List aSuccNone = new ArrayList<>();
List aIgnore = new ArrayList<>();
+List laSuccCreate = new ArrayList<>();
+List laFailCreate = new ArrayList<>();
+List laSuccUpdate = new ArrayList<>();
+List laFailUpdate = new ArrayList<>();
+List laSuccDelete = new ArrayList<>();
+List laFailDelete = new ArrayList<>();
+List laSuccNone = new ArrayList<>();
+List laIgnore = new ArrayList<>();
for (ProvisioningReport provResult : provResults) {
-AnyType anyType = anyTypeDAO.find(provResult.getAnyType());
-
switch (provResult.getStatus()) {
case SUCCESS:
switch (provResult.getOperation()) {
case CREATE:
-if (anyType == null) {
+if (StringUtils.isBlank(provResult.getAnyType())) {
rSuccCreate.add(provResult);
} else {
-switch (anyType.getKind()) {
+switch (provResult.getAnyType()) {
case USER:
uSuccCreate.add(provResult);
break;
+case LINKED_ACCOUNT:
+laSuccCreate.add(provResult);
+break;
+
case GROUP:
gSuccCreate.add(provResult);
break;
-case ANY_OBJECT:
default:
aSuccCreate.add(provResult);
}
@@ -155,19 +175,22 @@ public abstract class AbstractProvisioningJobDelegate
[syncope] branch master updated: [SYNCOPE-957] Added missing sections for reconciliation process
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new ed0555a [SYNCOPE-957] Added missing sections for reconciliation
process
ed0555a is described below
commit ed0555ad79574f23a447bb775bd430120d55437e
Author: skylark17
AuthorDate: Wed Dec 11 10:00:43 2019 +0100
[SYNCOPE-957] Added missing sections for reconciliation process
---
...DirectoryPanelAditionalActionLinksProvider.java | 17 +-
.../console/panels/LinkedAccountModalPanel.java| 178 +++--
.../panels/LinkedAccountsStatusModalPanel.java | 39 +
.../console/status/AnyStatusDirectoryPanel.java| 29
.../client/console/status/ReconTaskPanel.java | 4 +-
.../wizards/any/LinkedAccountDetailsPanel.java | 26 ++-
.../wizards/any/LinkedAccountWizardBuilder.java| 19 +--
...DirectoryPanelAditionalActionLinksProvider.java | 3 +-
...DirectoryPanelAditionalActionLinksProvider.java | 3 +-
.../client/console/panels/UserDirectoryPanel.java | 2 +-
.../console/panels/LinkedAccountModalPanel.html| 4 +-
...el.html => LinkedAccountsStatusModalPanel.html} | 5 +-
.../syncope/core/logic/ReconciliationLogic.java| 2 +-
13 files changed, 241 insertions(+), 90 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAditionalActionLinksProvider.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAditionalActionLinksProvider.java
index 11df282..2982849 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAditionalActionLinksProvider.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/commons/IdMAnyDirectoryPanelAditionalActionLinksProvider.java
@@ -21,6 +21,7 @@ package org.apache.syncope.client.console.commons;
import java.util.ArrayList;
import java.util.List;
import org.apache.syncope.client.console.panels.LinkedAccountModalPanel;
+import org.apache.syncope.client.console.rest.UserRestClient;
import org.apache.syncope.client.console.status.AnyStatusModal;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.Action;
@@ -44,7 +45,7 @@ public class IdMAnyDirectoryPanelAditionalActionLinksProvider
@Override
public List> get(
-final UserTO modelObject,
+final IModel model,
final String realm,
final BaseModal> modal,
final String header,
@@ -59,7 +60,7 @@ public class IdMAnyDirectoryPanelAditionalActionLinksProvider
@Override
public void onClick(final AjaxRequestTarget target, final UserTO
ignore) {
IModel> formModel = new
CompoundPropertyModel<>(
-new AnyWrapper<>(modelObject));
+new AnyWrapper<>(model.getObject()));
modal.setFormModel(formModel);
target.add(modal.setContent(new AnyStatusModal<>(
@@ -76,7 +77,7 @@ public class IdMAnyDirectoryPanelAditionalActionLinksProvider
}, ActionLink.ActionType.ENABLE);
enable.setEntitlements(IdRepoEntitlement.USER_UPDATE);
enable.setOnConfirm(false);
-enable.setRealms(realm, modelObject.getDynRealms());
+enable.setRealms(realm, model.getObject().getDynRealms());
actions.add(enable);
Action manageResources = new Action<>(new ActionLink()
{
@@ -85,8 +86,9 @@ public class IdMAnyDirectoryPanelAditionalActionLinksProvider
@Override
public void onClick(final AjaxRequestTarget target, final UserTO
ignore) {
+model.setObject(new
UserRestClient().read(model.getObject().getKey()));
IModel> formModel = new
CompoundPropertyModel<>(
-new AnyWrapper<>(modelObject));
+new AnyWrapper<>(model.getObject()));
modal.setFormModel(formModel);
target.add(modal.setContent(new AnyStatusModal<>(
@@ -104,7 +106,7 @@ public class
IdMAnyDirectoryPanelAditionalActionLinksProvider
manageResources.setEntitlements(
String.format("%s,%s", IdRepoEntitlement.USER_READ,
IdRepoEntitlement.USER_UPDATE));
manageResources.setOnConfirm(false);
-manageResources.setRealms(realm, modelObject.getDynRealms());
+manageResources.setRealms(realm, model.getObject().getDynRealms());
actions.add(manageResources);
Action manageAccounts = new Action<>(new ActionLink() {
@@ -113,8 +115,9 @@ public class
IdMAnyDirectoryPanelAdition
[syncope] branch 2_1_X updated: [SYNCOPE-957] Added missing sections for reconciliation process
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new c2c7852 [SYNCOPE-957] Added missing sections for reconciliation
process
c2c7852 is described below
commit c2c7852edc2427e6e3b25c72ac94dc050fe0700b
Author: skylark17
AuthorDate: Tue Dec 10 14:58:32 2019 +0100
[SYNCOPE-957] Added missing sections for reconciliation process
---
.../console/panels/LinkedAccountModalPanel.java| 179 +++--
.../panels/LinkedAccountsStatusModalPanel.java | 40 +
.../client/console/panels/UserDirectoryPanel.java | 21 ++-
.../console/status/AnyStatusDirectoryPanel.java| 29
.../client/console/status/ReconTaskPanel.java | 4 +-
.../wizards/any/LinkedAccountDetailsPanel.java | 27 ++--
.../wizards/any/LinkedAccountWizardBuilder.java| 19 +--
.../console/panels/LinkedAccountModalPanel.html| 4 +-
...el.html => LinkedAccountsStatusModalPanel.html} | 5 +-
.../syncope/core/logic/ReconciliationLogic.java| 2 +-
10 files changed, 242 insertions(+), 88 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
index be0a70c..da7569d 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/LinkedAccountModalPanel.java
@@ -20,7 +20,6 @@ package org.apache.syncope.client.console.panels;
import static org.apache.syncope.client.console.panels.AbstractModalPanel.LOG;
-import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
@@ -30,6 +29,8 @@ import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.pages.BasePage;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
import org.apache.syncope.client.console.rest.UserRestClient;
+import org.apache.syncope.client.console.status.ReconStatusPanel;
+import org.apache.syncope.client.console.status.ReconTaskPanel;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import
org.apache.syncope.client.console.wicket.markup.html.form.ActionLinksTogglePanel;
@@ -40,6 +41,8 @@ import org.apache.syncope.common.lib.SyncopeClientException;
import org.apache.syncope.common.lib.patch.LinkedAccountPatch;
import org.apache.syncope.common.lib.patch.UserPatch;
import org.apache.syncope.common.lib.to.LinkedAccountTO;
+import org.apache.syncope.common.lib.to.PullTaskTO;
+import org.apache.syncope.common.lib.to.PushTaskTO;
import org.apache.syncope.common.lib.to.UserTO;
import org.apache.syncope.common.lib.types.PatchOperation;
import org.apache.syncope.common.lib.types.StandardEntitlement;
@@ -47,10 +50,12 @@ import org.apache.wicket.PageReference;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.AjaxLink;
import org.apache.wicket.event.Broadcast;
+import org.apache.wicket.markup.html.panel.Panel;
+import org.apache.wicket.model.IModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.StringResourceModel;
-public class LinkedAccountModalPanel extends AbstractModalPanel {
+public class LinkedAccountModalPanel extends Panel implements ModalPanel {
private static final long serialVersionUID = -4603032036433309900L;
@@ -60,27 +65,29 @@ public class LinkedAccountModalPanel extends
AbstractModalPanel {
private final AjaxLink addAjaxLink;
-protected ActionLinksTogglePanel actionTogglePanel;
+private ActionLinksTogglePanel actionTogglePanel;
private UserRestClient userRestClient = new UserRestClient();
private final List linkedAccountTOs;
public LinkedAccountModalPanel(
-final BaseModal modal,
-final UserTO userTO,
-final PageReference pageRef) {
+final BaseModal baseModal,
+final IModel model,
+final PageReference pageRef,
+final boolean recounciliationOnly) {
-super(modal, pageRef);
+super(BaseModal.getContentId(), model);
-UserTO readUserTO = userRestClient.read(userTO.getKey());
+final MultilevelPanel mlp = new MultilevelPanel("mlpContainer");
+mlp.setOutputMarkupId(true);
setOutputMarkupId(true);
actionTogglePanel = new ActionLinksTogglePanel<>("toggle", pageRef);
add(actionTogglePanel);
-wizard = new LinkedAccountWizardBuilder(readUserTO.getKey(), pageRef);
+wizard = new LinkedAccoun
[syncope] branch 2_0_X updated: Improvements in handling messages from URL query strings
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 91c8a83 Improvements in handling messages from URL query strings
91c8a83 is described below
commit 91c8a83a7a56fb34251c23e6c2822d7fbb02a240
Author: Matteo Alessandroni
AuthorDate: Fri Nov 29 14:59:32 2019 +0100
Improvements in handling messages from URL query strings
---
.../src/main/resources/META-INF/resources/app/js/app.js | 13 ++---
.../META-INF/resources/app/js/controllers/UserController.js | 6 --
2 files changed, 10 insertions(+), 9 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 7ac4de0..41f6c21 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -68,7 +68,7 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
'ja_*': 'ja',
'*': 'en'
}).fallbackLanguage('en').
- determinePreferredLanguage();
+determinePreferredLanguage();
/*
* State provider
*/
@@ -403,7 +403,7 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
{id: '4', name: '日本語', code: 'ja', format: '/MM/dd HH:mm'}
]
};
- $rootScope.languages.selectedLanguage =
$rootScope.languages.availableLanguages.filter(function(obj) {
+ $rootScope.languages.selectedLanguage =
$rootScope.languages.availableLanguages.filter(function (obj) {
return obj.code === $translate.preferredLanguage();
})[0];
/*
@@ -565,7 +565,6 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
|--
*/
$scope.notificationSuccessTimeout = 4000;
-// $scope.notification =
$('#notifications').kendoNotification().data("kendoNotification");
$scope.notification = $("#notifications").kendoNotification({
stacking: "down",
hideOnClick: true,
@@ -574,18 +573,18 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
$scope.notification.options.position["top"] = 20;
$scope.showSuccess = function (message, component) {
if (!$scope.notificationExists(message)) {
- //forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
+ // forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = $scope.notificationSuccessTimeout;
- component.show(message, "success");
+ component.show(String(message).replace(/<[^>]+>/gm, ''), "success");
}
};
$scope.showError = function (message, component) {
if (!$scope.notificationExists(message)) {
- //forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
+ // forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = 0;
- component.show(message, "error");
+ component.show(String(message).replace(/<[^>]+>/gm, ''), "error");
}
};
$scope.hideError = function (message, component) {
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index f919b08..c0e127d 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -643,7 +643,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$translate.use($scope.languages.selectedLanguage.code);
$rootScope.endReached = false;
var destination = params && params.successMessage
- ?
'../wicket/bookmarkable/org.apache.syncope.client.enduser.pages.Logout?successMessage='
+ params.successMessage
+ ?
'../wicket/bookmarkable/org.apache.syncope.client.enduser.pages.Logout?successMessage='
+
+ params.successMessage
:
'../wicket/bookmarkable/org.apache.syncope.client.enduser.pages.Logout';
window.location.href = destination;
};
@@ -651,7 +652,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$scope.success = function (
[syncope] branch 2_1_X updated: Improvements in handling messages from URL query strings
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new b8dc9b5 Improvements in handling messages from URL query strings
b8dc9b5 is described below
commit b8dc9b5c11d3d4779388614991f668af59281ceb
Author: Matteo Alessandroni
AuthorDate: Fri Nov 29 14:20:56 2019 +0100
Improvements in handling messages from URL query strings
---
.../src/main/resources/META-INF/resources/app/js/app.js | 13 ++---
.../META-INF/resources/app/js/controllers/UserController.js | 8 +---
2 files changed, 11 insertions(+), 10 deletions(-)
diff --git a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
index 742cfe7..ba3b1cf 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
+++ b/client/enduser/src/main/resources/META-INF/resources/app/js/app.js
@@ -67,7 +67,7 @@ app.config(['$stateProvider', '$urlRouterProvider',
'$httpProvider', '$translate
'ja_*': 'ja',
'*': 'en'
}).fallbackLanguage('en').
- determinePreferredLanguage();
+determinePreferredLanguage();
/*
* State provider
*/
@@ -414,7 +414,7 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
{id: '4', name: '日本語', code: 'ja', format: '/MM/dd HH:mm'}
]
};
- $rootScope.languages.selectedLanguage =
$rootScope.languages.availableLanguages.filter(function(obj) {
+ $rootScope.languages.selectedLanguage =
$rootScope.languages.availableLanguages.filter(function (obj) {
return obj.code === $translate.preferredLanguage();
})[0];
/*
@@ -594,7 +594,6 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
|--
*/
$scope.notificationSuccessTimeout = 4000;
-// $scope.notification =
$('#notifications').kendoNotification().data("kendoNotification");
$scope.notification = $("#notifications").kendoNotification({
stacking: "down",
hideOnClick: true,
@@ -603,18 +602,18 @@ app.controller('ApplicationController', ['$scope',
'$rootScope', '$translate', '
$scope.notification.options.position["top"] = 20;
$scope.showSuccess = function (message, component) {
if (!$scope.notificationExists(message)) {
- //forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
+ // forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = $scope.notificationSuccessTimeout;
- component.show(message, "success");
+ component.show(String(message).replace(/<[^>]+>/gm, ''), "success");
}
};
$scope.showError = function (message, component) {
if (!$scope.notificationExists(message)) {
- //forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
+ // forcing scrollTo since kendo doesn't disable scrollTop if pinned
is true
window.scrollTo(0, 0);
component.options.autoHideAfter = 0;
- component.show(message, "error");
+ component.show(String(message).replace(/<[^>]+>/gm, ''), "error");
}
};
$scope.hideError = function (message, component) {
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
index d4e7022..0d90c7c 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/controllers/UserController.js
@@ -25,7 +25,7 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
'UserSelfService', 'SchemaService', 'RealmService', 'ResourceService',
'SecurityQuestionService',
'GroupService', 'AnyService', 'UserUtil', 'GenericUtil',
'ValidationExecutor', '$translate', '$filter',
function ($scope, $rootScope, $location, $state, UserSelfService,
SchemaService, RealmService,
- ResourceService, SecurityQuestionService, GroupService, AnyService,
UserUtil, GenericUtil,
+ ResourceService, SecurityQuestionService, GroupService, AnyService,
UserUtil, GenericUtil,
ValidationExecutor, $translate, $filter) {
$scope.user = {};
@@ -646,7 +646,8 @@ angular.module("self").controller("UserController",
['$scope', '$rootScope', '$l
$translate.u
[syncope] branch master updated: Fixed wrong properties files location
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new c11127b Fixed wrong properties files location
c11127b is described below
commit c11127bcca4d9020a96f58d38f67bfa00331dc6d
Author: skylark17
AuthorDate: Fri Nov 8 12:13:52 2019 +0100
Fixed wrong properties files location
---
.../{search => }/ConnObjectListViewPanel.properties| 0
.../{search => }/ConnObjectListViewPanel_it.properties | 0
.../{search => }/ConnObjectListViewPanel_ja.properties | 2 +-
.../ConnObjectListViewPanel_pt_BR.properties | 0
...roperties => ConnObjectListViewPanel_ru.properties} | 2 +-
.../search/ConnObjectListViewPanel_ru.properties | 18 --
6 files changed, 2 insertions(+), 20 deletions(-)
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.properties
similarity index 100%
copy from
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel.properties
copy to
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.properties
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_it.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_it.properties
similarity index 100%
rename from
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_it.properties
rename to
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_it.properties
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_ja.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ja.properties
similarity index 95%
rename from
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_ja.properties
rename to
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ja.properties
index 7c64468..24870b9 100644
---
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_ja.properties
+++
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ja.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-search.result=\u691c\u7d22
+search.result=\u8abf\u3079\u308b
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_pt_BR.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_pt_BR.properties
similarity index 100%
rename from
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_pt_BR.properties
rename to
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_pt_BR.properties
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ru.properties
similarity index 94%
rename from
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel.properties
rename to
client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ru.properties
index 711315b..3d43b23 100644
---
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel.properties
+++
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/ConnObjectListViewPanel_ru.properties
@@ -14,4 +14,4 @@
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
-search.result=Search
+search.result=\u041f\u043e\u0438\u0441\u043a
diff --git
a/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_ru.properties
b/client/idm/console/src/main/resources/org/apache/syncope/client/console/panels/search/ConnObjectListViewPanel_ru.properties
deleted file mode 100644
index 33a3c75..000
---
[syncope] branch master updated: [SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now saved when the previous step button is before submitting the wizard form
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 553b33a [SYNCOPE-1505] Changes to AjaxPalettePanel components in
Console are now saved when the previous step button is before submitting the
wizard form
553b33a is described below
commit 553b33a46a2b2b2f6219b4a8c1512009e8306c3f
Author: skylark17
AuthorDate: Fri Nov 8 09:40:55 2019 +0100
[SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now
saved when the previous step button is before submitting the wizard form
---
.../ui/commons/markup/html/form/AjaxPalettePanel.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
index 818dd77..9256e65 100644
---
a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
+++
b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/markup/html/form/AjaxPalettePanel.java
@@ -28,6 +28,8 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.ui.commons.Constants;
+import
org.apache.syncope.client.ui.commons.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -108,7 +110,7 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
@Override
protected Recorder newRecorderComponent() {
-return new Recorder("recorder", this) {
+Recorder recorder = new Recorder("recorder", this) {
private static final long serialVersionUID =
-9169109967480083523L;
@@ -155,6 +157,17 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
return selected;
}
};
+recorder.add(new
IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+private static final long serialVersionUID =
-6139318907146065915L;
+
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+processInput();
+}
+});
+
+return recorder;
}
};
[syncope] branch 2_0_X updated: [SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now saved when the previous step button is before submitting the wizard form
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 14d274c [SYNCOPE-1505] Changes to AjaxPalettePanel components in
Console are now saved when the previous step button is before submitting the
wizard form
14d274c is described below
commit 14d274c720473981fe6ef6a7587b45c21972586f
Author: Matteo Alessandroni
AuthorDate: Thu Nov 7 16:14:24 2019 +0100
[SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now
saved when the previous step button is before submitting the wizard form
---
.../console/wicket/markup/html/form/AjaxPalettePanel.java | 15 ++-
1 file changed, 14 insertions(+), 1 deletion(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
index ac55d4b..54b4288 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
@@ -29,6 +29,8 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.commons.Constants;
+import
org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -109,7 +111,7 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
@Override
protected Recorder newRecorderComponent() {
-return new Recorder("recorder", this) {
+Recorder recorder = new Recorder("recorder", this) {
private static final long serialVersionUID =
-9169109967480083523L;
@@ -159,6 +161,17 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
return selected;
}
};
+recorder.add(new
IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+private static final long serialVersionUID =
-6139318907146065915L;
+
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+processInput();
+}
+});
+
+return recorder;
}
};
[syncope] branch 2_1_X updated: [SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now saved when the previous step button is before submitting the wizard form
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new ea89fae [SYNCOPE-1505] Changes to AjaxPalettePanel components in
Console are now saved when the previous step button is before submitting the
wizard form
ea89fae is described below
commit ea89fae0b7e934291adfbda54bc6012eb58453c3
Author: Matteo Alessandroni
AuthorDate: Thu Nov 7 10:27:54 2019 +0100
[SYNCOPE-1505] Changes to AjaxPalettePanel components in Console are now
saved when the previous step button is before submitting the wizard form
---
.../wicket/markup/html/form/AjaxPalettePanel.java | 17 +++--
1 file changed, 15 insertions(+), 2 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
index 0f9e5c8..b7b502f 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AjaxPalettePanel.java
@@ -29,6 +29,8 @@ import java.util.Map;
import java.util.regex.Pattern;
import org.apache.commons.collections4.ListUtils;
import org.apache.commons.lang3.StringUtils;
+import org.apache.syncope.client.console.commons.Constants;
+import
org.apache.syncope.client.console.wicket.ajax.form.IndicatorAjaxFormComponentUpdatingBehavior;
import org.apache.wicket.Component;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxSubmitLink;
@@ -92,7 +94,7 @@ public class AjaxPalettePanel extends
AbstractFieldPanel
private void initialize(final IModel> model, final Builder
builder) {
setOutputMarkupId(true);
-this.palette = new NonI18nPalette(
+palette = new NonI18nPalette(
"paletteField", model, choicesModel, builder.renderer, 8,
builder.allowOrder, builder.allowMoveAll) {
private static final long serialVersionUID = -3074655279011678437L;
@@ -109,7 +111,7 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
@Override
protected Recorder newRecorderComponent() {
-return new Recorder("recorder", this) {
+Recorder recorder = new Recorder("recorder", this) {
private static final long serialVersionUID =
-9169109967480083523L;
@@ -158,6 +160,17 @@ public class AjaxPalettePanel
extends AbstractFieldPanel
return selected;
}
};
+recorder.add(new
IndicatorAjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
+
+private static final long serialVersionUID =
-6139318907146065915L;
+
+@Override
+protected void onUpdate(final AjaxRequestTarget target) {
+processInput();
+}
+});
+
+return recorder;
}
};
[syncope] branch 2_1_X updated: [SYNCOPE-957] Removed useless annotations
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 7df8e1f [SYNCOPE-957] Removed useless annotations
7df8e1f is described below
commit 7df8e1f21bd5466e3ed552130367fdd2e4e36b23
Author: Matteo Alessandroni
AuthorDate: Thu Oct 31 14:30:00 2019 +0100
[SYNCOPE-957] Removed useless annotations
---
.../client/console/commons/LinkedAccountPlainAttrProperty.java| 8
1 file changed, 8 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
b/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
index 3f0468a..2826405 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
@@ -22,16 +22,10 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
import java.util.ArrayList;
import java.util.List;
-import javax.xml.bind.annotation.XmlElement;
-import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlRootElement;
-import javax.xml.bind.annotation.XmlType;
import org.apache.commons.lang3.ObjectUtils;
import org.apache.commons.lang3.builder.EqualsBuilder;
import org.apache.commons.lang3.builder.HashCodeBuilder;
-@XmlRootElement
-@XmlType
public class LinkedAccountPlainAttrProperty implements Serializable,
Comparable {
private static final long serialVersionUID = -5309050337675968950L;
@@ -50,8 +44,6 @@ public class LinkedAccountPlainAttrProperty implements
Serializable, Comparable<
this.schema = schema;
}
-@XmlElementWrapper(name = "values")
-@XmlElement(name = "value")
@JsonProperty("values")
public List getValues() {
return values;
[syncope] branch 2_1_X updated (a04ceea -> 0eeff58)
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from a04ceea [SYNCOPE-957] Very small fixes to new Admin Console code add 0eeff58 [SYNCOPE-957] Small fix to conn object panel No new revisions were added by this update. Summary of changes: .../console/panels/ConnObjectListViewPanel.java| 26 +- .../client/console/rest/ResourceRestClient.java| 4 +++- 2 files changed, 24 insertions(+), 6 deletions(-)
[syncope] branch 2_1_X updated: [SYNCOPE-957] Very small fixes to new Admin Console code
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new a04ceea [SYNCOPE-957] Very small fixes to new Admin Console code
a04ceea is described below
commit a04ceea78a448e8d85531fb7e6821ec53be5a09d
Author: Matteo Alessandroni
AuthorDate: Thu Oct 31 12:47:19 2019 +0100
[SYNCOPE-957] Very small fixes to new Admin Console code
---
.../commons}/LinkedAccountPlainAttrProperty.java | 2 +-
.../console/panels/ConnObjectListViewPanel.java| 28 +-
.../client/console/rest/BaseRestClient.java| 2 +-
.../client/console/rest/ResourceRestClient.java| 7 --
.../client/console/wizards/any/EntityWrapper.java | 7 ++
.../wizards/any/LinkedAccountCredentialsPanel.java | 2 +-
.../wizards/any/LinkedAccountDetailsPanel.java | 10
.../wizards/any/LinkedAccountPlainAttrsPanel.java | 2 +-
.../any/LinkedAccountPlainAttrsPanel.properties| 17 -
.../any/LinkedAccountPlainAttrsPanel_it.properties | 17 -
.../any/LinkedAccountPlainAttrsPanel_ja.properties | 16 -
.../LinkedAccountPlainAttrsPanel_pt_BR.properties | 16 -
.../any/LinkedAccountPlainAttrsPanel_ru.properties | 16 -
.../syncope/common/lib/to/LinkedAccountTO.java | 3 +--
14 files changed, 23 insertions(+), 122 deletions(-)
diff --git
a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LinkedAccountPlainAttrProperty.java
b/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
similarity index 98%
rename from
common/lib/src/main/java/org/apache/syncope/common/lib/types/LinkedAccountPlainAttrProperty.java
rename to
client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
index 2d6f1df..3f0468a 100644
---
a/common/lib/src/main/java/org/apache/syncope/common/lib/types/LinkedAccountPlainAttrProperty.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/commons/LinkedAccountPlainAttrProperty.java
@@ -16,7 +16,7 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.syncope.common.lib.types;
+package org.apache.syncope.client.console.commons;
import com.fasterxml.jackson.annotation.JsonProperty;
import java.io.Serializable;
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
index afafa69..3fca624 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/ConnObjectListViewPanel.java
@@ -30,17 +30,13 @@ import
org.apache.syncope.client.console.panels.ListViewPanel.ListViewReload;
import org.apache.syncope.client.console.panels.search.AbstractSearchPanel;
import org.apache.syncope.client.console.panels.search.ConnObjectSearchPanel;
import org.apache.syncope.client.console.panels.search.SearchClause;
-import org.apache.syncope.client.console.panels.search.SearchClausePanel;
-import org.apache.syncope.client.console.panels.search.SearchUtils;
import org.apache.syncope.client.console.rest.AnyTypeRestClient;
-import org.apache.syncope.client.console.rest.BaseRestClient;
import org.apache.syncope.client.console.rest.ResourceRestClient;
import
org.apache.syncope.client.console.wicket.extensions.markup.html.repeater.data.table.CollectionPanel;
import org.apache.syncope.client.console.wicket.markup.html.form.ActionLink;
import org.apache.syncope.common.lib.to.AttrTO;
import org.apache.syncope.common.lib.to.ConnObjectTO;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.tabs.Accordion;
-import org.apache.syncope.client.lib.SyncopeClient;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.ResourceTO;
import org.apache.syncope.common.lib.types.AnyTypeKind;
@@ -132,7 +128,7 @@ public abstract class ConnObjectListViewPanel extends Panel
{
accordion.setOutputMarkupId(true);
add(accordion.setEnabled(true).setVisible(true));
-final List listOfItems = reloadItems(resource.getKey(),
anyType, null, null);
+final List listOfItems = reloadItems(resource.getKey(),
anyType, null);
final ListViewPanel.Builder builder = new
ListViewPanel.Builder(
ConnObjectTO.class, pageRef) {
@@ -179,7 +175,7 @@ public abstract class ConnObjectListViewPanel extends Panel
{
@Override
public void onClick(final AjaxRequestTarget target) {
-final List listOfItems =
reloadItems(resource.getKey(), anyType
[syncope] branch 2_1_X updated: Removed wrongly committed changes
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 4e2853a Removed wrongly committed changes
4e2853a is described below
commit 4e2853a92e7a46e1d8eab68f761031506f7aa06e
Author: Matteo Alessandroni
AuthorDate: Fri Oct 4 15:23:40 2019 +0200
Removed wrongly committed changes
---
.../client/console/panels/UserDirectoryPanel.java | 25 --
.../wicket/markup/html/form/ActionLink.java| 1 -
.../markup/html/form/ActionsPanel.properties | 4
.../markup/html/form/ActionsPanel_it.properties| 4
.../markup/html/form/ActionsPanel_ja.properties| 4
.../markup/html/form/ActionsPanel_pt_BR.properties | 4
.../markup/html/form/ActionsPanel_ru.properties| 4
7 files changed, 46 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 3b837de..597a4f5 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -341,31 +341,6 @@ public class UserDirectoryPanel extends
AnyDirectoryPanel() {
-
-private static final long serialVersionUID = 8011039414597736111L;
-
-@Override
-public void onClick(final AjaxRequestTarget target, final UserTO
ignore) {
-IModel> formModel = new
CompoundPropertyModel<>(
-new AnyWrapper<>(model.getObject()));
-altDefaultModal.setFormModel(formModel);
-
-target.add(altDefaultModal.setContent(new AnyStatusModal<>(
-altDefaultModal,
-pageRef,
-formModel.getObject().getInnerObject(),
-"resource",
-false)));
-
-altDefaultModal.header(new Model<>(
-getString("any.edit", new Model<>(new
AnyWrapper<>(model.getObject());
-
-altDefaultModal.show(true);
-}
-}, ActionType.MANAGE_ACCOUNTS,
-String.format("%s,%s", StandardEntitlement.USER_READ,
StandardEntitlement.USER_UPDATE));
-
return panel;
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index d8dfba0..c237bd4 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -93,7 +93,6 @@ public abstract class ActionLink
implements Serializable
RECONCILIATION_PUSH("update"),
RECONCILIATION_PULL("update"),
MANAGE_RESOURCES("update"),
-MANAGE_ACCOUNTS("update"),
MANAGE_USERS("update"),
MANAGE_GROUPS("update"),
PROPAGATION_TASKS("read"),
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
index c80fe67..e5affd7 100644
---
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
+++
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel.properties
@@ -233,7 +233,3 @@ zoom_in.alt=zoom-in icon
zoom_out.class=fa fa-search-minus
zoom_out.title=zoom-out
zoom_out.alt=zoom-out icon
-
-manage_accounts.class=fa fa-sitemap
-manage_accounts.title=manage accounts
-manage_accounts.alt=manage accounts icon
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
index e3b094b..d0dbb16 100644
---
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
+++
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionsPanel_it.properties
@@ -231,7 +231,3 @@ reconciliation_push.alt=reconciliation push icon
reconciliation_pull.class=fa-chevron-circle-left
reconciliation_pull.title=pull
reconciliation_
[syncope] branch 2_1_X updated: Removed unused properties
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new feb09f4 Removed unused properties
feb09f4 is described below
commit feb09f47c4b70282c0d8b00ae20a98567a9d6fae
Author: Matteo Alessandroni
AuthorDate: Fri Oct 4 15:08:12 2019 +0200
Removed unused properties
---
.../client/console/panels/UserDirectoryPanel.java | 25 ++
.../wicket/markup/html/form/ActionLink.java| 1 +
.../wicket/markup/html/form/ActionPanel.properties | 271 -
.../markup/html/form/ActionPanel_it.properties | 264
.../markup/html/form/ActionPanel_ja.properties | 265
.../markup/html/form/ActionPanel_pt_BR.properties | 264
.../markup/html/form/ActionPanel_ru.properties | 264
.../markup/html/form/ActionsPanel.properties | 4 +
.../markup/html/form/ActionsPanel_it.properties| 4 +
.../markup/html/form/ActionsPanel_ja.properties| 4 +
.../markup/html/form/ActionsPanel_pt_BR.properties | 4 +
.../markup/html/form/ActionsPanel_ru.properties| 4 +
12 files changed, 46 insertions(+), 1328 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
index 597a4f5..3b837de 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/UserDirectoryPanel.java
@@ -341,6 +341,31 @@ public class UserDirectoryPanel extends
AnyDirectoryPanel() {
+
+private static final long serialVersionUID = 8011039414597736111L;
+
+@Override
+public void onClick(final AjaxRequestTarget target, final UserTO
ignore) {
+IModel> formModel = new
CompoundPropertyModel<>(
+new AnyWrapper<>(model.getObject()));
+altDefaultModal.setFormModel(formModel);
+
+target.add(altDefaultModal.setContent(new AnyStatusModal<>(
+altDefaultModal,
+pageRef,
+formModel.getObject().getInnerObject(),
+"resource",
+false)));
+
+altDefaultModal.header(new Model<>(
+getString("any.edit", new Model<>(new
AnyWrapper<>(model.getObject());
+
+altDefaultModal.show(true);
+}
+}, ActionType.MANAGE_ACCOUNTS,
+String.format("%s,%s", StandardEntitlement.USER_READ,
StandardEntitlement.USER_UPDATE));
+
return panel;
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index c237bd4..d8dfba0 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -93,6 +93,7 @@ public abstract class ActionLink
implements Serializable
RECONCILIATION_PUSH("update"),
RECONCILIATION_PULL("update"),
MANAGE_RESOURCES("update"),
+MANAGE_ACCOUNTS("update"),
MANAGE_USERS("update"),
MANAGE_GROUPS("update"),
PROPAGATION_TASKS("read"),
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
deleted file mode 100644
index 698e4cc..000
---
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
+++ /dev/null
@@ -1,271 +0,0 @@
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements. See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership. The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License. You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing,
-# software distributed under the License is distributed on an
-# "AS IS" BASIS, WITHOUT WARRANTIES OR
[syncope] branch 2_0_X updated: Removed unused properties
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new 9a9c3d0 Removed unused properties 9a9c3d0 is described below commit 9a9c3d0d9ec1eb86a0459b846a94a997e0d9c96c Author: Matteo Alessandroni AuthorDate: Fri Oct 4 14:57:53 2019 +0200 Removed unused properties --- .../wicket/markup/html/form/ActionPanel.properties | 271 - .../markup/html/form/ActionPanel_it.properties | 264 .../markup/html/form/ActionPanel_ja.properties | 265 .../markup/html/form/ActionPanel_pt_BR.properties | 264 .../markup/html/form/ActionPanel_ru.properties | 264 5 files changed, 1328 deletions(-) diff --git a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties deleted file mode 100644 index 819ed50..000 --- a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties +++ /dev/null @@ -1,271 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -mapping.class=fa fa-exchange -mapping.title=mapping -mapping.alt=mapping icon - -mustchangepassword.class=fa fa-lock -mustchangepassword.title=toggle must change password -mustchangepassword.alt=must change password icon - -set_latest_sync_token.class=fa fa-hourglass-start -set_latest_sync_token.title=set last sync token -set_latest_sync_token.alt=set last sync token icon - -remove_sync_token.class=fa fa-hourglass-o -remove_sync_token.title=remove sync token -remove_sync_token.alt=remove sync token icon - -clone.class=fa fa-clone -clone.title=clone -clone.alt=clone icon - -create.class=glyphicon glyphicon-plus -create.title=create -create.alt=create icon - -template.class=fa fa-list-alt -template.title=template -template.alt=template icon - -edit.class=glyphicon glyphicon-pencil -edit.title=edit -edit.alt=edit icon - -manage_approval.class=fa fa-pencil-square-o -manage_approval.title=manage -manage_approval.alt=manage approval icon - -edit_approval.class=glyphicon glyphicon-pencil -edit_approval.title=edit -edit_approval.alt=edit approval icon - -type_extensions.class=fa fa-expand -type_extensions.title=extensions -type_extensions.alt=extensions icon - -fo_edit.class=fa fa-file-code-o -fo_edit.title=fo -fo_edit.alt=fo icon - -fo_manage_approval.class=fa fa-file-code-o -fo_manage_approval.title=fo -fo_manage_approval.alt=fo icon - -fo_edit_approval.class=fa fa-file-code-o -fo_edit_approval.title=fo -fo_edit_approval.alt=fo icon - -html.class=fa fa-file-code-o -html.title=html -html.alt=html icon - -text.class=fa fa-file-text-o -text.title=text -text.alt=text icon - -compose.class=fa fa-puzzle-piece -compose.title=compose -compose.alt=compose icon - -layout_edit.class=fa fa-object-ungroup -layout_edit.title=layout -layout_edit.alt=layout icon - -reset.class=fa fa-shield -reset.title=reset -reset.alt=reset icon - -enable.class=fa fa-toggle-on -enable.title=manage status -enable.alt=enable icon - -not_found.class=fa fa-eye-slash -not_found.title=not found -not_found.alt=not found icon - -view.class=fa fa-eye -view.title=view -view.alt=view icon - -view_executions.class=fa fa-eye -view_executions.title=view executions -view_executions.alt=view executions icon - -view_details.class=fa fa-info-circle -view_details.title=view details -view_details.alt=view details icon - -members.class=fa fa-users -members.title=members -members.alt=members icon - -search.class=glyphicon glyphicon-search -search.title=search -search.alt=search icon - -delete.class=glyphicon glyphicon-minus -delete.title=delete -delete.alt=delete icon - -execute.class=fa fa-gear -execute.title=execute -execute.alt=execute icon - -password_management.class=fa fa-shield -password_management.title=password management -password_management.alt=password management icon - -request_password_reset.cla
[syncope] branch 2_1_X updated: Fixed dropdown appearance in login page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 9ceb70e Fixed dropdown appearance in login page
9ceb70e is described below
commit 9ceb70e3b22a59191d20051fc249f7313b07d79c
Author: skylark17
AuthorDate: Thu Jun 13 16:10:50 2019 +0200
Fixed dropdown appearance in login page
---
client/console/src/main/resources/META-INF/resources/css/login.css | 4
1 file changed, 4 deletions(-)
diff --git a/client/console/src/main/resources/META-INF/resources/css/login.css
b/client/console/src/main/resources/META-INF/resources/css/login.css
index b84aa97..cfa5077 100644
--- a/client/console/src/main/resources/META-INF/resources/css/login.css
+++ b/client/console/src/main/resources/META-INF/resources/css/login.css
@@ -90,10 +90,6 @@ body, html {
box-sizing: border-box;
}
-.form-signin .dropdown {
- width: 100% !important;
-}
-
.form-signin .form-control:focus {
border-color: rgb(104, 145, 162);
outline: 0;
[syncope] branch master updated: Fixed dropdown appearance in login page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 082f978 Fixed dropdown appearance in login page
082f978 is described below
commit 082f9786ac0c656faed3bfd1be17af1bcfc80005
Author: skylark17
AuthorDate: Thu Jun 13 15:33:59 2019 +0200
Fixed dropdown appearance in login page
---
.../src/main/resources/META-INF/resources/ui-commons/css/login.scss | 4
1 file changed, 4 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/login.scss
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/login.scss
index 1b7a626..93d2330 100644
---
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/login.scss
+++
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/login.scss
@@ -82,10 +82,6 @@ body {
.form-control:focus {
outline: 0;
}
-
- .dropdown {
-width: 100% !important;
- }
}
.btn {
[syncope] branch master updated: [SYNCOPE-1421] Removed AngularJS dependencies
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new 8cf6fc1 [SYNCOPE-1421] Removed AngularJS dependencies 8cf6fc1 is described below commit 8cf6fc1746df33f54ba440df6c3a6304e7d2f6a9 Author: skylark17 AuthorDate: Fri Jun 7 09:33:17 2019 +0200 [SYNCOPE-1421] Removed AngularJS dependencies --- deb/enduser/LICENSE| 44 -- deb/enduser/NOTICE | 20 docker/enduser/LICENSE | 44 -- docker/enduser/NOTICE | 20 pom.xml| 86 -- standalone/LICENSE | 44 -- standalone/NOTICE | 20 7 files changed, 278 deletions(-) diff --git a/deb/enduser/LICENSE b/deb/enduser/LICENSE index 0ce46e2..ab3404f 100644 --- a/deb/enduser/LICENSE +++ b/deb/enduser/LICENSE @@ -203,35 +203,6 @@ == -For AngularJS UI Bootstrap (http://angular-ui.github.io/bootstrap/): -This is licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions: - - The above copyright notice and this permission notice shall be - included in all copies or substantial portions of the Software. - - THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, - EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF - MERCHANTABILITY,FITNESSFORA PARTICULARPURPOSEAND - NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE - LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION - OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION - WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. - -== - -For AngularJS UI Select (https://github.com/angular-ui/ui-select/): -This is licensed under the MIT license, see above. - -== - For Bootstrap (http://getbootstrap.com/): This is licensed under the MIT license, see above. @@ -743,21 +714,6 @@ This is licensed under the MIT license, see above. == -For AngularJS (https://angular.io/): -This is licensed under the MIT license, see above. - -== - -For Angular Translate (https://angular-translate.github.io/): -This is licensed under the MIT license, see above. - -== - -For AngularJS UI Router (http://angular-ui.github.io/ui-router/site): -This is licensed under the MIT license, see above. - -== - For Bootstrap File Input (http://plugins.krajee.com/file-input): This is licensed under the BSD license, see above. diff --git a/deb/enduser/NOTICE b/deb/enduser/NOTICE index 4a3be1e..250f5a2 100644 --- a/deb/enduser/NOTICE +++ b/deb/enduser/NOTICE @@ -9,16 +9,6 @@ with which this file is now or was at one time distributed. == -This product includes software developed by the AngularJS UI Bootstrap project. -Copyright (c) 2012-2016 the AngularUI Team, https://github.com/organizations/angular-ui/teams/291112] - -== - -This product includes software developed by the AngularJS UI Select project. -Copyright (c) 2013-2014 AngularUI - -== - This product includes software developed by the Bootstrap project. Copyright (c) 2011-2016 Twitter, Inc. @@ -112,16 +102,6 @@ Copyright (c) 2015 Carlos A. Gomes. == -This product includes software developed by the AngularJS project. -Copyright (c) 2014-2016 Google, Inc. http://angular.io - -== - -This product includes software developed by the Angular Translate project. -Copyright (c) <2014> - -== - This product includes software developed by the Bootstrap File Input project. Copyright (c) 2014 - 2016, Kartik Visweswaran Krajee.com All rights reserved. diff --git a/docker/enduser/LICENSE b/docker/enduser/LICENSE index 0ce46e2..ab3404f 100644 --- a/docker/enduser/LICENSE +++ b/docker/enduser/LICENSE @@ -203,35 +203,6 @@ == -For AngularJS UI Bootstrap (http://angular-ui.github.io/bootstrap/): -This is licensed under the MIT license: - - Permission is hereby granted, free of charge, to any person obtaining - a copy of this software and associated documentation files (the - "Software"), to deal in the Software without restriction, including - without limitation the rights to use, copy, modify, merge, publish, - distribute, sublicense, and/or sell copies of the Software, and to - permit persons to whom the Software is furnished to do so, subject to - the following conditions
[syncope] branch master updated: [SYNCOPE-1421] Small fixes to the Enduser, added first UI tests for the new Enduser
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 785e0fa [SYNCOPE-1421] Small fixes to the Enduser, added first UI
tests for the new Enduser
785e0fa is described below
commit 785e0fa659cbe853c81b45a571819d34a01dc64a
Author: skylark17
AuthorDate: Thu Jun 6 17:20:19 2019 +0200
[SYNCOPE-1421] Small fixes to the Enduser, added first UI tests for the new
Enduser
---
.../css/accessibility/accessibilityHC.scss | 13 ++
.../resources/ui-commons/js/accessibility.js | 8 +-
.../console/SyncopeWebApplication.properties | 2 +-
.../markup/html/form/AjaxCaptchaFieldPanel.java| 13 +-
.../syncope/client/enduser/navigation/Navbar.java | 3 +-
.../client/enduser/pages/MustChangePassword.java | 4 +-
.../apache/syncope/client/enduser/pages/Self.java | 7 +-
.../enduser/pages/SelfConfirmPasswordReset.java| 6 +-
.../client/enduser/panels/SelfPwdResetPanel.java | 5 +-
.../client/enduser/wizards/any/PlainAttrs.java | 84 ++---
.../enduser/SyncopeWebApplication.properties | 2 +-
.../client/enduser/assets/css/syncopeEnduser.scss | 4 +
.../markup/html/form/AjaxCaptchaFieldPanel.html| 4 +-
.../syncope/fit/console/AbstractTypesITCase.java | 8 +-
.../syncope/fit/console/AnyObjectsITCase.java | 2 +-
.../syncope/fit/console/AnyTypeClassesITCase.java | 8 +-
.../apache/syncope/fit/console/AnyTypesITCase.java | 6 +-
.../apache/syncope/fit/console/BatchesITCase.java | 4 +-
.../fit/console/DisplayAttributesITCase.java | 2 +-
.../apache/syncope/fit/console/GroupsITCase.java | 8 +-
.../org/apache/syncope/fit/console/LogsITCase.java | 4 +-
.../syncope/fit/console/NotificationsITCase.java | 8 +-
.../syncope/fit/console/ParametersITCase.java | 8 +-
.../apache/syncope/fit/console/PoliciesITCase.java | 36 +++---
.../apache/syncope/fit/console/RealmsITCase.java | 14 +--
.../fit/console/RelationshipTypesITCase.java | 4 +-
.../apache/syncope/fit/console/ReportsITCase.java | 6 +-
.../apache/syncope/fit/console/RolesITCase.java| 6 +-
.../apache/syncope/fit/console/SchemasITCase.java | 12 +-
.../fit/console/SecurityQuestionsITCase.java | 6 +-
.../apache/syncope/fit/console/TopologyITCase.java | 18 +--
.../apache/syncope/fit/console/UsersITCase.java| 18 +--
.../syncope/fit/enduser/AbstractEnduserITCase.java | 29 +
.../fit/enduser/SelfRegistrationITCase.java| 139 -
.../src/test/resources/enduser.properties | 2 +-
35 files changed, 366 insertions(+), 137 deletions(-)
diff --git
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/accessibility/accessibilityHC.scss
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/accessibility/accessibilityHC.scss
index ababa93..d52aaac 100644
---
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/accessibility/accessibilityHC.scss
+++
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/css/accessibility/accessibilityHC.scss
@@ -297,4 +297,17 @@ div.infolabel,
.login-card {
background-color: #0f1417;
+}
+
+
+
+
+/* From Console Admin LTE
+=
*/
+.dark-theme .callout.callout-danger, .dark-theme .callout.callout-warning,
+.dark-theme .callout.callout-info, .dark-theme .callout.callout-success,
+.dark-theme .alert-success, .dark-theme .alert-danger, .dark-theme
.label-success,
+.dark-theme .alert-error, .dark-theme .alert-warning, .dark-theme .alert-info,
.dark-theme .label-danger,
+.dark-theme .label-info, .dark-theme .label-warning, .dark-theme
.label-primary {
+ color: #fff !important;
}
\ No newline at end of file
diff --git
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/js/accessibility.js
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/js/accessibility.js
index 790e2b4..36247f7 100644
---
a/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/js/accessibility.js
+++
b/client/idrepo/common-ui/src/main/resources/META-INF/resources/ui-commons/js/accessibility.js
@@ -1,3 +1,4 @@
+
/*
* Licensed to the Apache Software Foundation (ASF) under one
* or more contributor license agreements. See the NOTICE file
@@ -99,7 +100,8 @@ $(document).ready(function () {
locationDomain + '/ui-commons/css/accessibility/accessibilityHC.css'
];
-var darkThemeMainClass = 'skin-blue';
+var darkThemeMainClass = 'dark-theme';
+var darkThemeSkinClass = 'skin-blue';
var defaultThemeMainClass = 'skin-green-light';
var doSwitch = function (check, files) {
@@ -118,9 +120,9 @@ $(document
[syncope] branch master updated: Added Wicket debug mode in debugging profiles
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 54b6c50 Added Wicket debug mode in debugging profiles
54b6c50 is described below
commit 54b6c5093e43535997be4e9d297e6081512b5bff
Author: skylark17
AuthorDate: Thu May 30 17:22:22 2019 +0200
Added Wicket debug mode in debugging profiles
---
fit/console-reference/pom.xml | 2 ++
fit/enduser-reference/pom.xml | 2 ++
2 files changed, 4 insertions(+)
diff --git a/fit/console-reference/pom.xml b/fit/console-reference/pom.xml
index 1971cc9..9b0acef 100644
--- a/fit/console-reference/pom.xml
+++ b/fit/console-reference/pom.xml
@@ -221,6 +221,7 @@ under the License.
-Dspring.profiles.active=embedded
+
-Dwicket.core.settings.general.configuration-type=development
-Xdebug -Djaxb.debug=true
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-XX:+CMSClassUnloadingEnabled -XX:+UseG1GC -Xmx1024m
-Xms512m
@@ -289,6 +290,7 @@ under the License.
-Dspring.profiles.active=embedded
+
-Dwicket.core.settings.general.configuration-type=development
-javaagent:${java.home}/lib/hotswap/hotswap-agent.jar=autoHotswap=true,disablePlugin=Spring,disablePlugin=Hibernate,disablePlugin=CxfJAXRS
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
-Xmx1024m -Xms512m
diff --git a/fit/enduser-reference/pom.xml b/fit/enduser-reference/pom.xml
index cfa4750..e924a5f 100644
--- a/fit/enduser-reference/pom.xml
+++ b/fit/enduser-reference/pom.xml
@@ -221,6 +221,7 @@ under the License.
-Dspring.profiles.active=embedded
+
-Dwicket.core.settings.general.configuration-type=development
-Xdebug -Djaxb.debug=true
-Xrunjdwp:transport=dt_socket,address=8000,server=y,suspend=n
-XX:+CMSClassUnloadingEnabled -XX:+UseG1GC -Xmx1024m
-Xms512m
@@ -292,6 +293,7 @@ under the License.
-Dspring.profiles.active=embedded
+
-Dwicket.core.settings.general.configuration-type=development
-javaagent:${java.home}/lib/hotswap/hotswap-agent.jar=autoHotswap=true,disablePlugin=Spring,disablePlugin=Hibernate,disablePlugin=CxfJAXRS
-agentlib:jdwp=transport=dt_socket,server=y,suspend=n,address=8000
-XX:+CMSClassUnloadingEnabled -XX:+UseConcMarkSweepGC
-Xmx1024m -Xms512m
[syncope] branch master updated: [SYNCOPE-1421] Small fixes to Enduser application
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new 280ae5a [SYNCOPE-1421] Small fixes to Enduser application 280ae5a is described below commit 280ae5acc840b91a19d89b891508566c2be5e462 Author: skylark17 AuthorDate: Thu May 16 11:32:12 2019 +0200 [SYNCOPE-1421] Small fixes to Enduser application --- .../syncope/client/console}/annotations/ExtPage.java | 2 +- .../init/ClassPathScanImplementationLookup.java| 2 +- .../apache/syncope/client/console/pages/BasePage.java | 2 +- .../syncope/client/ui/commons/wizards/AjaxWizard.html | 0 .../client/ui/commons/wizards/AjaxWizard.properties| 0 .../ui/commons/wizards/AjaxWizardMgtButtonBar.html | 4 ++-- .../client/ui/commons/wizards/AjaxWizard_it.properties | 0 .../client/ui/commons/wizards/AjaxWizard_ja.properties | 0 .../ui/commons/wizards/AjaxWizard_pt_BR.properties | 0 .../client/ui/commons/wizards/AjaxWizard_ru.properties | 0 .../syncope/client/enduser}/annotations/ExtPage.java | 18 +- .../init/ClassPathScanImplementationLookup.java| 2 +- .../syncope/client/enduser/navigation/Navbar.java | 8 +--- .../client/enduser/assets/css/syncopeEnduser.scss | 4 ++-- .../syncope/client/ui/commons/wizards/AjaxWizard.html | 1 - .../client/ui/commons/wizards/AjaxWizard.properties| 0 .../ui/commons/wizards/AjaxWizardMgtButtonBar.html | 14 +++--- .../client/ui/commons/wizards/AjaxWizard_it.properties | 0 .../client/ui/commons/wizards/AjaxWizard_ja.properties | 0 .../ui/commons/wizards/AjaxWizard_pt_BR.properties | 0 .../client/ui/commons/wizards/AjaxWizard_ru.properties | 0 .../syncope/client/console/pages/CamelRoutes.java | 2 +- .../apache/syncope/client/console/pages/Flowable.java | 2 +- .../apache/syncope/client/enduser/pages/Flowable.java | 6 ++ .../syncope/client/console/pages/OIDCClient.java | 2 +- .../apache/syncope/client/console/pages/SAML2SP.java | 2 +- .../syncope/client/console/pages/SCIMConfPage.java | 2 +- 27 files changed, 24 insertions(+), 49 deletions(-) diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java similarity index 96% copy from client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java copy to client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java index 4e1d146..f0ed504 100644 --- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/annotations/ExtPage.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/annotations/ExtPage.java @@ -16,7 +16,7 @@ * specific language governing permissions and limitations * under the License. */ -package org.apache.syncope.client.ui.commons.annotations; +package org.apache.syncope.client.console.annotations; import java.lang.annotation.Documented; import java.lang.annotation.ElementType; diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java index 09b69eb..995168b 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/init/ClassPathScanImplementationLookup.java @@ -30,9 +30,9 @@ import java.util.Map; import java.util.Set; import org.apache.commons.lang3.ArrayUtils; import org.apache.commons.lang3.ObjectUtils; +import org.apache.syncope.client.console.annotations.ExtPage; import org.apache.syncope.client.console.pages.BaseExtPage; import org.apache.syncope.client.ui.commons.annotations.BinaryPreview; -import org.apache.syncope.client.ui.commons.annotations.ExtPage; import org.apache.syncope.client.ui.commons.annotations.ExtWidget; import org.apache.syncope.client.console.annotations.IdMPage; import org.apache.syncope.client.console.annotations.Resource; diff --git a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java index 3e55ccf..8bbb663 100644 --- a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java +++ b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/BasePage.java @@ -24,7 +24,7 @@ import java.util.List; import org.apache.commons.lang3.StringUtils; import
[syncope] branch master updated: [SYNCOPE-1421] Fixed and improved Enduser navigation bar, small fixes for Enduser mobile version, very first styling of the User Requests page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 6918184 [SYNCOPE-1421] Fixed and improved Enduser navigation bar,
small fixes for Enduser mobile version, very first styling of the User Requests
page
6918184 is described below
commit 69181840ee8b4d100fb5c3de99b693020a4d8b69
Author: skylark17
AuthorDate: Wed May 15 14:37:59 2019 +0200
[SYNCOPE-1421] Fixed and improved Enduser navigation bar, small fixes for
Enduser mobile version, very first styling of the User Requests page
---
.../client/console/SyncopeWebApplication.java | 2 +-
client/idrepo/enduser/pom.xml | 6 ++
.../client/enduser/SyncopeWebApplication.java | 18 -
.../client/enduser/assets/SyncopeEnduserCss.java | 49
.../syncope/client/enduser/navigation/Navbar.java | 89 --
.../client/enduser/pages/BaseEnduserWebPage.java | 18 -
.../apache/syncope/client/enduser/pages/Self.java | 6 ++
.../client/enduser/assets}/css/syncopeEnduser.scss | 39 --
.../syncope/client/enduser/navigation/Navbar.html | 86 ++---
.../client/enduser/navigation/Navbar.properties| 3 +-
.../client/enduser/navigation/Navbar_it.properties | 3 +-
.../client/enduser/navigation/Navbar_ja.properties | 3 +-
.../enduser/navigation/Navbar_pt_BR.properties | 3 +-
.../client/enduser/navigation/Navbar_ru.properties | 3 +-
.../client/enduser/pages/BaseEnduserWebPage.html | 15
.../apache/syncope/client/enduser/pages/Login.html | 2 +-
.../client/enduser/pages/MustChangePassword.html | 7 +-
.../enduser/pages/SelfConfirmPasswordReset.html| 2 +-
.../client/enduser/pages/SelfPasswordReset.html| 2 +
.../client/enduser/panels/SelfPwdResetPanel.html | 2 +-
ext/flowable/client-enduser/pom.xml| 1 -
.../syncope/client/enduser/pages/Flowable.java | 64 +++-
.../syncope/client/enduser/pages/Flowable.html | 60 +--
.../client/enduser/pages/Flowable.properties | 2 +-
...{Flowable.properties => Flowable_it.properties} | 2 +-
...{Flowable.properties => Flowable_ja.properties} | 2 +-
...owable.properties => Flowable_pt_BR.properties} | 2 +-
...{Flowable.properties => Flowable_ru.properties} | 2 +-
.../src/test/resources/hotswap-agent.properties| 5 +-
29 files changed, 385 insertions(+), 113 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index 4174226..3f4bef1 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -227,7 +227,7 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
getMarkupSettings().setStripWicketTags(true);
getMarkupSettings().setCompressWhitespace(true);
-
+
if (csrf) {
getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener());
}
diff --git a/client/idrepo/enduser/pom.xml b/client/idrepo/enduser/pom.xml
index cfa8351..4374d35 100644
--- a/client/idrepo/enduser/pom.xml
+++ b/client/idrepo/enduser/pom.xml
@@ -153,6 +153,12 @@ under the License.
${project.build.outputDirectory}/META-INF/resources/css
+
+
+
${basedir}/src/main/resources/org/apache/syncope/client/enduser/assets/css
+
+
${project.build.outputDirectory}/org/apache/syncope/client/enduser/assets/css
+
diff --git
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
index 29b3931..ba3e9ea 100644
---
a/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
+++
b/client/idrepo/enduser/src/main/java/org/apache/syncope/client/enduser/SyncopeWebApplication.java
@@ -43,6 +43,7 @@ import org.apache.commons.lang3.BooleanUtils;
import org.apache.commons.lang3.StringUtils;
import org.apache.syncope.client.enduser.annotations.Resource;
import
org.apache.syncope.client.enduser.init.ClassPathScanImplementationLookup;
+import org.apache.syncope.client.enduser.assets.SyncopeEnduserCss;
import org.apache.syncope.client.enduser.model.CustomAttributesInfo;
import org.apache.syncope.client.enduser.pages.Login;
import org.apache.syncope.client.enduser.pages.MustChangePassword;
@@ -56,6 +57
[syncope] branch master updated: Fix checkstyle
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new 6b8a10f Fix checkstyle 6b8a10f is described below commit 6b8a10fa0a9da23c52a08baa637ec7bfb5d4fcd6 Author: skylark17 AuthorDate: Wed Apr 17 13:04:56 2019 +0200 Fix checkstyle --- .../syncope/client/enduser/pages/SelfConfirmPasswordReset.properties| 2 +- .../syncope/client/enduser/pages/SelfConfirmPasswordReset_it.properties | 2 +- .../syncope/client/enduser/pages/SelfConfirmPasswordReset_ja.properties | 2 +- .../client/enduser/pages/SelfConfirmPasswordReset_pt_BR.properties | 2 +- .../syncope/client/enduser/pages/SelfConfirmPasswordReset_ru.properties | 2 +- .../apache/syncope/client/enduser/pages/SelfPasswordReset.properties| 2 +- .../apache/syncope/client/enduser/pages/SelfPasswordReset_it.properties | 2 +- .../apache/syncope/client/enduser/pages/SelfPasswordReset_ja.properties | 2 +- .../syncope/client/enduser/pages/SelfPasswordReset_pt_BR.properties | 2 +- .../apache/syncope/client/enduser/pages/SelfPasswordReset_ru.properties | 2 +- 10 files changed, 10 insertions(+), 10 deletions(-) diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset.properties index 1aee4dd..8d7d59c 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset.properties @@ -21,4 +21,4 @@ password-strength=Password strength: cancel=Cancel submit=Submit self.confirm.pwd.reset.success=Password successfully reset -self.confirm.pwd.reset.error.empty=No token was specified in the url, cannot access to the requested page \ No newline at end of file +self.confirm.pwd.reset.error.empty=No token was specified in the url, cannot access to the requested page diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_it.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_it.properties index 17fca32..e5fffa1 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_it.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_it.properties @@ -21,4 +21,4 @@ password-strength=Sicurezza della password: cancel=Annulla submit=Invia self.confirm.pwd.reset.success=Password resettata con successo -self.confirm.pwd.reset.error.empty=Nessun token \u00e8 specifico nell'url, non \u00e8 possibile accedere alla pagina richiesta \ No newline at end of file +self.confirm.pwd.reset.error.empty=Nessun token \u00e8 specifico nell'url, non \u00e8 possibile accedere alla pagina richiesta diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_ja.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_ja.properties index ae8981e..4a2e3a3 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_ja.properties +++ b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_ja.properties @@ -21,4 +21,4 @@ password-strength=\u30d1\u30b9\u30ef\u30fc\u30c9\u306e\u5f37\u5ea6\uff1a cancel=\u30ad\u30e3\u30f3\u30bb\u30eb submit=\u63d0\u51fa\u3059\u308b self.confirm.pwd.reset.success=\u30d1\u30b9\u30ef\u30fc\u30c9\u3092\u30ea\u30bb\u30c3\u30c8\u3057\u307e\u3057\u305f -self.confirm.pwd.reset.error.empty=URL\u306b\u30c8\u30fc\u30af\u30f3\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u8981\u6c42\u3055\u308c\u305f\u30da\u30fc\u30b8\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093 \ No newline at end of file +self.confirm.pwd.reset.error.empty=URL\u306b\u30c8\u30fc\u30af\u30f3\u304c\u6307\u5b9a\u3055\u308c\u3066\u3044\u307e\u305b\u3093\u3002\u8981\u6c42\u3055\u308c\u305f\u30da\u30fc\u30b8\u306b\u30a2\u30af\u30bb\u30b9\u3067\u304d\u307e\u305b\u3093 diff --git a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_pt_BR.properties b/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_pt_BR.properties index eb3f08a..da4c530 100644 --- a/client/idrepo/enduser/src/main/resources/org/apache/syncope/client/enduser/pages/SelfConfirmPasswordReset_pt_BR.properties +++ b/client/idrepo/enduser/src
[syncope] branch master updated: [SYNCOPE-1421] Added 'Confirm password reset' page in Enduser, added style to 'Password reset' page in Enduser, added new style for 'Must change password' page in Admi
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new f7f4f0a [SYNCOPE-1421] Added 'Confirm password reset' page in
Enduser, added style to 'Password reset' page in Enduser, added new style for
'Must change password' page in Admin Console, other fixes
f7f4f0a is described below
commit f7f4f0ab2b79c4d7adfc993d2c3235a351040137
Author: skylark17
AuthorDate: Wed Apr 17 10:26:52 2019 +0200
[SYNCOPE-1421] Added 'Confirm password reset' page in Enduser, added style
to 'Password reset' page in Enduser, added new style for 'Must change password'
page in Admin Console, other fixes
---
.../client/console/pages/MustChangePassword.java | 3 +
.../META-INF/resources/css/syncopeConsole.scss | 25 ++-
.../apache/syncope/client/console/pages/Login.html | 1 +
.../client/console/pages/MustChangePassword.html | 71 +--
.../client/enduser/SyncopeWebApplication.java | 6 +-
.../Navbar.java} | 18 +-
.../client/enduser/pages/BaseEnduserWebPage.java | 8 +
.../enduser/pages/SelfConfirmPasswordReset.java| 135
.../client/enduser/pages/SelfPasswordReset.java| 5 +-
.../META-INF/resources/css/syncopeEnduser.scss | 87 ++--
.../syncope/client/enduser/navigation/Navbar.html | 88
.../client/enduser/pages/BaseEnduserWebPage.html | 52 +
.../apache/syncope/client/enduser/pages/Login.html | 4 +-
.../enduser/pages/SelfConfirmPasswordReset.html| 59 ++
.../SelfConfirmPasswordReset.properties} | 16 +-
.../SelfConfirmPasswordReset_it.properties}| 14 +-
.../SelfConfirmPasswordReset_ja.properties}| 16 +-
.../SelfConfirmPasswordReset_pt_BR.properties} | 16 +-
.../pages/SelfConfirmPasswordReset_ru.properties | 24 +++
.../client/enduser/pages/SelfPasswordReset.html| 23 +-
.../SelfPasswordReset.properties} | 2 +-
.../SelfPasswordReset_it.properties} | 2 +-
.../SelfPasswordReset_ja.properties} | 2 +-
.../SelfPasswordReset_pt_BR.properties}| 2 +-
.../SelfPasswordReset_ru.properties} | 2 +-
.../client/enduser/panels/SelfPwdResetPanel.html | 27 ++-
.../enduser/panels/SelfPwdResetPanel_it.properties | 2 +-
.../panels/SelfPwdResetPanel_pt_BR.properties | 4 +-
.../enduser/panels/SelfPwdResetPanel_ru.properties | 4 +-
.../wizards/any/AbstractCaptchaPanel.properties| 2 +-
...operties => AbstractCaptchaPanel_it.properties} | 2 +-
...operties => AbstractCaptchaPanel_ja.properties} | 2 +-
...rties => AbstractCaptchaPanel_pt_BR.properties} | 2 +-
.../any/AbstractCaptchaPanel_ru.properties}| 9 +-
.../ui/commons/SyncopeUIRequestCycleListener.java | 3 +-
.../resources/ui-commons/css/animations.scss | 61 ++
.../META-INF/resources/ui-commons/css/login.scss | 3 +-
.../resources/ui-commons/css/syncopeUI.scss| 232 ++---
.../META-INF/resources/ui-commons/css/utils.scss | 30 ++-
.../src/main/resources/domains/MasterContent.xml | 4 +-
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../src/main/resources/domains/MasterContent.xml | 4 +-
.../src/test/resources/domains/MasterContent.xml | 4 +-
.../core/provisioning/java/MailTemplateTest.java | 4 +-
core/upgrade/src/test/resources/syncopedb20.sql| 2 +-
.../resources/domains/MasterContent.xml.pgjsonb| 4 +-
46 files changed, 739 insertions(+), 351 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
index f83ca8f..2ce4798 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/pages/MustChangePassword.java
@@ -24,6 +24,7 @@ import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.UserSelfRestClient;
import
org.apache.syncope.client.ui.commons.markup.html.form.AjaxPasswordFieldPanel;
import org.apache.syncope.client.ui.commons.panels.NotificationPanel;
+import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
import org.apache.wicket.ajax.markup.html.form.AjaxButton;
import org.apache.wicket.markup.html.WebPage;
@@ -113,5 +114,7 @@ public class MustChangePassword extends WebPage {
form.setDefaultButton(submitButton);
add(form);
+
+add(new AttributeModifier("style", "height: \"100%\""));
}
}
diff --git
a/client/idrepo/console/src/main/resources/MET
[syncope] branch master updated: [SYNCOPE-1452] Fix notification 'about' elements not deleted after update
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 202337a [SYNCOPE-1452] Fix notification 'about' elements not deleted
after update
202337a is described below
commit 202337abbaf23aaed17f4f06aff2c618a7d7
Author: skylark17
AuthorDate: Tue Mar 26 14:14:19 2019 +0100
[SYNCOPE-1452] Fix notification 'about' elements not deleted after update
---
.../syncope/client/console/notifications/NotificationWrapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
index cc3e74e..1375323 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
@@ -77,7 +77,7 @@ public class NotificationWrapper implements Serializable {
}
public Map getAboutFIQLs() {
-if (CollectionUtils.isEmpty(this.aboutClauses)) {
+if (CollectionUtils.isEmpty(this.aboutClauses) ||
this.aboutClauses.get(0).getValue().isEmpty()) {
return this.notificationTO.getAbouts();
} else {
Map res = new HashMap<>();
[syncope] branch 2_0_X updated: [SYNCOPE-1452] Fix notification 'about' elements not deleted after update
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 9ced3a6 [SYNCOPE-1452] Fix notification 'about' elements not deleted
after update
9ced3a6 is described below
commit 9ced3a63bd0c6b60f45b66ffc74bbc0425bfc412
Author: skylark17
AuthorDate: Tue Mar 26 14:30:58 2019 +0100
[SYNCOPE-1452] Fix notification 'about' elements not deleted after update
---
.../syncope/client/console/notifications/NotificationWrapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
index 1d6ee77..ea7311a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
@@ -77,7 +77,7 @@ public class NotificationWrapper implements Serializable {
}
public Map getAboutFIQLs() {
-if (CollectionUtils.isEmpty(this.aboutClauses)) {
+if (CollectionUtils.isEmpty(this.aboutClauses) ||
this.aboutClauses.get(0).getValue().isEmpty()) {
return this.notificationTO.getAbouts();
} else {
Map res = new HashMap<>();
[syncope] branch 2_1_X updated: [SYNCOPE-1452] Fix notification 'about' elements not deleted after update
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 226be91 [SYNCOPE-1452] Fix notification 'about' elements not deleted
after update
226be91 is described below
commit 226be91d410187474feebddc9be3d696d344d158
Author: skylark17
AuthorDate: Tue Mar 26 14:14:19 2019 +0100
[SYNCOPE-1452] Fix notification 'about' elements not deleted after update
---
.../syncope/client/console/notifications/NotificationWrapper.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
index cc3e74e..1375323 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/notifications/NotificationWrapper.java
@@ -77,7 +77,7 @@ public class NotificationWrapper implements Serializable {
}
public Map getAboutFIQLs() {
-if (CollectionUtils.isEmpty(this.aboutClauses)) {
+if (CollectionUtils.isEmpty(this.aboutClauses) ||
this.aboutClauses.get(0).getValue().isEmpty()) {
return this.notificationTO.getAbouts();
} else {
Map res = new HashMap<>();
[syncope] branch master updated: [SYNCOPE-1439] Fix wrong types
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 431c351 [SYNCOPE-1439] Fix wrong types
431c351 is described below
commit 431c351342e06aaf21a2984488b0259c891ff612
Author: skylark17
AuthorDate: Thu Mar 7 14:35:27 2019 +0100
[SYNCOPE-1439] Fix wrong types
---
.../client/console/wizards/any/PlainAttrs.java | 30 +++---
1 file changed, 15 insertions(+), 15 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 8d82acb..67dd335 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -48,8 +48,6 @@ import org.apache.syncope.common.lib.EntityTOUtils;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.to.AttrTO;
-import org.apache.syncope.common.lib.to.AttributableTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.GroupableRelatableTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -72,6 +70,8 @@ import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
import org.apache.wicket.model.StringResourceModel;
import org.apache.wicket.model.util.ListModel;
+import org.apache.syncope.common.lib.Attr;
+import org.apache.syncope.common.lib.Attributable;
public class PlainAttrs extends AbstractAttrs {
@@ -116,7 +116,7 @@ public class PlainAttrs extends
AbstractAttrs {
@Override
public WebMarkupContainer getPanel(final String panelId) {
-return new PlainSchemasOwn(panelId, schemas, attrTOs);
+return new PlainSchemasOwn(panelId, schemas, attrs);
}
}), Model.of(0)).setOutputMarkupId(true));
@@ -140,12 +140,12 @@ public class PlainAttrs extends
AbstractAttrs {
return new PlainSchemasMemberships(
panelId,
membershipSchemas.get(membershipTO.getGroupKey()),
-new LoadableDetachableModel()
{ // SYNCOPE-1439
+new LoadableDetachableModel() {
// SYNCOPE-1439
private static final long serialVersionUID =
526768546610546553L;
@Override
-protected AttributableTO load() {
+protected Attributable load() {
return membershipTO;
}
@@ -389,19 +389,19 @@ public class PlainAttrs extends
AbstractAttrs {
return panel;
}
-protected class PlainSchemasMemberships extends
PlainSchemas {
+protected class PlainSchemasMemberships extends PlainSchemas
{
private static final long serialVersionUID = 456754923340249215L;
public PlainSchemasMemberships(
final String id,
final Map schemas,
-final IModel attributableTO) {
+final IModel attributableTO) {
super(id, schemas, attributableTO);
-add(new ListView("schemas",
-new ListModel(new ArrayList(
+add(new ListView("schemas",
+new ListModel(new ArrayList(
attributableTO.getObject().getPlainAttrs().stream().sorted(attrComparator).
collect(Collectors.toList() {
@@ -409,8 +409,8 @@ public class PlainAttrs extends
AbstractAttrs {
@Override
@SuppressWarnings({ "unchecked", "rawtypes" })
-protected void populateItem(final ListItem item) {
-AttrTO attrTO = item.getModelObject();
+protected void populateItem(final ListItem item) {
+Attr attrTO = item.getModelObject();
AbstractFieldPanel panel =
getFieldPanel(schemas.get(attrTO.getSchema()));
if (mode == AjaxWizard.Mode.TEMPLATE
@@ -461,14 +461,14 @@ public class PlainAttrs extends
AbstractAttrs {
}
}
-protected class PlainSchemasOwn extends PlainSchemas> {
+protected class PlainSchemasOwn extends PlainSchemas> {
private static final long serialVersionUID = -4730563859116024676L;
public PlainSchemasOwn(
final
[syncope] branch master updated: [SYNCOPE-1439] Fixed user membership attributes not updated in some cases
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 950e11d [SYNCOPE-1439] Fixed user membership attributes not updated
in some cases
950e11d is described below
commit 950e11d101b690daf30c6927bb793d0b159d01ed
Author: skylark17
AuthorDate: Thu Mar 7 10:37:22 2019 +0100
[SYNCOPE-1439] Fixed user membership attributes not updated in some cases
---
.../markup/html/form/AbstractMultiPanel.java | 1 +
.../console/wizards/any/AnyWizardBuilder.java | 6 +-
.../client/console/wizards/any/PlainAttrs.java | 152 ---
.../apache/syncope/fit/console/UsersITCase.java| 213 +
4 files changed, 346 insertions(+), 26 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index 6d3be21..925e8e6 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -60,6 +60,7 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel("innerForm");
form.setDefaultButton(null);
+form.setMultiPart(true);
container.add(form);
// ---
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
index e91e667..b4ca67b 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
@@ -186,14 +186,15 @@ public abstract class AnyWizardBuilder
extends AjaxWizardBuilde
updated.getVirAttrs().add(virAttr);
}
}
+
if (updated instanceof GroupableRelatableTO && original instanceof
GroupableRelatableTO) {
GroupableRelatableTO.class.cast(original).getMemberships().forEach(oMemb -> {
GroupableRelatableTO.class.cast(updated).getMembership(oMemb.getGroupKey()).ifPresent(uMemb
-> {
oMemb.getPlainAttrs().stream().
-filter(attr ->
uMemb.getPlainAttr(attr.getSchema()).isPresent()).
+filter(attr ->
!uMemb.getPlainAttr(attr.getSchema()).isPresent()).
forEach(attr -> uMemb.getPlainAttrs().add(attr));
oMemb.getVirAttrs().stream().
-filter(attr ->
uMemb.getVirAttr(attr.getSchema()).isPresent()).
+filter(attr ->
!uMemb.getVirAttr(attr.getSchema()).isPresent()).
forEach(attr -> uMemb.getVirAttrs().add(attr));
});
});
@@ -210,4 +211,5 @@ public abstract class AnyWizardBuilder
extends AjaxWizardBuilde
});
}
}
+
}
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index 7d68c0c..8d82acb 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.wizards.any;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -47,7 +48,8 @@ import org.apache.syncope.common.lib.EntityTOUtils;
import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
-import org.apache.syncope.common.lib.Attr;
+import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.to.AttributableTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.GroupableRelatableTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -64,6 +66,7 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.
[syncope] branch 2_0_X updated: [SYNCOPE-1439] Added some ITs
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 8ef9c53 [SYNCOPE-1439] Added some ITs
8ef9c53 is described below
commit 8ef9c53ed6412ed6ec97d40637e4154250af1dcd
Author: skylark17
AuthorDate: Thu Mar 7 12:11:16 2019 +0100
[SYNCOPE-1439] Added some ITs
---
.../markup/html/form/AbstractMultiPanel.java | 1 +
.../apache/syncope/fit/console/UsersITCase.java| 213 +
2 files changed, 214 insertions(+)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index 19f112b..c7df1a5 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -60,6 +60,7 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel("innerForm");
form.setDefaultButton(null);
+form.setMultiPart(true);
container.add(form);
// ---
diff --git
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
index d385e53..d307033 100644
---
a/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
+++
b/fit/core-reference/src/test/java/org/apache/syncope/fit/console/UsersITCase.java
@@ -58,6 +58,10 @@ public class UsersITCase extends AbstractConsoleITCase {
"body:content:body:container:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:"
+
"searchFormContainer:search:multiValueContainer:innerForm:content:view:0:panel:container:value:"
+ "textField", TextField.class);
+TESTER.assertComponent(
+
"body:content:body:container:content:tabbedPanel:panel:accordionPanel:tabs:0:body:content:"
++
"searchFormContainer:search:multiValueContainer:innerForm:content:view:1:panel:container:value:"
++ "textField", TextField.class);
}
@Test
@@ -324,6 +328,215 @@ public class UsersITCase extends AbstractConsoleITCase {
}
@Test
+public void editUserMemberships() {
+TESTER.clickLink("body:realmsLI:realms");
+
TESTER.executeAjaxEvent("body:content:realmChoicePanel:container:realms:btn",
Constants.ON_CLICK);
+
TESTER.executeAjaxEvent("body:content:realmChoicePanel:container:realms:dropdown-menu:buttons:2:button",
+Constants.ON_CLICK);
+
+
TESTER.clickLink("body:content:body:container:content:tabbedPanel:tabs-container:tabs:1:link");
+
+Component component = findComponentByProp("username", CONTAINER
++
":searchContainer:resultTable:tablePanel:groupForm:checkgroup:dataTable",
"rossini");
+assertNotNull(component);
+
+// click on "edit"
+TESTER.executeAjaxEvent(component.getPageRelativePath(),
Constants.ON_CLICK);
+TESTER.clickLink(TAB_PANEL +
"outerObjectsRepeater:1:outer:container:content:togglePanelContainer:container:"
++ "actions:actions:actionRepeater:0:action:action");
+
+FormTester formTester = TESTER.newFormTester(TAB_PANEL +
"outerObjectsRepeater:0:outer:form:content:form");
+assertNotNull(formTester);
+formTester.submit("buttons:next");
+
+formTester = TESTER.newFormTester(TAB_PANEL +
"outerObjectsRepeater:0:outer:form:content:form");
+assertNotNull(formTester);
+formTester.submit("buttons:next");
+
+formTester = TESTER.newFormTester(TAB_PANEL +
"outerObjectsRepeater:0:outer:form:content:form");
+assertNotNull(formTester);
+
+// add "additional" group in order to show membership attributes
+
formTester.setValue("view:groupsContainer:groups:paletteField:recorder",
"additional,root,otherchild");
+TESTER.executeAjaxEvent(TAB_PANEL +
"outerObjectsRepeater:0:outer:form:content:form:buttons:next",
+Constants.ON_CLICK);
+
+formTester = TESTER.newFormTester(TAB_PANEL +
"outerObjectsRepeater:0:outer:form:content:form");
+assertNotNull(formTester);
+
+// open membership attributes accordion
+TESTER.executeAjaxEvent(TAB_PANEL + "outerObjectsRepeater:0:"
+
[syncope] branch 2_1_X updated: [SYNCOPE-1439] Fixed user membership attributes not updated in some cases
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new f978c75 [SYNCOPE-1439] Fixed user membership attributes not updated
in some cases
f978c75 is described below
commit f978c7532e36f6ab3e92e518fbc2514720a0c919
Author: skylark17
AuthorDate: Thu Mar 7 10:37:22 2019 +0100
[SYNCOPE-1439] Fixed user membership attributes not updated in some cases
---
.../markup/html/form/AbstractMultiPanel.java | 1 +
.../console/wizards/any/AnyWizardBuilder.java | 6 +-
.../client/console/wizards/any/PlainAttrs.java | 148 +++---
.../apache/syncope/fit/console/UsersITCase.java| 213 +
4 files changed, 344 insertions(+), 24 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
index 6d3be21..925e8e6 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/AbstractMultiPanel.java
@@ -60,6 +60,7 @@ public abstract class AbstractMultiPanel extends
AbstractFieldPanel("innerForm");
form.setDefaultButton(null);
+form.setMultiPart(true);
container.add(form);
// ---
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
index 4076d77..3ba260e 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AnyWizardBuilder.java
@@ -187,14 +187,15 @@ public abstract class AnyWizardBuilder
extends AjaxWizardBuilde
updated.getVirAttrs().add(virAttrTO);
}
}
+
if (updated instanceof GroupableRelatableTO && original instanceof
GroupableRelatableTO) {
GroupableRelatableTO.class.cast(original).getMemberships().forEach(oMemb -> {
GroupableRelatableTO.class.cast(updated).getMembership(oMemb.getGroupKey()).ifPresent(uMemb
-> {
oMemb.getPlainAttrs().stream().
-filter(attr ->
uMemb.getPlainAttr(attr.getSchema()).isPresent()).
+filter(attr ->
!uMemb.getPlainAttr(attr.getSchema()).isPresent()).
forEach(attr -> uMemb.getPlainAttrs().add(attr));
oMemb.getVirAttrs().stream().
-filter(attr ->
uMemb.getVirAttr(attr.getSchema()).isPresent()).
+filter(attr ->
!uMemb.getVirAttr(attr.getSchema()).isPresent()).
forEach(attr -> uMemb.getVirAttrs().add(attr));
});
});
@@ -211,4 +212,5 @@ public abstract class AnyWizardBuilder
extends AjaxWizardBuilde
});
}
}
+
}
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index a9e1f90..804d5d9 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.wizards.any;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.HashMap;
@@ -48,6 +49,7 @@ import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.to.AttributableTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.GroupableRelatableTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -64,6 +66,7 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
@@ -113,7 +116,7 @@ public class PlainAttrs extends
AbstractAttrs {
@Override
[syncope] branch master updated: [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new d00eec5 [SYNCOPE-1432] Topology now shows new created connectors and
resources with no need of refreshing page
d00eec5 is described below
commit d00eec5890038e9f766b8e9e03563cb57ff4779e
Author: skylark17
AuthorDate: Mon Mar 4 11:21:48 2019 +0100
[SYNCOPE-1432] Topology now shows new created connectors and resources with
no need of refreshing page
---
.../org/apache/syncope/client/console/SyncopeWebApplication.java | 4 ++--
.../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
index 7bcedf9..fad0aa9 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/SyncopeWebApplication.java
@@ -57,8 +57,8 @@ import
org.apache.wicket.authroles.authentication.AbstractAuthenticatedWebSessio
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.http.WebApplication;
+import
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.cycle.RequestCycle;
import org.apache.wicket.request.http.WebResponse;
@@ -229,7 +229,7 @@ public class SyncopeWebApplication extends
WicketBootSecuredWebApplication {
getMarkupSettings().setCompressWhitespace(true);
if (BooleanUtils.toBoolean(csrf)) {
-getRequestCycleListeners().add(new
CsrfPreventionRequestCycleListener());
+getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener());
}
getRequestCycleListeners().add(new
SyncopeConsoleRequestCycleListener());
getRequestCycleListeners().add(new IRequestCycleListener() {
diff --git
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 0ecb7dd..bd783b8 100644
---
a/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++
b/client/idrepo/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -172,8 +173,8 @@ public abstract class AbstractAttrs
extends WizardStep imple
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
-if
(org.apache.cxf.common.util.CollectionUtils.isEmpty(attrs.getObject())
-&&
org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) {
+if (CollectionUtils.isEmpty(attrs.getObject())
+&& CollectionUtils.isEmpty(membershipTOs.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
String.format("$('#emptyPlaceholder').append(\"%s\");
$('#attributes').hide();",
getString("attribute.empty.list";
[syncope] branch 2_0_X updated: [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 3b333a2 [SYNCOPE-1432] Topology now shows new created connectors and
resources with no need of refreshing page
3b333a2 is described below
commit 3b333a29ee2036c934d5b5529cde17469bd4a0cc
Author: skylark17
AuthorDate: Mon Mar 4 11:43:22 2019 +0100
[SYNCOPE-1432] Topology now shows new created connectors and resources with
no need of refreshing page
---
.../org/apache/syncope/client/console/SyncopeConsoleApplication.java | 4 ++--
.../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index 8a544fb..27efd58 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -60,8 +60,8 @@ import
org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.http.WebApplication;
+import
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.cycle.AbstractRequestCycleListener;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -214,7 +214,7 @@ public class SyncopeConsoleApplication extends
AuthenticatedWebApplication {
getMarkupSettings().setCompressWhitespace(true);
if (BooleanUtils.toBoolean(csrf)) {
-getRequestCycleListeners().add(new
CsrfPreventionRequestCycleListener());
+getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener());
}
getRequestCycleListeners().add(new
SyncopeConsoleRequestCycleListener());
getRequestCycleListeners().add(new AbstractRequestCycleListener() {
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 1916b17..537341c 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -176,8 +176,8 @@ public abstract class AbstractAttrs
extends WizardStep imple
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
-if
(org.apache.cxf.common.util.CollectionUtils.isEmpty(attrTOs.getObject())
-&&
org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) {
+if (CollectionUtils.isEmpty(attrTOs.getObject())
+&& CollectionUtils.isEmpty(membershipTOs.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
String.format("$('#emptyPlaceholder').append(\"%s\");
$('#attributes').hide();",
getString("attribute.empty.list";
[syncope] branch 2_1_X updated: [SYNCOPE-1432] Topology now shows new created connectors and resources with no need of refreshing page
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 09caa03 [SYNCOPE-1432] Topology now shows new created connectors and
resources with no need of refreshing page
09caa03 is described below
commit 09caa03623acb526af229a5307b79b3a7313d56d
Author: skylark17
AuthorDate: Mon Mar 4 11:21:48 2019 +0100
[SYNCOPE-1432] Topology now shows new created connectors and resources with
no need of refreshing page
---
.../org/apache/syncope/client/console/SyncopeConsoleApplication.java | 4 ++--
.../org/apache/syncope/client/console/wizards/any/AbstractAttrs.java | 5 +++--
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
index e7b2035..af3c2f3 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/SyncopeConsoleApplication.java
@@ -56,8 +56,8 @@ import
org.apache.wicket.authroles.authentication.AuthenticatedWebApplication;
import org.apache.wicket.authroles.authentication.AuthenticatedWebSession;
import
org.apache.wicket.authroles.authorization.strategies.role.metadata.MetaDataRoleAuthorizationStrategy;
import org.apache.wicket.markup.html.WebPage;
-import org.apache.wicket.protocol.http.CsrfPreventionRequestCycleListener;
import org.apache.wicket.protocol.http.WebApplication;
+import
org.apache.wicket.protocol.ws.WebSocketAwareCsrfPreventionRequestCycleListener;
import org.apache.wicket.request.cycle.IRequestCycleListener;
import org.apache.wicket.protocol.ws.api.WebSocketResponse;
import org.apache.wicket.request.cycle.RequestCycle;
@@ -206,7 +206,7 @@ public class SyncopeConsoleApplication extends
AuthenticatedWebApplication {
getMarkupSettings().setCompressWhitespace(true);
if (BooleanUtils.toBoolean(csrf)) {
-getRequestCycleListeners().add(new
CsrfPreventionRequestCycleListener());
+getRequestCycleListeners().add(new
WebSocketAwareCsrfPreventionRequestCycleListener());
}
getRequestCycleListeners().add(new
SyncopeConsoleRequestCycleListener());
getRequestCycleListeners().add(new IRequestCycleListener() {
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
index 7a315d6..fc65634 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/AbstractAttrs.java
@@ -26,6 +26,7 @@ import java.util.LinkedHashMap;
import java.util.List;
import java.util.Map;
import java.util.stream.Collectors;
+import org.apache.commons.collections4.CollectionUtils;
import org.apache.cxf.common.util.StringUtils;
import org.apache.syncope.client.console.rest.AnyTypeClassRestClient;
import org.apache.syncope.client.console.rest.GroupRestClient;
@@ -172,8 +173,8 @@ public abstract class AbstractAttrs
extends WizardStep imple
@Override
public void renderHead(final IHeaderResponse response) {
super.renderHead(response);
-if
(org.apache.cxf.common.util.CollectionUtils.isEmpty(attrTOs.getObject())
-&&
org.apache.cxf.common.util.CollectionUtils.isEmpty(membershipTOs.getObject())) {
+if (CollectionUtils.isEmpty(attrTOs.getObject())
+&& CollectionUtils.isEmpty(membershipTOs.getObject())) {
response.render(OnDomReadyHeaderItem.forScript(
String.format("$('#emptyPlaceholder').append(\"%s\");
$('#attributes').hide();",
getString("attribute.empty.list";
[syncope] branch 2_0_X updated: [SYNCOPE-1439] Fixed user membership attributes not updating from Admin Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 1631cab [SYNCOPE-1439] Fixed user membership attributes not updating
from Admin Console
new baa6d4c Merge pull request #98 from mat-ale/2_0_X
1631cab is described below
commit 1631cabcac0a1e908ace2758ce77317d4a2bd0a8
Author: Matteo Alessandroni
AuthorDate: Thu Feb 28 10:35:03 2019 +0100
[SYNCOPE-1439] Fixed user membership attributes not updating from Admin
Console
---
.../client/console/wizards/any/PlainAttrs.java | 174 +
1 file changed, 141 insertions(+), 33 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
index d7beff2..4cc07f8 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/PlainAttrs.java
@@ -18,6 +18,7 @@
*/
package org.apache.syncope.client.console.wizards.any;
+import java.io.Serializable;
import java.util.ArrayList;
import java.util.Collections;
import java.util.Date;
@@ -47,6 +48,7 @@ import org.apache.syncope.common.lib.SyncopeConstants;
import org.apache.syncope.common.lib.to.AnyObjectTO;
import org.apache.syncope.common.lib.to.AnyTO;
import org.apache.syncope.common.lib.to.AttrTO;
+import org.apache.syncope.common.lib.to.AttributableTO;
import org.apache.syncope.common.lib.to.GroupTO;
import org.apache.syncope.common.lib.to.GroupableRelatableTO;
import org.apache.syncope.common.lib.to.MembershipTO;
@@ -63,6 +65,7 @@ import org.apache.wicket.markup.html.form.IChoiceRenderer;
import org.apache.wicket.markup.html.list.ListItem;
import org.apache.wicket.markup.html.list.ListView;
import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.LoadableDetachableModel;
import org.apache.wicket.model.Model;
import org.apache.wicket.model.PropertyModel;
import org.apache.wicket.model.ResourceModel;
@@ -112,7 +115,7 @@ public class PlainAttrs extends
AbstractAttrs {
@Override
public WebMarkupContainer getPanel(final String panelId) {
-return new PlainSchemas(panelId, schemas, attrTOs);
+return new PlainSchemasOwn(panelId, schemas, attrTOs);
}
}), Model.of(0)).setOutputMarkupId(true));
@@ -133,10 +136,19 @@ public class PlainAttrs extends
AbstractAttrs {
@Override
public WebMarkupContainer getPanel(final String panelId) {
-return new PlainSchemas(
+return new PlainSchemasMemberships(
panelId,
membershipSchemas.get(membershipTO.getGroupKey()),
-new ListModel<>(getAttrsFromTO(membershipTO)));
+new LoadableDetachableModel()
{ // SYNCOPE-1439
+
+private static final long serialVersionUID =
526768546610546553L;
+
+@Override
+protected AttributableTO load() {
+return membershipTO;
+}
+
+});
}
}), Model.of(-1)).setOutputMarkupId(true));
}
@@ -363,15 +375,91 @@ public class PlainAttrs extends
AbstractAttrs {
return panel;
}
-public class PlainSchemas extends Schemas {
+protected class PlainSchemasMemberships extends
PlainSchemas {
+
+private static final long serialVersionUID = 456754923340249215L;
+
+public PlainSchemasMemberships(
+final String id,
+final Map schemas,
+final IModel attributableTO) {
+
+super(id, schemas, attributableTO);
+
+final List res = new
ArrayList<>(attributableTO.getObject().getPlainAttrs());
+Collections.sort(res, new AttrComparator());
+
+add(new ListView("schemas",
+new ListModel(res)) {
+
+private static final long serialVersionUID =
5306618783986001008L;
+
+@Override
+@SuppressWarnings({ "unchecked", "rawtypes" })
+protected void populateItem(final ListItem item) {
+final AttrTO attrTO = item.getModelObject();
+
+AbstractFieldPanel panel =
getFieldPanel(schemas.get(attrTO.getSchema()));
+if (mode == AjaxWizard.Mode.TEMPLATE
+||
!schemas.get(attrTO.getSchema()).isMultivalue()) {
+
+
[syncope] branch master updated: [SYNCOPE-1437] Fixed error while searching for users / groups / any objects with Elasticsearch when no data are present
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new f3db2f0 [SYNCOPE-1437] Fixed error while searching for users / groups
/ any objects with Elasticsearch when no data are present
f3db2f0 is described below
commit f3db2f09a6c3814e2b797856f25664a59bfbed34
Author: skylark17
AuthorDate: Wed Feb 20 11:39:46 2019 +0100
[SYNCOPE-1437] Fixed error while searching for users / groups / any objects
with Elasticsearch when no data are present
---
.../persistence/jpa/dao/ElasticsearchAnySearchDAO.java | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
index 58fd9a9..bf8490f 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.syncope.common.lib.SyncopeClientException;
@@ -64,6 +65,7 @@ import org.elasticsearch.index.query.DisMaxQueryBuilder;
import org.elasticsearch.index.query.MatchNoneQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.search.sort.SortBuilder;
@@ -201,14 +203,17 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
(page <= 0 ? 0 : page - 1),
(itemsPerPage < 0 ?
elasticsearchUtils.getIndexMaxResultWindow() : itemsPerPage),
sortBuilders(kind, orderBy));
+
+SearchHit[] esResult = null;
try {
-return buildResult(Stream.of(client.search(request,
RequestOptions.DEFAULT).getHits().getHits()).
-map(hit -> hit.getId()).collect(Collectors.toList()),
-kind);
-} catch (IOException e) {
-LOG.error("Search error", e);
-return Collections.emptyList();
+esResult = client.search(request,
RequestOptions.DEFAULT).getHits().getHits();
+} catch (Exception e) {
+LOG.error("While searching in Elasticsearch", e);
}
+
+return ArrayUtils.isEmpty(esResult)
+? Collections.emptyList()
+: buildResult(Stream.of(esResult).map(hit ->
hit.getId()).collect(Collectors.toList()), kind);
}
private QueryBuilder getQueryBuilder(final SearchCond cond, final
AnyTypeKind kind) {
[syncope] branch 2_1_X updated: [SYNCOPE-1437] Fixed error while searching for users / groups / any objects with Elasticsearch when no data are present
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new b57e1ce [SYNCOPE-1437] Fixed error while searching for users / groups
/ any objects with Elasticsearch when no data are present
b57e1ce is described below
commit b57e1cee216cf7cadd76841b2c756119c2f79d35
Author: skylark17
AuthorDate: Wed Feb 20 11:39:46 2019 +0100
[SYNCOPE-1437] Fixed error while searching for users / groups / any objects
with Elasticsearch when no data are present
---
.../persistence/jpa/dao/ElasticsearchAnySearchDAO.java | 17 +++--
1 file changed, 11 insertions(+), 6 deletions(-)
diff --git
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
index 58fd9a9..bf8490f 100644
---
a/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
+++
b/ext/elasticsearch/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/dao/ElasticsearchAnySearchDAO.java
@@ -27,6 +27,7 @@ import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
import java.util.stream.Stream;
+import org.apache.commons.lang3.ArrayUtils;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.commons.lang3.tuple.Triple;
import org.apache.syncope.common.lib.SyncopeClientException;
@@ -64,6 +65,7 @@ import org.elasticsearch.index.query.DisMaxQueryBuilder;
import org.elasticsearch.index.query.MatchNoneQueryBuilder;
import org.elasticsearch.index.query.QueryBuilder;
import org.elasticsearch.index.query.QueryBuilders;
+import org.elasticsearch.search.SearchHit;
import org.elasticsearch.search.builder.SearchSourceBuilder;
import org.elasticsearch.search.sort.FieldSortBuilder;
import org.elasticsearch.search.sort.SortBuilder;
@@ -201,14 +203,17 @@ public class ElasticsearchAnySearchDAO extends
AbstractAnySearchDAO {
(page <= 0 ? 0 : page - 1),
(itemsPerPage < 0 ?
elasticsearchUtils.getIndexMaxResultWindow() : itemsPerPage),
sortBuilders(kind, orderBy));
+
+SearchHit[] esResult = null;
try {
-return buildResult(Stream.of(client.search(request,
RequestOptions.DEFAULT).getHits().getHits()).
-map(hit -> hit.getId()).collect(Collectors.toList()),
-kind);
-} catch (IOException e) {
-LOG.error("Search error", e);
-return Collections.emptyList();
+esResult = client.search(request,
RequestOptions.DEFAULT).getHits().getHits();
+} catch (Exception e) {
+LOG.error("While searching in Elasticsearch", e);
}
+
+return ArrayUtils.isEmpty(esResult)
+? Collections.emptyList()
+: buildResult(Stream.of(esResult).map(hit ->
hit.getId()).collect(Collectors.toList()), kind);
}
private QueryBuilder getQueryBuilder(final SearchCond cond, final
AnyTypeKind kind) {
[syncope] branch 2_0_X updated: Update and improvement for Connector and Resource history comparison
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new b1aa52e Update and improvement for Connector and Resource history
comparison
b1aa52e is described below
commit b1aa52e3bdb2d44615e339072cfaa82bda8464e3
Author: skylark17
AuthorDate: Tue Feb 5 17:52:37 2019 +0100
Update and improvement for Connector and Resource history comparison
---
.../org/apache/syncope/client/console/panels/HistoryConfDetails.java | 3 ++-
pom.xml| 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
index 00d95b3..dbd27a8 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
@@ -29,6 +29,7 @@ import org.apache.commons.collections4.IterableUtils;
import org.apache.commons.collections4.Predicate;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.ConnectorRestClient;
import org.apache.syncope.client.console.rest.ResourceRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -205,7 +206,7 @@ public class HistoryConfDetails extends Multileve
}
});
dropdownElem.setNullValid(true);
-dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
diff --git a/pom.xml b/pom.xml
index 092efd6..dca05d0 100644
--- a/pom.xml
+++ b/pom.xml
@@ -463,7 +463,7 @@ under the License.
2.0.1
9.8.0
5.40.2
-20121119-1
+895a9512bb
2.0.7
1.0.2
[syncope] branch master updated: [SYNCOPE-1431] Fixed Connector and Resource history comparison
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 58976e0 [SYNCOPE-1431] Fixed Connector and Resource history comparison
58976e0 is described below
commit 58976e0280a4e47584d0f9cb8235676c92851d02
Author: skylark17
AuthorDate: Tue Feb 5 17:24:40 2019 +0100
[SYNCOPE-1431] Fixed Connector and Resource history comparison
---
.../org/apache/syncope/client/console/panels/HistoryConfDetails.java | 5 +++--
pom.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
index 7afb0c6..d5a06f4 100644
---
a/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
+++
b/client/idm/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.ConnectorRestClient;
import org.apache.syncope.client.console.rest.ResourceRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -65,7 +66,7 @@ public class HistoryConfDetails extends Multileve
// remove selected conf from list
this.availableHistoryConfTOs = availableHistoryConfTOs.stream().
-filter(object ->
object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
+filter(object ->
!object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
this.selectedHistoryConfTO = selectedHistoryConfTO;
// add current conf to list
@@ -193,7 +194,7 @@ public class HistoryConfDetails extends Multileve
}
});
dropdownElem.setNullValid(true);
-dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
diff --git a/pom.xml b/pom.xml
index 04f9f87..2bdd558 100644
--- a/pom.xml
+++ b/pom.xml
@@ -462,7 +462,7 @@ under the License.
2.0.1
9.8.0
5.41.0
-20121119-1
+895a9512bb
2.0.7
1.0.2
[syncope] branch 2_1_X updated: [SYNCOPE-1431] Fixed Connector and Resource history comparison
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 9e70f49 [SYNCOPE-1431] Fixed Connector and Resource history comparison
9e70f49 is described below
commit 9e70f4950d30981a1a85f2c7220a2a9993a3328b
Author: skylark17
AuthorDate: Tue Feb 5 17:24:40 2019 +0100
[SYNCOPE-1431] Fixed Connector and Resource history comparison
---
.../org/apache/syncope/client/console/panels/HistoryConfDetails.java | 5 +++--
pom.xml | 2 +-
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
index 7afb0c6..d5a06f4 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/HistoryConfDetails.java
@@ -27,6 +27,7 @@ import java.util.Map;
import java.util.stream.Collectors;
import org.apache.commons.lang3.tuple.Pair;
import org.apache.syncope.client.console.SyncopeConsoleSession;
+import org.apache.syncope.client.console.commons.Constants;
import org.apache.syncope.client.console.rest.ConnectorRestClient;
import org.apache.syncope.client.console.rest.ResourceRestClient;
import
org.apache.syncope.client.console.wicket.markup.html.bootstrap.dialog.BaseModal;
@@ -65,7 +66,7 @@ public class HistoryConfDetails extends Multileve
// remove selected conf from list
this.availableHistoryConfTOs = availableHistoryConfTOs.stream().
-filter(object ->
object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
+filter(object ->
!object.getKey().equals(selectedHistoryConfTO.getKey())).collect(Collectors.toList());
this.selectedHistoryConfTO = selectedHistoryConfTO;
// add current conf to list
@@ -193,7 +194,7 @@ public class HistoryConfDetails extends Multileve
}
});
dropdownElem.setNullValid(true);
-dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior("onchange") {
+dropdownElem.getField().add(new
AjaxFormComponentUpdatingBehavior(Constants.ON_CHANGE) {
private static final long serialVersionUID = -1107858522700306810L;
diff --git a/pom.xml b/pom.xml
index 48d59e9..74a2b54 100644
--- a/pom.xml
+++ b/pom.xml
@@ -458,7 +458,7 @@ under the License.
2.0.1
9.8.0
5.41.0
-20121119-1
+895a9512bb
2.0.7
1.0.2
[syncope] branch master updated: [SYNCOPE-1394] Added unclaim capability for user requests
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new f000afa [SYNCOPE-1394] Added unclaim capability for user requests
f000afa is described below
commit f000afa7e15cafb5f7fc26bd5332b34e602c4f6c
Author: skylark17
AuthorDate: Fri Nov 30 10:15:16 2018 +0100
[SYNCOPE-1394] Added unclaim capability for user requests
---
.../wicket/markup/html/form/ActionLink.java| 1 +
.../wicket/markup/html/form/ActionPanel.properties | 4 ++
.../panels/UserRequestFormDirectoryPanel.java | 36 +++-
.../client/console/rest/UserRequestRestClient.java | 4 ++
.../client/console/pages/UserRequests.properties | 3 +-
.../console/pages/UserRequests_it.properties | 3 +-
.../console/pages/UserRequests_ja.properties | 3 +-
.../console/pages/UserRequests_pt_BR.properties| 3 +-
.../console/pages/UserRequests_ru.properties | 3 +-
.../widgets/UserRequestFormsWidget.properties | 2 +-
.../widgets/UserRequestFormsWidget_it.properties | 2 +-
.../widgets/UserRequestFormsWidget_ja.properties | 2 +-
.../UserRequestFormsWidget_pt_BR.properties| 2 +-
.../widgets/UserRequestFormsWidget_ru.properties | 2 +-
.../syncope/common/lib/to/UserRequestForm.java | 10 ++--
.../common/lib/types/FlowableEntitlement.java | 2 +
.../core/flowable/api/UserRequestHandler.java | 8 +++
.../flowable/impl/FlowableUserRequestHandler.java | 42 +++---
.../syncope/core/logic/UserRequestLogic.java | 9 +++
.../rest/api/service/UserRequestService.java | 14 -
.../rest/cxf/service/UserRequestServiceImpl.java | 5 ++
.../apache/syncope/fit/core/UserSelfITCase.java| 66 +++---
22 files changed, 192 insertions(+), 34 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index 7f8ade0..dd53e21 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -68,6 +68,7 @@ public abstract class ActionLink
implements Serializable
REQUEST_PASSWORD_RESET("update"),
DRYRUN("execute"),
CLAIM("claim"),
+UNCLAIM("unclaim"),
SELECT("read"),
CLOSE("read"),
EXPORT("read"),
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
index af1d580..698e4cc 100644
---
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
+++
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
@@ -142,6 +142,10 @@ claim.class=fa fa-ticket
claim.title=claim
claim.alt=claim icon
+unclaim.class=fa fa-undo
+unclaim.title=unclaim
+unclaim.alt=unclaim icon
+
select.class=glyphicon glyphicon-ok
select.title=select
select.alt=select icon
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
index bf82896..c6b254b 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
@@ -132,7 +132,7 @@ public class UserRequestFormDirectoryPanel
columns.add(new DatePropertyColumn<>(
new ResourceModel("dueDate"), "dueDate", "dueDate"));
columns.add(new PropertyColumn<>(
-new ResourceModel("owner"), "owner", "owner"));
+new ResourceModel("assignee"), "assignee", "assignee"));
return columns;
}
@@ -152,10 +152,32 @@ public class UserRequestFormDirectoryPanel
((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(target);
target.add(container);
}
+
}, ActionLink.ActionType.CLAIM,
FlowableEntitlement.USER_REQUEST_FORM_CLAIM);
panel.add(new ActionLink() {
+private static final long serialVersionUID = -44963134243982134
[syncope] branch 2_1_X updated: [SYNCOPE-1394] Added unclaim capability for user requests
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new 83bc0ec [SYNCOPE-1394] Added unclaim capability for user requests
83bc0ec is described below
commit 83bc0ec2428e91f36d6d261e6369bcf5ddd92604
Author: skylark17
AuthorDate: Fri Nov 30 10:15:16 2018 +0100
[SYNCOPE-1394] Added unclaim capability for user requests
---
.../wicket/markup/html/form/ActionLink.java| 1 +
.../wicket/markup/html/form/ActionPanel.properties | 4 ++
.../panels/UserRequestFormDirectoryPanel.java | 36 +++-
.../client/console/rest/UserRequestRestClient.java | 4 ++
.../client/console/pages/UserRequests.properties | 3 +-
.../console/pages/UserRequests_it.properties | 3 +-
.../console/pages/UserRequests_ja.properties | 3 +-
.../console/pages/UserRequests_pt_BR.properties| 3 +-
.../console/pages/UserRequests_ru.properties | 3 +-
.../widgets/UserRequestFormsWidget.properties | 2 +-
.../widgets/UserRequestFormsWidget_it.properties | 2 +-
.../widgets/UserRequestFormsWidget_ja.properties | 2 +-
.../UserRequestFormsWidget_pt_BR.properties| 2 +-
.../widgets/UserRequestFormsWidget_ru.properties | 2 +-
.../syncope/common/lib/to/UserRequestForm.java | 10 ++--
.../common/lib/types/FlowableEntitlement.java | 2 +
.../core/flowable/api/UserRequestHandler.java | 8 +++
.../flowable/impl/FlowableUserRequestHandler.java | 42 +++---
.../syncope/core/logic/UserRequestLogic.java | 9 +++
.../rest/api/service/UserRequestService.java | 14 -
.../rest/cxf/service/UserRequestServiceImpl.java | 5 ++
.../apache/syncope/fit/core/UserSelfITCase.java| 66 +++---
22 files changed, 192 insertions(+), 34 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
index 7f8ade0..dd53e21 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wicket/markup/html/form/ActionLink.java
@@ -68,6 +68,7 @@ public abstract class ActionLink
implements Serializable
REQUEST_PASSWORD_RESET("update"),
DRYRUN("execute"),
CLAIM("claim"),
+UNCLAIM("unclaim"),
SELECT("read"),
CLOSE("read"),
EXPORT("read"),
diff --git
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
index af1d580..698e4cc 100644
---
a/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
+++
b/client/console/src/main/resources/org/apache/syncope/client/console/wicket/markup/html/form/ActionPanel.properties
@@ -142,6 +142,10 @@ claim.class=fa fa-ticket
claim.title=claim
claim.alt=claim icon
+unclaim.class=fa fa-undo
+unclaim.title=unclaim
+unclaim.alt=unclaim icon
+
select.class=glyphicon glyphicon-ok
select.title=select
select.alt=select icon
diff --git
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
index bf82896..c6b254b 100644
---
a/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
+++
b/ext/flowable/client-console/src/main/java/org/apache/syncope/client/console/panels/UserRequestFormDirectoryPanel.java
@@ -132,7 +132,7 @@ public class UserRequestFormDirectoryPanel
columns.add(new DatePropertyColumn<>(
new ResourceModel("dueDate"), "dueDate", "dueDate"));
columns.add(new PropertyColumn<>(
-new ResourceModel("owner"), "owner", "owner"));
+new ResourceModel("assignee"), "assignee", "assignee"));
return columns;
}
@@ -152,10 +152,32 @@ public class UserRequestFormDirectoryPanel
((BasePage)
pageRef.getPage()).getNotificationPanel().refresh(target);
target.add(container);
}
+
}, ActionLink.ActionType.CLAIM,
FlowableEntitlement.USER_REQUEST_FORM_CLAIM);
panel.add(new ActionLink() {
+private static final long serialVersionUID = -4496313424398213416L;
+
+
[syncope] branch 2_0_X updated: [SYNCOPE-1394] Fix old sorted query
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new d0f48df [SYNCOPE-1394] Fix old sorted query
d0f48df is described below
commit d0f48df73e2bfbcf32a65c0dd21a3ed288b1e584
Author: skylark17
AuthorDate: Thu Nov 29 17:24:21 2018 +0100
[SYNCOPE-1394] Fix old sorted query
---
.../syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java | 4 ++--
.../syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java | 4 ++--
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git
a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
index f85fdf6..0953276 100644
---
a/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
+++
b/core/workflow-activiti/src/main/java/org/apache/syncope/core/workflow/activiti/ActivitiUserWorkflowAdapter.java
@@ -674,8 +674,8 @@ public class ActivitiUserWorkflowAdapter extends
AbstractUserWorkflowAdapter {
sortedQuery = sortedQuery.orderByTaskDueDate();
break;
-case "owner":
-sortedQuery = sortedQuery.orderByTaskOwner();
+case "assignee":
+sortedQuery = sortedQuery.orderByTaskAssignee();
break;
default:
diff --git
a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
index d8d2221..872c816 100644
---
a/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
+++
b/core/workflow-flowable/src/main/java/org/apache/syncope/core/workflow/flowable/FlowableUserWorkflowAdapter.java
@@ -673,8 +673,8 @@ public class FlowableUserWorkflowAdapter extends
AbstractUserWorkflowAdapter {
sortedQuery = sortedQuery.orderByTaskDueDate();
break;
-case "owner":
-sortedQuery = sortedQuery.orderByTaskOwner();
+case "assignee":
+sortedQuery = sortedQuery.orderByTaskAssignee();
break;
default:
[syncope] branch master updated: [SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin when creating a new element
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new cb6ca74 [SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin
when creating a new element
cb6ca74 is described below
commit cb6ca74b20e7a80a80d033a0c32e4b9bdfb33861
Author: skylark17
AuthorDate: Wed Nov 28 09:54:34 2018 +0100
[SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin when creating
a new element
---
.../syncope/ide/netbeans/ConnectionParams.java | 4 +
.../syncope/ide/netbeans/ResourceConnector.java| 4 +-
.../service/ImplementationManagerService.java | 12 +-
.../view/ResourceExplorerTopComponent.java | 324 +++--
4 files changed, 177 insertions(+), 167 deletions(-)
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
index f280bbb..5d4391e 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
@@ -29,7 +29,9 @@ public final class ConnectionParams {
public static final class Builder {
private String scheme;
+
private String host;
+
private String port;
private String username;
@@ -43,10 +45,12 @@ public final class ConnectionParams {
this.scheme = value;
return this;
}
+
public Builder host(final String value) {
this.host = value;
return this;
}
+
public Builder port(final String value) {
this.port = value;
return this;
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
index 51df938..92bf881 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
@@ -33,7 +33,7 @@ public final class ResourceConnector {
private static ReportTemplateManagerService
REPORT_TEMPLATE_MANAGER_SERVICE;
- private static ImplementationManagerService
IMPLEMENTATION_MANAGER_SERVICE;
+private static ImplementationManagerService IMPLEMENTATION_MANAGER_SERVICE;
private static final Object MAIL_TEMPLATE_MONITOR = new Object();
@@ -76,7 +76,7 @@ public final class ResourceConnector {
}
return IMPLEMENTATION_MANAGER_SERVICE;
}
-
+
public static ConnectionParams getConnectionParams() {
Preferences prefs =
NbPreferences.forModule(ResourceExplorerTopComponent.class);
return ConnectionParams.builder()
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
index b2ccfb8..b8f7621 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
@@ -28,18 +28,18 @@ import
org.apache.syncope.common.rest.api.service.ImplementationService;
public class ImplementationManagerService {
-private final ImplementationService service ;
+private final ImplementationService service;
public ImplementationManagerService(final String url, final String
userName, final String password) {
SyncopeClient syncopeClient = new
SyncopeClientFactoryBean().setAddress(url).create(userName, password);
service = syncopeClient.getService(ImplementationService.class);
}
-
+
public List list(final ImplementationType type) {
return service.list(type);
-}
+}
-public ImplementationTO read(final ImplementationType type , final String
key) {
+public ImplementationTO read(final ImplementationType type, final String
key) {
return service.read(type, key);
}
@@ -47,11 +47,11 @@ public class ImplementationManagerService {
return Response.Status.CREATED.getStatusCode() ==
service.create(implementationTO).getStatus();
}
-public boolean delete(final ImplementationType type , final String key) {
+public boolean delete(final ImplementationType type, final String key) {
return Response.Status.NO_CONTENT.getStatusCode() ==
service.delete(type, key).getStatus();
}
public boolean update(final ImplementationTO implementationTO) {
- return Response.Status.NO_CONTENT.getStatusCode() ==
service.update(implementationTO).getStatus();
+return
[syncope] branch 2_1_X updated: [SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin when creating a new element
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new d2fa6e8 [SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin
when creating a new element
d2fa6e8 is described below
commit d2fa6e8d9dc2d824024b57b381f4bd3d12d82bb5
Author: skylark17
AuthorDate: Wed Nov 28 09:54:34 2018 +0100
[SYNCOPE-1404] Fix dialog not closing in Netbeans ide plugin when creating
a new element
---
.../syncope/ide/netbeans/ConnectionParams.java | 4 +
.../syncope/ide/netbeans/ResourceConnector.java| 4 +-
.../service/ImplementationManagerService.java | 12 +-
.../view/ResourceExplorerTopComponent.java | 324 +++--
4 files changed, 177 insertions(+), 167 deletions(-)
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
index f280bbb..5d4391e 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ConnectionParams.java
@@ -29,7 +29,9 @@ public final class ConnectionParams {
public static final class Builder {
private String scheme;
+
private String host;
+
private String port;
private String username;
@@ -43,10 +45,12 @@ public final class ConnectionParams {
this.scheme = value;
return this;
}
+
public Builder host(final String value) {
this.host = value;
return this;
}
+
public Builder port(final String value) {
this.port = value;
return this;
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
index 51df938..92bf881 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/ResourceConnector.java
@@ -33,7 +33,7 @@ public final class ResourceConnector {
private static ReportTemplateManagerService
REPORT_TEMPLATE_MANAGER_SERVICE;
- private static ImplementationManagerService
IMPLEMENTATION_MANAGER_SERVICE;
+private static ImplementationManagerService IMPLEMENTATION_MANAGER_SERVICE;
private static final Object MAIL_TEMPLATE_MONITOR = new Object();
@@ -76,7 +76,7 @@ public final class ResourceConnector {
}
return IMPLEMENTATION_MANAGER_SERVICE;
}
-
+
public static ConnectionParams getConnectionParams() {
Preferences prefs =
NbPreferences.forModule(ResourceExplorerTopComponent.class);
return ConnectionParams.builder()
diff --git
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
index b2ccfb8..b8f7621 100644
---
a/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
+++
b/ide/netbeans/src/main/java/org/apache/syncope/ide/netbeans/service/ImplementationManagerService.java
@@ -28,18 +28,18 @@ import
org.apache.syncope.common.rest.api.service.ImplementationService;
public class ImplementationManagerService {
-private final ImplementationService service ;
+private final ImplementationService service;
public ImplementationManagerService(final String url, final String
userName, final String password) {
SyncopeClient syncopeClient = new
SyncopeClientFactoryBean().setAddress(url).create(userName, password);
service = syncopeClient.getService(ImplementationService.class);
}
-
+
public List list(final ImplementationType type) {
return service.list(type);
-}
+}
-public ImplementationTO read(final ImplementationType type , final String
key) {
+public ImplementationTO read(final ImplementationType type, final String
key) {
return service.read(type, key);
}
@@ -47,11 +47,11 @@ public class ImplementationManagerService {
return Response.Status.CREATED.getStatusCode() ==
service.create(implementationTO).getStatus();
}
-public boolean delete(final ImplementationType type , final String key) {
+public boolean delete(final ImplementationType type, final String key) {
return Response.Status.NO_CONTENT.getStatusCode() ==
service.delete(type, key).getStatus();
}
public boolean update(final ImplementationTO implementationTO) {
- return Response.Status.NO_CONTENT.getStatusCode() ==
service.update(implementationTO).getStatus();
+return
[syncope] branch 2_1_X updated: [SYNCOPE-1368] Added some accessibility features to Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new d7274b8 [SYNCOPE-1368] Added some accessibility features to Console
d7274b8 is described below
commit d7274b88361abe6a86412bcc8059de627e89da8f
Author: skylark17
AuthorDate: Fri Nov 23 17:20:42 2018 +0100
[SYNCOPE-1368] Added some accessibility features to Console
---
.../syncope/client/console/panels/AnyPanel.java| 2 +-
.../client/console/wizards/any/UserDetails.java| 2 +-
.../META-INF/resources/css/accessibility.css | 44 +++
.../css/accessibility/accessibilityFont.css| 101 +++
.../css/accessibility/accessibilityHC.css | 296 +
.../META-INF/resources/js/accessibility.js | 228
.../syncope/client/console/pages/BasePage.html | 32 ++-
.../apache/syncope/client/console/pages/Login.html | 21 +-
.../markup/html/bootstrap/dialog/BaseModal.html| 2 +-
.../asciidoc/images/accessibility-console01.png| Bin 0 -> 39423 bytes
...lity-enduser02.png => accessibility-icon01.png} | Bin
...lity-enduser03.png => accessibility-icon02.png} | Bin
.../reference-guide/architecture/architecture.adoc | 53 +++-
13 files changed, 773 insertions(+), 8 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 12ec331..cd62839 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -127,7 +127,7 @@ public class AnyPanel extends Panel implements ModalPanel {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index e2c5495..6fbd21a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -103,7 +103,7 @@ public class UserDetails extends Details {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
new file mode 100644
index 000..21b9201
--- /dev/null
+++ b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+.control-sidebar-menu a:focus {
+ outline: 1px #949494 solid;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
new file mode 100644
index 000..da26456
--- /dev/null
+++
b/client/console/src
[syncope] branch master updated: [SYNCOPE-1368] Added some accessibility features to Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 2aada69 [SYNCOPE-1368] Added some accessibility features to Console
2aada69 is described below
commit 2aada690f7b58523cdfd0cdd87c0b3e462049db5
Author: skylark17
AuthorDate: Fri Nov 23 17:20:42 2018 +0100
[SYNCOPE-1368] Added some accessibility features to Console
---
.../syncope/client/console/panels/AnyPanel.java| 2 +-
.../client/console/wizards/any/UserDetails.java| 2 +-
.../META-INF/resources/css/accessibility.css | 44 +++
.../css/accessibility/accessibilityFont.css| 101 +++
.../css/accessibility/accessibilityHC.css | 296 +
.../META-INF/resources/js/accessibility.js | 228
.../syncope/client/console/pages/BasePage.html | 32 ++-
.../apache/syncope/client/console/pages/Login.html | 21 +-
.../markup/html/bootstrap/dialog/BaseModal.html| 2 +-
.../asciidoc/images/accessibility-console01.png| Bin 0 -> 39423 bytes
...lity-enduser02.png => accessibility-icon01.png} | Bin
...lity-enduser03.png => accessibility-icon02.png} | Bin
.../reference-guide/architecture/architecture.adoc | 53 +++-
13 files changed, 773 insertions(+), 8 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 12ec331..cd62839 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -127,7 +127,7 @@ public class AnyPanel extends Panel implements ModalPanel {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index e2c5495..6fbd21a 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -103,7 +103,7 @@ public class UserDetails extends Details {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
new file mode 100644
index 000..21b9201
--- /dev/null
+++ b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+.control-sidebar-menu a:focus {
+ outline: 1px #949494 solid;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
new file mode 100644
index 000..da26456
--- /dev/null
+++
b/client/console/src
[syncope] branch 2_0_X updated: [SYNCOPE-1368] Added some accessibility features to Console
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new 4606009 [SYNCOPE-1368] Added some accessibility features to Console
4606009 is described below
commit 4606009fd91eb4fc97bfab9587fdecbd48c6eed5
Author: skylark17
AuthorDate: Fri Nov 23 17:20:42 2018 +0100
[SYNCOPE-1368] Added some accessibility features to Console
---
.../syncope/client/console/panels/AnyPanel.java| 2 +-
.../client/console/wizards/any/UserDetails.java| 2 +-
.../META-INF/resources/css/accessibility.css | 44 +++
.../css/accessibility/accessibilityFont.css| 101 +++
.../css/accessibility/accessibilityHC.css | 296 +
.../META-INF/resources/js/accessibility.js | 228
.../syncope/client/console/pages/BasePage.html | 32 ++-
.../apache/syncope/client/console/pages/Login.html | 21 +-
.../markup/html/bootstrap/dialog/BaseModal.html| 2 +-
.../asciidoc/images/accessibility-console01.png| Bin 0 -> 39423 bytes
...lity-enduser02.png => accessibility-icon01.png} | Bin
...lity-enduser03.png => accessibility-icon02.png} | Bin
.../reference-guide/architecture/architecture.adoc | 53 +++-
13 files changed, 773 insertions(+), 8 deletions(-)
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
index 12ec331..cd62839 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/panels/AnyPanel.java
@@ -127,7 +127,7 @@ public class AnyPanel extends Panel implements ModalPanel {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
index 75ddac8..9bc048d 100644
---
a/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
+++
b/client/console/src/main/java/org/apache/syncope/client/console/wizards/any/UserDetails.java
@@ -104,7 +104,7 @@ public class UserDetails extends Details {
@Override
protected void onComponentTag(final ComponentTag tag) {
super.onComponentTag(tag);
-tag.put("style", "color: #337ab7 !important");
+tag.put("style", "color: #337ab7");
}
@Override
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
new file mode 100644
index 000..21b9201
--- /dev/null
+++ b/client/console/src/main/resources/META-INF/resources/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+.control-sidebar-menu a:focus {
+ outline: 1px #949494 solid;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
diff --git
a/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
b/client/console/src/main/resources/META-INF/resources/css/accessibility/accessibilityFont.css
new file mode 100644
index 000..da26456
--- /dev/null
+++
b/client/console/src
[syncope] branch master updated: [SYNCOPE-1399] Small fix on documentation
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch master in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/master by this push: new ec29492 [SYNCOPE-1399] Small fix on documentation ec29492 is described below commit ec294925415c9fc58e81c74551d28176245e76e0 Author: skylark17 AuthorDate: Tue Nov 20 18:09:10 2018 +0100 [SYNCOPE-1399] Small fix on documentation --- .../reference-guide/workingwithapachesyncope/customization.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc index 1c4ec41..2324890 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc @@ -478,7 +478,7 @@ with classpath*:/coreContext.xml -classpath*:/elasticsearchClientContext.xml +classpath:/elasticsearchClientContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml classpath*:/restCXFContext.xml
[syncope] branch master updated: [SYNCOPE-1399] Added fix for Elasticsearch v6.x
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 85fe179 [SYNCOPE-1399] Added fix for Elasticsearch v6.x
85fe179 is described below
commit 85fe179ec541685e28b83cea55cec2b9341a50c3
Author: skylark17
AuthorDate: Tue Nov 20 18:00:24 2018 +0100
[SYNCOPE-1399] Added fix for Elasticsearch v6.x
---
.../client/ElasticsearchIndexManager.java | 10 +--
.../elasticsearch/client/ElasticsearchUtils.java | 11 +++
.../jpa/dao/ElasticsearchAnySearchDAO.java | 4 +-
.../java/job/ElasticsearchReindex.java | 93 --
.../syncope/core/logic/init/ElasticsearchInit.java | 71 +
.../fit/core/reference/ITImplementationLookup.java | 38 +
.../reference-guide/concepts/notifications.adoc| 2 +-
.../workingwithapachesyncope/customization.adoc| 7 ++
8 files changed, 167 insertions(+), 69 deletions(-)
diff --git
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
index 1e34f6a..57ba53c 100644
---
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
+++
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchIndexManager.java
@@ -22,7 +22,6 @@ import java.io.IOException;
import org.apache.syncope.core.persistence.api.entity.Any;
import org.apache.syncope.core.provisioning.api.event.AnyCreatedUpdatedEvent;
import org.apache.syncope.core.provisioning.api.event.AnyDeletedEvent;
-import org.apache.syncope.core.spring.security.AuthContextUtils;
import org.elasticsearch.action.delete.DeleteResponse;
import org.elasticsearch.action.get.GetResponse;
import org.elasticsearch.action.index.IndexResponse;
@@ -48,7 +47,8 @@ public class ElasticsearchIndexManager {
@TransactionalEventListener
public void after(final AnyCreatedUpdatedEvent> event) throws
IOException {
-GetResponse getResponse =
client.prepareGet(AuthContextUtils.getDomain().toLowerCase(),
+GetResponse getResponse = client.prepareGet(
+
elasticsearchUtils.getContextDomainName(event.getAny().getType().getKind()),
event.getAny().getType().getKind().name(),
event.getAny().getKey()).
get();
@@ -56,7 +56,7 @@ public class ElasticsearchIndexManager {
LOG.debug("About to update index for {}", event.getAny());
UpdateResponse response = client.prepareUpdate(
-AuthContextUtils.getDomain().toLowerCase(),
+
elasticsearchUtils.getContextDomainName(event.getAny().getType().getKind()),
event.getAny().getType().getKind().name(),
event.getAny().getKey()).
setRetryOnConflict(elasticsearchUtils.getRetryOnConflict()).
@@ -67,7 +67,7 @@ public class ElasticsearchIndexManager {
LOG.debug("About to create index for {}", event.getAny());
IndexResponse response = client.prepareIndex(
-AuthContextUtils.getDomain().toLowerCase(),
+
elasticsearchUtils.getContextDomainName(event.getAny().getType().getKind()),
event.getAny().getType().getKind().name(),
event.getAny().getKey()).
setSource(elasticsearchUtils.builder(event.getAny())).
@@ -82,7 +82,7 @@ public class ElasticsearchIndexManager {
LOG.debug("About to delete index for {}[{}]", event.getAnyTypeKind(),
event.getAnyKey());
DeleteResponse response = client.prepareDelete(
-AuthContextUtils.getDomain().toLowerCase(),
+
elasticsearchUtils.getContextDomainName(event.getAnyTypeKind()),
event.getAnyTypeKind().name(),
event.getAnyKey()).
get();
diff --git
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
index a66f1d2..f5b69be 100644
---
a/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
+++
b/ext/elasticsearch/client-elasticsearch/src/main/java/org/apache/syncope/ext/elasticsearch/client/ElasticsearchUtils.java
@@ -24,6 +24,7 @@ import java.util.HashSet;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
+import org.apache.syncope.comm
[syncope] 01/02: Fix documentation about enabling the Elasticsearch extension
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git commit ba8338b5e95ec1f2eca33bec78e4a34cc5c53ba3 Author: skylark17 AuthorDate: Tue Nov 20 10:24:03 2018 +0100 Fix documentation about enabling the Elasticsearch extension --- src/main/asciidoc/reference-guide/concepts/notifications.adoc | 2 +- .../reference-guide/workingwithapachesyncope/customization.adoc| 7 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/asciidoc/reference-guide/concepts/notifications.adoc b/src/main/asciidoc/reference-guide/concepts/notifications.adoc index eb5653d..6d2d06f 100644 --- a/src/main/asciidoc/reference-guide/concepts/notifications.adoc +++ b/src/main/asciidoc/reference-guide/concepts/notifications.adoc @@ -65,7 +65,7 @@ An event is identified by the following five coordinates: ** `PUSH` ** `CUSTOM` . category - the possible values depend on the selected type: for `LOGIC` the <> components available, -for `TASK` the various <> Tasks configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types +for `TASK` the various <> configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types . subcategory - completes category with external resource name, when selecting `PROPAGATION`, `PULL` or `PUSH` . event type - the final identification of the event; depends on the other coordinates . success or failure - whether the current event shall be considered in case of success or failure diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc index ee7b9cf..ec40b4f 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc @@ -478,7 +478,7 @@ with classpath*:/coreContext.xml -classpath*:/elasticsearchClientContext.xml +classpath:/elasticsearchClientContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml classpath*:/restCXFContext.xml @@ -487,6 +487,11 @@ classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml +It is also required to initialize the Elasticsearch indexes. + +Create a new <>, specify the +`org.apache.syncope.core.provisioning.java.job.ElasticsearchReindex` as job delegate and execute it. + [discrete] = Enable the <> extension
[syncope] branch 2_1_X updated (e047ee8 -> 1004d00)
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a change to branch 2_1_X in repository https://gitbox.apache.org/repos/asf/syncope.git. from e047ee8 Adding explicit warning about supported Elasticsearch versions new ba8338b Fix documentation about enabling the Elasticsearch extension new 1004d00 [SYNCOPE-1399] Added fix for Elasticsearch v6.x The 2 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../client/ElasticsearchIndexManager.java | 10 +-- .../elasticsearch/client/ElasticsearchUtils.java | 11 +++ .../jpa/dao/ElasticsearchAnySearchDAO.java | 4 +- .../java/job/ElasticsearchReindex.java | 93 -- .../syncope/core/logic/init/ElasticsearchInit.java | 71 + .../fit/core/reference/ITImplementationLookup.java | 38 + .../reference-guide/concepts/notifications.adoc| 2 +- .../workingwithapachesyncope/customization.adoc| 9 ++- 8 files changed, 168 insertions(+), 70 deletions(-) create mode 100644 fit/core-reference/src/main/java/org/apache/syncope/core/logic/init/ElasticsearchInit.java
[syncope] branch 2_0_X updated: Small fix on documentation
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new cfa24d0 Small fix on documentation cfa24d0 is described below commit cfa24d0f360a56730490facb9ed9262cdf68fcca Author: skylark17 AuthorDate: Tue Nov 20 11:19:20 2018 +0100 Small fix on documentation --- src/main/asciidoc/reference-guide/concepts/notifications.adoc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/asciidoc/reference-guide/concepts/notifications.adoc b/src/main/asciidoc/reference-guide/concepts/notifications.adoc index 4e786a3..c6a9a73 100644 --- a/src/main/asciidoc/reference-guide/concepts/notifications.adoc +++ b/src/main/asciidoc/reference-guide/concepts/notifications.adoc @@ -65,7 +65,7 @@ An event is identified by the following five coordinates: ** `PUSH` ** `CUSTOM` . category - the possible values depend on the selected type: for `LOGIC` the <> components available, -for `TASK` the various <> configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types +for `TASK` the various <> configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types . subcategory - completes category with external resource name, when selecting `PROPAGATION`, `PULL` or `PUSH` . event type - the final identification of the event; depends on the other coordinates . success or failure - whether the current event shall be considered in case of success or failure
[syncope] branch 2_0_X updated: Fix documentation about enabling the Elasticsearch extension
This is an automated email from the ASF dual-hosted git repository. skylark17 pushed a commit to branch 2_0_X in repository https://gitbox.apache.org/repos/asf/syncope.git The following commit(s) were added to refs/heads/2_0_X by this push: new e9b6abb Fix documentation about enabling the Elasticsearch extension e9b6abb is described below commit e9b6abb4486ebe99889dfcf294b58bd4f360c7d2 Author: skylark17 AuthorDate: Tue Nov 20 10:24:03 2018 +0100 Fix documentation about enabling the Elasticsearch extension --- src/main/asciidoc/reference-guide/concepts/notifications.adoc | 2 +- .../reference-guide/workingwithapachesyncope/customization.adoc| 7 ++- 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/main/asciidoc/reference-guide/concepts/notifications.adoc b/src/main/asciidoc/reference-guide/concepts/notifications.adoc index 048eb32..4e786a3 100644 --- a/src/main/asciidoc/reference-guide/concepts/notifications.adoc +++ b/src/main/asciidoc/reference-guide/concepts/notifications.adoc @@ -65,7 +65,7 @@ An event is identified by the following five coordinates: ** `PUSH` ** `CUSTOM` . category - the possible values depend on the selected type: for `LOGIC` the <> components available, -for `TASK` the various <> Tasks configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types +for `TASK` the various <> configured, for `PROPAGATION`, `PULL` and `PUSH` the defined Any Types . subcategory - completes category with external resource name, when selecting `PROPAGATION`, `PULL` or `PUSH` . event type - the final identification of the event; depends on the other coordinates . success or failure - whether the current event shall be considered in case of success or failure diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc index aa4127b..f5108f9 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/customization.adoc @@ -478,7 +478,7 @@ with classpath*:/coreContext.xml -classpath*:/elasticsearchClientContext.xml +classpath:/elasticsearchClientContext.xml classpath*:/securityContext.xml classpath*:/logicContext.xml classpath*:/restCXFContext.xml @@ -487,6 +487,11 @@ classpath*:/provisioning*Context.xml classpath*:/workflow*Context.xml +It is also required to initialize the Elasticsearch indexes. + +Create a new <>, specify the +`org.apache.syncope.core.provisioning.java.job.ElasticsearchReindex` as job delegate and execute it. + [discrete] = Enable the <> extension
[syncope] branch 2_1_X updated: [SYNCOPE-1391] Fix for 'Must change password' and 'Confirm password reset' pages
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_1_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_1_X by this push:
new fd45e23 [SYNCOPE-1391] Fix for 'Must change password' and 'Confirm
password reset' pages
fd45e23 is described below
commit fd45e2338f4dda0d8fbec0f2f33e3c0ce532fc8a
Author: skylark17
AuthorDate: Mon Nov 12 15:37:35 2018 +0100
[SYNCOPE-1391] Fix for 'Must change password' and 'Confirm password reset'
pages
---
.../app/js/services/dynamicTemplateService.js | 12 ++--
.../resources/app/views/confirmpasswordreset.html | 59 +--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/mustchangepassword.html| 59 +--
.../resources/app/views/passwordreset.html | 2 +-
.../META-INF/resources/app/views/self.html | 2 +-
.../templates/confirmPasswordResetTemplate.html| 83 ++
.../templates/mustChangePasswordTemplate.html | 82 +
.../enduser/src/main/resources/customTemplate.json | 16 +
.../enduser/src/test/resources/customTemplate.json | 20 +-
.../src/main/resources/customTemplate.json | 16 +
.../src/test/resources/customTemplate.json | 16 +
.../workingwithapachesyncope/customization.adoc| 28 +++-
13 files changed, 270 insertions(+), 127 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
index b3348e0..39a06c5 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
@@ -45,17 +45,17 @@ angular.module('SyncopeEnduserApp')
};
dynTemplateService.getContent = function () {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return response.data;
}, error);
};
dynTemplateService.getGeneralAssetsContent = function (types) {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return loadAssets("generalAssets", response.data,
types);
}, error);
};
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
index 8d165f3..3fcc543 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
@@ -17,62 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
-
-
-
- {{'CONFIRM_PASSWORD_RESET'| translate}}
-
-
-
-
-
-
-
- Password reset
-
-
-
-
-
-
-
- Password
-
-
-
-
- {{'CONFIRM_PASSWORD'|
translate}}
-
-
-
-
-
-
-{{'PASSWORD_STRENGTH'| translate}}:
-{{'INSECURE'|
translate}}
-{{'ALMOSTSECURE'| translate}}
-{{'VERYGOOD'|
translate}}
-
-
-
-
-
- {{'SUBMIT'| translate}}
-
-{{'CANCEL'| translate}}
-
-
-
-
-
-
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
index 3d0d013..2cae136 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
@@ -17,5 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.ht
[syncope] branch master updated: [SYNCOPE-1391] Fix for 'Must change password' and 'Confirm password reset' pages
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/master by this push:
new 6575640 [SYNCOPE-1391] Fix for 'Must change password' and 'Confirm
password reset' pages
6575640 is described below
commit 65756405fe897eb8c0a35db2e1473bd7fb0cecdf
Author: skylark17
AuthorDate: Mon Nov 12 15:37:35 2018 +0100
[SYNCOPE-1391] Fix for 'Must change password' and 'Confirm password reset'
pages
---
.../app/js/services/dynamicTemplateService.js | 12 ++--
.../resources/app/views/confirmpasswordreset.html | 59 +--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/mustchangepassword.html| 59 +--
.../resources/app/views/passwordreset.html | 2 +-
.../META-INF/resources/app/views/self.html | 2 +-
.../templates/confirmPasswordResetTemplate.html| 83 ++
.../templates/mustChangePasswordTemplate.html | 82 +
.../enduser/src/main/resources/customTemplate.json | 16 +
.../enduser/src/test/resources/customTemplate.json | 20 +-
.../src/main/resources/customTemplate.json | 16 +
.../src/test/resources/customTemplate.json | 16 +
.../workingwithapachesyncope/customization.adoc| 28 +++-
13 files changed, 270 insertions(+), 127 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
index b3348e0..39a06c5 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
@@ -45,17 +45,17 @@ angular.module('SyncopeEnduserApp')
};
dynTemplateService.getContent = function () {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return response.data;
}, error);
};
dynTemplateService.getGeneralAssetsContent = function (types) {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return loadAssets("generalAssets", response.data,
types);
}, error);
};
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
index 8d165f3..3fcc543 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
@@ -17,62 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
-
-
-
- {{'CONFIRM_PASSWORD_RESET'| translate}}
-
-
-
-
-
-
-
- Password reset
-
-
-
-
-
-
-
- Password
-
-
-
-
- {{'CONFIRM_PASSWORD'|
translate}}
-
-
-
-
-
-
-{{'PASSWORD_STRENGTH'| translate}}:
-{{'INSECURE'|
translate}}
-{{'ALMOSTSECURE'| translate}}
-{{'VERYGOOD'|
translate}}
-
-
-
-
-
- {{'SUBMIT'| translate}}
-
-{{'CANCEL'| translate}}
-
-
-
-
-
-
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
index 3d0d013..2cae136 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
@@ -17,5 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.ht
[syncope] branch 2_0_X updated: [SYNCOPE-1019] Fix for 'Must change password' and 'Confirm password reset' pages
This is an automated email from the ASF dual-hosted git repository.
skylark17 pushed a commit to branch 2_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git
The following commit(s) were added to refs/heads/2_0_X by this push:
new f9d2598 [SYNCOPE-1019] Fix for 'Must change password' and 'Confirm
password reset' pages
f9d2598 is described below
commit f9d25987170336a941a42acfe287a61653c52bc1
Author: skylark17
AuthorDate: Mon Nov 12 15:37:35 2018 +0100
[SYNCOPE-1019] Fix for 'Must change password' and 'Confirm password reset'
pages
---
.../app/js/services/dynamicTemplateService.js | 12 ++--
.../resources/app/views/confirmpasswordreset.html | 59 +--
.../META-INF/resources/app/views/editUser.html | 2 +-
.../resources/app/views/mustchangepassword.html| 59 +--
.../resources/app/views/passwordreset.html | 2 +-
.../META-INF/resources/app/views/self.html | 2 +-
.../templates/confirmPasswordResetTemplate.html| 83 ++
.../templates/mustChangePasswordTemplate.html | 82 +
.../enduser/src/main/resources/customTemplate.json | 16 +
.../enduser/src/test/resources/customTemplate.json | 20 +-
.../src/main/resources/customTemplate.json | 16 +
.../src/test/resources/customTemplate.json | 16 +
.../workingwithapachesyncope/customization.adoc| 28 +++-
13 files changed, 270 insertions(+), 127 deletions(-)
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
index b3348e0..39a06c5 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
+++
b/client/enduser/src/main/resources/META-INF/resources/app/js/services/dynamicTemplateService.js
@@ -45,17 +45,17 @@ angular.module('SyncopeEnduserApp')
};
dynTemplateService.getContent = function () {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return response.data;
}, error);
};
dynTemplateService.getGeneralAssetsContent = function (types) {
- return $http
- .get(dynTemplateUrl)
- .then(function (response) {
+ return $http.
+ get(dynTemplateUrl).
+ then(function (response) {
return loadAssets("generalAssets", response.data,
types);
}, error);
};
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
index 8d165f3..3fcc543 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
@@ -17,62 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
-
-
-
-
-
- {{'CONFIRM_PASSWORD_RESET'| translate}}
-
-
-
-
-
-
-
- Password reset
-
-
-
-
-
-
-
- Password
-
-
-
-
- {{'CONFIRM_PASSWORD'|
translate}}
-
-
-
-
-
-
-{{'PASSWORD_STRENGTH'| translate}}:
-{{'INSECURE'|
translate}}
-{{'ALMOSTSECURE'| translate}}
-{{'VERYGOOD'|
translate}}
-
-
-
-
-
- {{'SUBMIT'| translate}}
-
-{{'CANCEL'| translate}}
-
-
-
-
-
-
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
index 3d0d013..2cae136 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/editUser.html
@@ -17,5 +17,5 @@ specific language governing permissions and limitations
under the License.
-->
-
+
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/mustchangepassword.ht
syncope git commit: [SYNCOPE-1379] Added documentation about new check connection timeout parameters
Repository: syncope Updated Branches: refs/heads/master 3c3c00877 -> 7cd359731 [SYNCOPE-1379] Added documentation about new check connection timeout parameters Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/7cd35973 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/7cd35973 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/7cd35973 Branch: refs/heads/master Commit: 7cd3597312c342c2ed3dad86f6222b0281d31342 Parents: 3c3c008 Author: skylark17 Authored: Thu Oct 11 16:05:50 2018 +0200 Committer: skylark17 Committed: Thu Oct 11 16:09:22 2018 +0200 -- .../configurationparameters.adoc | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/7cd35973/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc index 7ba4a4d..e25d31d 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc @@ -53,6 +53,23 @@ Suspended Users are anyway not allowed to authenticate. * `connector.conf.history.size` - how many previous configurations shall be kept for each Connector Instance, for usage with <>; * `resource.conf.history.size` - how many previous configurations shall be kept for each External Resource, -for usage with <>. +for usage with <>; +* `connector.test.timeout` - timeout (in seconds) for testing connector connection in <>. +A value of `0` means there will be no timeout; + +[NOTE] + +This parameter is useful to avoid waiting for the default connector timeout, by setting a shorter value; +or to completely disable connector connection testing. + + +* `resource.test.timeout` - timeout (in seconds) for testing resource connection in <>. +A value of `0` means there will be no timeout. + +[NOTE] + +This parameter is useful to avoid waiting for the default resource timeout, by setting a shorter value; +or to completely disable resource connection testing. + Besides this default set, new configuration parameters can be defined to support <> code.
syncope git commit: [SYNCOPE-1379] Added documentation about new check connection timeout parameters
Repository: syncope Updated Branches: refs/heads/2_1_X 31595e4e7 -> 9e56cf510 [SYNCOPE-1379] Added documentation about new check connection timeout parameters Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/9e56cf51 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/9e56cf51 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/9e56cf51 Branch: refs/heads/2_1_X Commit: 9e56cf510ee55df7cb713de97610e7f680b2d705 Parents: 31595e4 Author: skylark17 Authored: Thu Oct 11 16:05:50 2018 +0200 Committer: skylark17 Committed: Thu Oct 11 16:08:41 2018 +0200 -- .../configurationparameters.adoc | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/9e56cf51/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc index 7ba4a4d..e25d31d 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc @@ -53,6 +53,23 @@ Suspended Users are anyway not allowed to authenticate. * `connector.conf.history.size` - how many previous configurations shall be kept for each Connector Instance, for usage with <>; * `resource.conf.history.size` - how many previous configurations shall be kept for each External Resource, -for usage with <>. +for usage with <>; +* `connector.test.timeout` - timeout (in seconds) for testing connector connection in <>. +A value of `0` means there will be no timeout; + +[NOTE] + +This parameter is useful to avoid waiting for the default connector timeout, by setting a shorter value; +or to completely disable connector connection testing. + + +* `resource.test.timeout` - timeout (in seconds) for testing resource connection in <>. +A value of `0` means there will be no timeout. + +[NOTE] + +This parameter is useful to avoid waiting for the default resource timeout, by setting a shorter value; +or to completely disable resource connection testing. + Besides this default set, new configuration parameters can be defined to support <> code.
syncope git commit: [SYNCOPE-1379] Added documentation about new check connection timeout parameters
Repository: syncope Updated Branches: refs/heads/2_0_X f092044c4 -> cfa980833 [SYNCOPE-1379] Added documentation about new check connection timeout parameters Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/cfa98083 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/cfa98083 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/cfa98083 Branch: refs/heads/2_0_X Commit: cfa980833a736bfee3ae027ae26bf7e2d6b4 Parents: f092044 Author: skylark17 Authored: Thu Oct 11 16:05:50 2018 +0200 Committer: skylark17 Committed: Thu Oct 11 16:05:50 2018 +0200 -- .../configurationparameters.adoc | 19 ++- 1 file changed, 18 insertions(+), 1 deletion(-) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/cfa98083/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc -- diff --git a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc index 6a8a468..9b4503e 100644 --- a/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc +++ b/src/main/asciidoc/reference-guide/workingwithapachesyncope/systemadministration/configurationparameters.adoc @@ -55,6 +55,23 @@ Suspended Users are anyway not allowed to authenticate. * `connector.conf.history.size` - how many previous configurations shall be kept for each Connector Instance, for usage with <>; * `resource.conf.history.size` - how many previous configurations shall be kept for each External Resource, -for usage with <>. +for usage with <>; +* `connector.test.timeout` - timeout (in seconds) for testing connector connection in <>. +A value of `0` means there will be no timeout; + +[NOTE] + +This parameter is useful to avoid waiting for the default connector timeout, by setting a shorter value; +or to completely disable connector connection testing. + + +* `resource.test.timeout` - timeout (in seconds) for testing resource connection in <>. +A value of `0` means there will be no timeout. + +[NOTE] + +This parameter is useful to avoid waiting for the default resource timeout, by setting a shorter value; +or to completely disable resource connection testing. + Besides this default set, new configuration parameters can be defined to support <> code.
syncope git commit: [SYNCOPE-1367] Added documentation about Enduser accessibility
Repository: syncope Updated Branches: refs/heads/master a2bb602c4 -> 59a36b775 [SYNCOPE-1367] Added documentation about Enduser accessibility Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/59a36b77 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/59a36b77 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/59a36b77 Branch: refs/heads/master Commit: 59a36b775a4957480c9089f7a5aae0299671dfdd Parents: a2bb602 Author: skylark17 Authored: Thu Oct 4 17:30:54 2018 +0200 Committer: skylark17 Committed: Thu Oct 4 17:45:53 2018 +0200 -- .../asciidoc/images/accessibility-enduser01.png | Bin 0 -> 22466 bytes .../asciidoc/images/accessibility-enduser02.png | Bin 0 -> 852 bytes .../asciidoc/images/accessibility-enduser03.png | Bin 0 -> 866 bytes .../architecture/architecture.adoc | 49 +++ 4 files changed, 49 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/59a36b77/src/main/asciidoc/images/accessibility-enduser01.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser01.png b/src/main/asciidoc/images/accessibility-enduser01.png new file mode 100644 index 000..5ed2303 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser01.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/59a36b77/src/main/asciidoc/images/accessibility-enduser02.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser02.png b/src/main/asciidoc/images/accessibility-enduser02.png new file mode 100644 index 000..57241f6 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser02.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/59a36b77/src/main/asciidoc/images/accessibility-enduser03.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser03.png b/src/main/asciidoc/images/accessibility-enduser03.png new file mode 100644 index 000..5c230ea Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser03.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/59a36b77/src/main/asciidoc/reference-guide/architecture/architecture.adoc -- diff --git a/src/main/asciidoc/reference-guide/architecture/architecture.adoc b/src/main/asciidoc/reference-guide/architecture/architecture.adoc index b183e08..90dd618 100644 --- a/src/main/asciidoc/reference-guide/architecture/architecture.adoc +++ b/src/main/asciidoc/reference-guide/architecture/architecture.adoc @@ -43,6 +43,55 @@ The End-user UI is the web-based application for self-registration, self-service The communication between End-user UI and Core is exclusively REST-based. + Accessibility + +The End-user UI is accessible to the visually impaired. + +Two icons are present in the main page, in the right corner: + +[.text-center] +image::accessibility-enduser01.png[title="Enduser accessibility icons",alt="Enduser accessibility icons"] + +By clicking the top right corner icon image:accessibility-enduser02.png[Accessibility HC mode,30,30] it is possible to +toggle the "High contrast mode". +In this mode, the website colors are switched to a higher contrast color schema. + +[TIP] + +The `H` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "High contrast mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `H` +|Toggle "High contrast mode" on Firefox and Chrome browsers on Linux +|=== + + + +By clicking the second icon image:accessibility-enduser03.png[Accessibility HC mode,30,30] it is possible +to toggle the "Increased font mode". +In this mode, the website font size is increased. + +[TIP] + +The `F` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "Increased font mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `F` +|Toggle "Increased font mode" on Firefox and Chrome browsers on Linux +|=== + + + +To reset to the default mode, it is enough to click again on the specific icon. + [[cli-component]] === CLI
syncope git commit: [SYNCOPE-1367] Added documentation about Enduser accessibility
Repository: syncope Updated Branches: refs/heads/2_1_X b653b0033 -> c99a99ece [SYNCOPE-1367] Added documentation about Enduser accessibility Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/c99a99ec Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/c99a99ec Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/c99a99ec Branch: refs/heads/2_1_X Commit: c99a99ece984e4d582b44bd08b15c8ae5c849c4a Parents: b653b00 Author: skylark17 Authored: Thu Oct 4 17:30:54 2018 +0200 Committer: skylark17 Committed: Thu Oct 4 17:42:13 2018 +0200 -- .../asciidoc/images/accessibility-enduser01.png | Bin 0 -> 22466 bytes .../asciidoc/images/accessibility-enduser02.png | Bin 0 -> 852 bytes .../asciidoc/images/accessibility-enduser03.png | Bin 0 -> 866 bytes .../architecture/architecture.adoc | 49 +++ 4 files changed, 49 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/c99a99ec/src/main/asciidoc/images/accessibility-enduser01.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser01.png b/src/main/asciidoc/images/accessibility-enduser01.png new file mode 100644 index 000..5ed2303 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser01.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/c99a99ec/src/main/asciidoc/images/accessibility-enduser02.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser02.png b/src/main/asciidoc/images/accessibility-enduser02.png new file mode 100644 index 000..57241f6 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser02.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/c99a99ec/src/main/asciidoc/images/accessibility-enduser03.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser03.png b/src/main/asciidoc/images/accessibility-enduser03.png new file mode 100644 index 000..5c230ea Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser03.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/c99a99ec/src/main/asciidoc/reference-guide/architecture/architecture.adoc -- diff --git a/src/main/asciidoc/reference-guide/architecture/architecture.adoc b/src/main/asciidoc/reference-guide/architecture/architecture.adoc index b183e08..90dd618 100644 --- a/src/main/asciidoc/reference-guide/architecture/architecture.adoc +++ b/src/main/asciidoc/reference-guide/architecture/architecture.adoc @@ -43,6 +43,55 @@ The End-user UI is the web-based application for self-registration, self-service The communication between End-user UI and Core is exclusively REST-based. + Accessibility + +The End-user UI is accessible to the visually impaired. + +Two icons are present in the main page, in the right corner: + +[.text-center] +image::accessibility-enduser01.png[title="Enduser accessibility icons",alt="Enduser accessibility icons"] + +By clicking the top right corner icon image:accessibility-enduser02.png[Accessibility HC mode,30,30] it is possible to +toggle the "High contrast mode". +In this mode, the website colors are switched to a higher contrast color schema. + +[TIP] + +The `H` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "High contrast mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `H` +|Toggle "High contrast mode" on Firefox and Chrome browsers on Linux +|=== + + + +By clicking the second icon image:accessibility-enduser03.png[Accessibility HC mode,30,30] it is possible +to toggle the "Increased font mode". +In this mode, the website font size is increased. + +[TIP] + +The `F` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "Increased font mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `F` +|Toggle "Increased font mode" on Firefox and Chrome browsers on Linux +|=== + + + +To reset to the default mode, it is enough to click again on the specific icon. + [[cli-component]] === CLI
syncope git commit: [SYNCOPE-1367] Added documentation about Enduser accessibility
Repository: syncope Updated Branches: refs/heads/2_0_X c8204d3b0 -> 09b37dd19 [SYNCOPE-1367] Added documentation about Enduser accessibility Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/09b37dd1 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/09b37dd1 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/09b37dd1 Branch: refs/heads/2_0_X Commit: 09b37dd1982e6128753265b6158094b7bd9cd919 Parents: c8204d3 Author: skylark17 Authored: Thu Oct 4 17:30:54 2018 +0200 Committer: skylark17 Committed: Thu Oct 4 17:33:07 2018 +0200 -- .../asciidoc/images/accessibility-enduser01.png | Bin 0 -> 22466 bytes .../asciidoc/images/accessibility-enduser02.png | Bin 0 -> 852 bytes .../asciidoc/images/accessibility-enduser03.png | Bin 0 -> 866 bytes .../architecture/architecture.adoc | 49 +++ 4 files changed, 49 insertions(+) -- http://git-wip-us.apache.org/repos/asf/syncope/blob/09b37dd1/src/main/asciidoc/images/accessibility-enduser01.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser01.png b/src/main/asciidoc/images/accessibility-enduser01.png new file mode 100644 index 000..5ed2303 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser01.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/09b37dd1/src/main/asciidoc/images/accessibility-enduser02.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser02.png b/src/main/asciidoc/images/accessibility-enduser02.png new file mode 100644 index 000..57241f6 Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser02.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/09b37dd1/src/main/asciidoc/images/accessibility-enduser03.png -- diff --git a/src/main/asciidoc/images/accessibility-enduser03.png b/src/main/asciidoc/images/accessibility-enduser03.png new file mode 100644 index 000..5c230ea Binary files /dev/null and b/src/main/asciidoc/images/accessibility-enduser03.png differ http://git-wip-us.apache.org/repos/asf/syncope/blob/09b37dd1/src/main/asciidoc/reference-guide/architecture/architecture.adoc -- diff --git a/src/main/asciidoc/reference-guide/architecture/architecture.adoc b/src/main/asciidoc/reference-guide/architecture/architecture.adoc index 0ba26d3..0570540 100644 --- a/src/main/asciidoc/reference-guide/architecture/architecture.adoc +++ b/src/main/asciidoc/reference-guide/architecture/architecture.adoc @@ -43,6 +43,55 @@ The End-user UI is the web-based application for self-registration, self-service The communication between End-user UI and Core is exclusively REST-based. + Accessibility + +The End-user UI is accessible to the visually impaired. + +Two icons are present in the main page, in the right corner: + +[.text-center] +image::accessibility-enduser01.png[title="Enduser accessibility icons",alt="Enduser accessibility icons"] + +By clicking the top right corner icon image:accessibility-enduser02.png[Accessibility HC mode,30,30] it is possible to +toggle the "High contrast mode". +In this mode, the website colors are switched to a higher contrast color schema. + +[TIP] + +The `H` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "High contrast mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `H` +|Toggle "High contrast mode" on Firefox and Chrome browsers on Linux +|=== + + + +By clicking the second icon image:accessibility-enduser03.png[Accessibility HC mode,30,30] it is possible +to toggle the "Increased font mode". +In this mode, the website font size is increased. + +[TIP] + +The `F` https://developer.mozilla.org/en-US/docs/Web/HTML/Global_attributes/accesskey[accesskey^] shortcut can +be used to easily toggle "Increased font mode" by using the keyboard. + +E.g. +|=== +|Shortcut |Purpose + +|`Alt` + `Shift` + `F` +|Toggle "Increased font mode" on Firefox and Chrome browsers on Linux +|=== + + + +To reset to the default mode, it is enough to click again on the specific icon. + [[cli-component]] === CLI
syncope git commit: [SYNCOPE-1367] Added some accessibility features to Enduser
Repository: syncope
Updated Branches:
refs/heads/master da9186869 -> fba9bce62
[SYNCOPE-1367] Added some accessibility features to Enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/fba9bce6
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/fba9bce6
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/fba9bce6
Branch: refs/heads/master
Commit: fba9bce622df4eab6229f1adb4bc3e3fea738935
Parents: da91868
Author: skylark17
Authored: Mon Oct 1 16:56:13 2018 +0200
Committer: skylark17
Committed: Mon Oct 1 17:30:24 2018 +0200
--
client/enduser/pom.xml | 4 +
.../resources/app/css/accessibility.css | 44 ++
.../app/css/accessibility/accessibilityFont.css | 78 ++
.../app/css/accessibility/accessibilityHC.css | 150 +++
.../META-INF/resources/app/css/editUser.css | 8 +-
.../META-INF/resources/app/css/init.css | 22 +++
.../resources/META-INF/resources/app/index.html | 34 -
.../resources/META-INF/resources/app/js/app.js | 11 +-
.../js/controllers/AccessibilityController.js | 89 +++
.../js/directives/navigationButtonsPartial.js | 5 +-
.../resources/app/js/directives/ngEnter.js | 39 +
.../resources/app/js/util/assetsManager.js | 16 +-
.../app/views/navigationButtonsPartial.html | 9 +-
.../app/views/templates/editUserTemplate.html | 5 +-
.../views/templates/passwordresetTemplate.html | 9 +-
.../resources/app/views/user-credentials.html | 5 +-
.../app/views/user-derived-schemas.html | 5 +-
.../resources/app/views/user-form-finish.html | 6 +-
.../resources/app/views/user-groups.html| 5 +-
.../resources/app/views/user-plain-schemas.html | 5 +-
.../resources/app/views/user-resources.html | 5 +-
.../app/views/user-virtual-schemas.html | 5 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
pom.xml | 7 +-
27 files changed, 530 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/fba9bce6/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index bd5bf1a..5af92a8 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -118,6 +118,10 @@ under the License.
org.webjars
kendo-ui-core
+
+ org.webjars.bowergithub.angular
+ bower-angular-aria
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/fba9bce6/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
new file mode 100644
index 000..04c57a5
--- /dev/null
+++
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#accessibility {
+ display: block;
+}
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/fba9bce6/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
b/client/enduser/src/main/resou
syncope git commit: [SYNCOPE-1367] Added some accessibility features to Enduser
Repository: syncope
Updated Branches:
refs/heads/2_1_X 54e528b89 -> 35d46cfe3
[SYNCOPE-1367] Added some accessibility features to Enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/35d46cfe
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/35d46cfe
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/35d46cfe
Branch: refs/heads/2_1_X
Commit: 35d46cfe3985976a609b8f1d2293de2245ba3c92
Parents: 54e528b
Author: skylark17
Authored: Mon Oct 1 16:56:13 2018 +0200
Committer: skylark17
Committed: Mon Oct 1 17:30:02 2018 +0200
--
client/enduser/pom.xml | 4 +
.../resources/app/css/accessibility.css | 44 ++
.../app/css/accessibility/accessibilityFont.css | 78 ++
.../app/css/accessibility/accessibilityHC.css | 150 +++
.../META-INF/resources/app/css/editUser.css | 8 +-
.../META-INF/resources/app/css/init.css | 22 +++
.../resources/META-INF/resources/app/index.html | 34 -
.../resources/META-INF/resources/app/js/app.js | 11 +-
.../js/controllers/AccessibilityController.js | 89 +++
.../js/directives/navigationButtonsPartial.js | 5 +-
.../resources/app/js/directives/ngEnter.js | 39 +
.../resources/app/js/util/assetsManager.js | 16 +-
.../app/views/navigationButtonsPartial.html | 9 +-
.../app/views/templates/editUserTemplate.html | 5 +-
.../views/templates/passwordresetTemplate.html | 9 +-
.../resources/app/views/user-credentials.html | 5 +-
.../app/views/user-derived-schemas.html | 5 +-
.../resources/app/views/user-form-finish.html | 6 +-
.../resources/app/views/user-groups.html| 5 +-
.../resources/app/views/user-plain-schemas.html | 5 +-
.../resources/app/views/user-resources.html | 5 +-
.../app/views/user-virtual-schemas.html | 5 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
pom.xml | 7 +-
27 files changed, 530 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/35d46cfe/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index b8a824a..7b6e971 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -118,6 +118,10 @@ under the License.
org.webjars
kendo-ui-core
+
+ org.webjars.bowergithub.angular
+ bower-angular-aria
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/35d46cfe/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
new file mode 100644
index 000..04c57a5
--- /dev/null
+++
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#accessibility {
+ display: block;
+}
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/35d46cfe/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
b/client/enduser/src/main/resou
syncope git commit: [SYNCOPE-1367] Added some accessibility features to Enduser
Repository: syncope
Updated Branches:
refs/heads/2_0_X 0e73508a2 -> 3285cc036
[SYNCOPE-1367] Added some accessibility features to Enduser
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/3285cc03
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/3285cc03
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/3285cc03
Branch: refs/heads/2_0_X
Commit: 3285cc036e94028fd7219d16d1ca35f25ab5e322
Parents: 0e73508
Author: skylark17
Authored: Mon Oct 1 16:56:13 2018 +0200
Committer: skylark17
Committed: Mon Oct 1 16:56:13 2018 +0200
--
client/enduser/pom.xml | 4 +
.../resources/app/css/accessibility.css | 44 ++
.../app/css/accessibility/accessibilityFont.css | 78 ++
.../app/css/accessibility/accessibilityHC.css | 150 +++
.../META-INF/resources/app/css/editUser.css | 8 +-
.../META-INF/resources/app/css/init.css | 22 +++
.../resources/META-INF/resources/app/index.html | 34 -
.../resources/META-INF/resources/app/js/app.js | 11 +-
.../js/controllers/AccessibilityController.js | 89 +++
.../js/directives/navigationButtonsPartial.js | 5 +-
.../resources/app/js/directives/ngEnter.js | 39 +
.../resources/app/js/util/assetsManager.js | 16 +-
.../app/views/navigationButtonsPartial.html | 9 +-
.../app/views/templates/editUserTemplate.html | 5 +-
.../views/templates/passwordresetTemplate.html | 9 +-
.../resources/app/views/user-credentials.html | 5 +-
.../app/views/user-derived-schemas.html | 5 +-
.../resources/app/views/user-form-finish.html | 6 +-
.../resources/app/views/user-groups.html| 5 +-
.../resources/app/views/user-plain-schemas.html | 5 +-
.../resources/app/views/user-resources.html | 5 +-
.../app/views/user-virtual-schemas.html | 5 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
.../src/main/resources/customTemplate.json | 3 +-
.../src/test/resources/customTemplate.json | 3 +-
pom.xml | 7 +-
27 files changed, 530 insertions(+), 48 deletions(-)
--
http://git-wip-us.apache.org/repos/asf/syncope/blob/3285cc03/client/enduser/pom.xml
--
diff --git a/client/enduser/pom.xml b/client/enduser/pom.xml
index 78be32c..8f92084 100644
--- a/client/enduser/pom.xml
+++ b/client/enduser/pom.xml
@@ -118,6 +118,10 @@ under the License.
org.webjars
kendo-ui-core
+
+ org.webjars.bowergithub.angular
+ bower-angular-aria
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/3285cc03/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
new file mode 100644
index 000..04c57a5
--- /dev/null
+++
b/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility.css
@@ -0,0 +1,44 @@
+/*
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
+*/
+
+#accessibility {
+ display: block;
+}
+
+.btn-accessibility {
+ position: absolute;
+ right: 0;
+ font-size: 12px;
+ padding: 15px 15px 0 0;
+}
+
+.btn-accessibility i {
+ font-size: 30px;
+}
+
+.btn-accessibility:hover {
+ cursor:pointer;
+}
+
+#change_contrast {
+ top: 0;
+}
+#change_fontSize {
+ top: 40px;
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/3285cc03/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/accessibility/accessibilityFont.css
b/client/enduser/src/main/resou
[3/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index ec5baca..41ba63c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,6 +17,8 @@ specific language governing permissions and limitations
under the License.
*/
+/* Default style
+=
*/
* {
box-sizing: border-box;
}
@@ -27,6 +29,7 @@ under the License.
margin-top:-4px;
margin: 0 auto;
text-align: center;
+ background-color: #F7F7F7;
}
#form-container .breadcrumb-header{
@@ -35,20 +38,23 @@ under the License.
padding:10px;
}
-#form-container .page-header { background: -moz-linear-gradient(top, #a9db80
0%, #96c56f 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left
top, left bottom, color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*
Chrome,Safari4+ */
- background: -webkit-linear-gradient(top,
#a9db80 0%,#96c56f 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80
0%,#96c56f 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #a9db80
0%,#96c56f 100%); /* IE10+ */
- margin: 1% 9%;
- width: 83%; padding:10px;
- /* shadows and rounded borders */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
- -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
- -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
- box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+#form-container .page-header {
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
+ background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
+ margin: 1% 9%;
+ width: 83%; padding:10px;
+ /* shadows and rounded borders */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ text-align: left;
+ font-weight: 700;
}
.signup-form {
@@ -93,79 +99,41 @@ under the License.
list-style: none;
}
-#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
- background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
- display: inline-block;
- color: black;
- padding-left: 8px;
- padding-right: 8px;
- margin-left: 5px;
-}
-
-#previous:hover {
- background: #658D5D;
-}
-
-#next{
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
+#next,
+#previous,
+#save,
+#finish {
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+*/
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
display: inline-block;
- margin-left: 5px;
+
padding-left: 8px;
padding-right: 8px;
- float: right;
+ margin-left: 5px;
+ border: none;
color: black;
}
+#save:hover,
+#previous:hover,
+#finish:hover,
#next:hover {
background: #658D5D;
}
-#save{
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+*/
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
- background:
[1/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
Repository: syncope
Updated Branches:
refs/heads/master e1972f84a -> f9937e77b
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/test/resources/customFormAttributes.json
--
diff --git a/client/enduser/src/test/resources/customFormAttributes.json
b/client/enduser/src/test/resources/customFormAttributes.json
new file mode 100644
index 000..18112ef
--- /dev/null
+++ b/client/enduser/src/test/resources/customFormAttributes.json
@@ -0,0 +1,44 @@
+{
+ "PLAIN":
+ {
+"attributes": {
+ "firstname": {
+"readonly": true,
+"defaultValues": ["defaultFirstname"]
+ },
+ "surname": {
+"readonly": false,
+"defaultValues": []
+ },
+ "fullname": {
+"readonly": false
+ },
+ "userId": {
+"readonly": false
+ },
+ "loginDate": {
+"readonly": false
+ },
+ "additional#loginDate": {
+"readonly": false
+ },
+ "additional#ctype": {
+"readonly": false,
+"defaultValues": ["ctypeDefault"]
+ },
+ "additional#cool": {
+"readonly": false,
+"defaultValues": ["true"]
+ }
+}
+ },
+ "VIRTUAL":
+ {
+"attributes": {
+ "virtualdata": {
+"readonly": true,
+"defaultValues": ["defaultVirtualData"]
+ }
+}
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/test/resources/customTemplate.json
--
diff --git a/client/enduser/src/test/resources/customTemplate.json
b/client/enduser/src/test/resources/customTemplate.json
new file mode 100644
index 000..0636b31
--- /dev/null
+++ b/client/enduser/src/test/resources/customTemplate.json
@@ -0,0 +1,56 @@
+{
+ "templates":
+ {
+"login":
+{
+ "templateUrl": "views/templates/selfTemplate.html",
+ "css": [
+"css/login.css",
+"css/templates/dark/login.css"
+ ]
+},
+
+"edit_user":
+{
+ "templateUrl":
"views/templates/onlyPlainAttrsDetails/editUserTemplate.html",
+ "css": [
+"css/editUser.css",
+"css/templates/dark/editUser.css"
+ ]
+},
+
+"password_reset":
+{
+ "templateUrl":
"views/templates/passwordresetTemplate.html",
+ "css": [
+"css/editUser.css",
+"css/passwordReset.css",
+"css/templates/dark/editUser.css"
+ ]
+}
+ },
+
+ "generalAssets":
+ {
+"css": [
+ "css/app.css",
+ "css/notification.css"
+]
+ },
+
+ "wizard":
+ {
+"firstStep": "plainSchemas",
+"steps": {
+ "plainSchemas": {
+"url": "/plainSchemas"
+ },
+ "credentials": {
+"url": "/credentials"
+ },
+ "finish": {
+"url": "/finish"
+ }
+}
+ }
+}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/deb/enduser/pom.xml
--
diff --git a/deb/enduser/pom.xml b/deb/enduser/pom.xml
index d7bec8a..b037724 100644
--- a/deb/enduser/pom.xml
+++ b/deb/enduser/pom.xml
@@ -97,7 +97,8 @@ under the License.
${project.basedir}/../../client/enduser/src/main/resources
enduser.properties
- customForm.json
+ customFormAttributes.json
+ customTemplate.json
${project.build.directory}/etc
true
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/deb/enduser/src/deb/control/conffiles
--
diff --git a/deb/enduser/src/deb/control/conffiles
b/deb/enduser/src/deb/control/conffiles
index 8fb2453..d115b8e 100644
--- a/deb/enduser/src/deb/control/conffiles
+++ b/deb/enduser/src/deb/control/conffiles
@@ -1,6 +1,7 @@
/etc/tomcat8/Catalina/localhost/syncope-enduser.xml
/etc/apache-syncope/enduser.properties
-/etc/apache-syncope/customForm.json
[2/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
index 70a94a9..8d165f3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
@@ -17,25 +17,26 @@ specific language governing permissions and limitations
under the License.
-->
-
+
-
+
-
+
{{'CONFIRM_PASSWORD_RESET'| translate}}
-
-
+
+
- Password
reset
+ Password reset
-
+
@@ -45,7 +46,8 @@ under the License.
{{'CONFIRM_PASSWORD'|
translate}}
-
@@ -53,16 +55,18 @@ under the License.
{{'PASSWORD_STRENGTH'| translate}}:
-{{'INSECURE' |
translate}}
+{{'INSECURE'|
translate}}
{{'ALMOSTSECURE'| translate}}
{{'VERYGOOD'|
translate}}
-
+
- {{'SUBMIT'| translate}}
-
+ {{'SUBMIT'| translate}}
+
{{'CANCEL'| translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
index fed3678..1454521 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
@@ -17,30 +17,35 @@ specific language governing permissions and limitations
under the License.
-->
-
+
+ class="breadcrumb-header panel panel-default">
+
-{{derSchema.labels[language] ||
derSchema.simpleKey}} *
+{{derSchema.labels[language] ||
derSchema.simpleKey}}
+ *
+
+
-
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
index e7b5bcc..c6b5042 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
@@ -26,7 +26,7 @@ under the License.
-
+ ng-disabled="schema.readonly || customReadonly(schema.key)"
ng-init="initAttribute(schema, index)"
+ name="{{schema.key}}"/>
-
-
-
-
-
+
+
+
+
-
-
+
-
+
-
+
+
+
+
+
+
-
-
+ k-ng-model="selectedDate"
+ data-k-format="languageFormat"
+ />
+
-
-
-
-
+
+
+
+{{enumerationKeys[$index]|| value}}
+
+
+
-
-
-
- {{enumerationKeys[$index]|| value}}
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ ng-init="initAttribute(schema, index)"/>
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/f9937e77/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
index 4f220aa..77554a0 100644
---
[4/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
[SYNCOPE-1019] Added dynamic templating feature to Enduser app Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/f9937e77 Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/f9937e77 Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/f9937e77 Branch: refs/heads/master Commit: f9937e77b78057f91a35d6caa46e9b1e3af832c7 Parents: e1972f8 Author: skylark17 Authored: Tue Aug 28 10:11:47 2018 +0200 Committer: skylark17 Committed: Mon Sep 10 17:47:30 2018 +0200 -- .gitignore | 1 + archetype/pom.xml | 7 +- .../archetype-resources/enduser/pom.xml | 6 +- .../syncope/client/console/pages/BasePage.html | 2 +- .../syncope/client/console/pages/Login.html | 2 +- .../console/pages/MustChangePassword.html | 2 +- client/enduser/pom.xml | 4 +- .../enduser/SyncopeEnduserApplication.java | 130 +-- .../enduser/adapters/PlatformInfoAdapter.java | 4 +- .../enduser/model/CustomAttributesInfo.java | 15 - .../client/enduser/model/CustomTemplate.java| 77 .../enduser/model/CustomTemplateInfo.java | 72 .../client/enduser/model/CustomTemplateUrl.java | 37 ++ .../enduser/model/CustomTemplateWizard.java | 49 +++ .../enduser/model/PlatformInfoRequest.java | 10 +- .../resources/DynamicTemplateResource.java | 79 .../resources/ExternalResourceResource.java | 14 +- .../client/enduser/resources/GroupResource.java | 43 ++- .../client/enduser/resources/InfoResource.java | 8 +- .../enduser/resources/SchemaResource.java | 45 ++- .../resources/UserSelfCreateResource.java | 3 +- .../enduser/resources/UserSelfReadResource.java | 15 +- .../resources/UserSelfUpdateResource.java | 7 +- .../enduser/util/UserRequestValidator.java | 29 +- .../META-INF/resources/app/css/app.css | 107 +++--- .../resources/app/css/customSpinner.css | 49 +++ .../META-INF/resources/app/css/editUser.css | 369 +++ .../META-INF/resources/app/css/login.css| 41 +-- .../META-INF/resources/app/css/notification.css | 28 ++ .../resources/app/css/passwordReset.css | 37 ++ .../app/css/templates/dark/editUser.css | 95 + .../resources/app/css/templates/dark/login.css | 78 .../resources/META-INF/resources/app/index.html | 27 +- .../resources/META-INF/resources/app/js/app.js | 158 +--- .../app/js/controllers/LoginController.js | 11 +- .../app/js/controllers/OIDCClientController.js | 4 +- .../app/js/controllers/SAML2SPController.js | 4 +- .../app/js/controllers/UserController.js| 42 ++- .../app/js/directives/dynamicPlainAttribute.js | 10 +- .../app/js/directives/dynamicTemplateItem.js| 79 .../js/directives/dynamicVirtualAttribute.js| 22 +- .../js/directives/dynamicVirtualAttributes.js | 3 +- .../resources/app/js/directives/fileInput.js| 4 +- .../app/js/directives/navigationButtons.js | 71 .../js/directives/navigationButtonsPartial.js | 71 .../app/js/services/dynamicTemplateService.js | 67 .../resources/app/js/util/assetsManager.js | 105 ++ .../META-INF/resources/app/views/captcha.html | 14 +- .../app/views/confirmpasswordreset.html | 28 +- .../app/views/dynamicDerivedAttributes.html | 19 +- .../app/views/dynamicPlainAttribute.html| 139 --- .../app/views/dynamicPlainAttributes.html | 14 +- .../app/views/dynamicVirtualAttributes.html | 18 +- .../META-INF/resources/app/views/editUser.html | 31 +- .../resources/app/views/mustchangepassword.html | 22 +- .../resources/app/views/navigationButtons.html | 26 -- .../app/views/navigationButtonsPartial.html | 29 ++ .../resources/app/views/passwordreset.html | 55 +-- .../META-INF/resources/app/views/self.html | 60 +-- .../app/views/templates/editUserTemplate.html | 57 +++ .../onlyPlainAttrsDetails/editUserTemplate.html | 57 +++ .../views/templates/passwordresetTemplate.html | 79 .../app/views/templates/selfTemplate.html | 77 .../resources/app/views/user-credentials.html | 62 ++-- .../app/views/user-derived-schemas.html | 33 +- .../resources/app/views/user-form-finish.html | 29 +- .../resources/app/views/user-groups.html| 47 ++- .../resources/app/views/user-plain-schemas.html | 35 +- .../resources/app/views/user-resources.html | 37 +- .../app/views/user-virtual-schemas.html | 33 +- .../enduser/src/main/resources/customForm.json | 1 - .../main/resources/customFormAttributes.json| 1 + .../src/main/resources/customTemplate.json | 65 .../enduser/util/UserRequestValidatorTest.java | 40
[3/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac909f2e/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
index ec5baca..41ba63c 100644
--- a/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
+++ b/client/enduser/src/main/resources/META-INF/resources/app/css/editUser.css
@@ -17,6 +17,8 @@ specific language governing permissions and limitations
under the License.
*/
+/* Default style
+=
*/
* {
box-sizing: border-box;
}
@@ -27,6 +29,7 @@ under the License.
margin-top:-4px;
margin: 0 auto;
text-align: center;
+ background-color: #F7F7F7;
}
#form-container .breadcrumb-header{
@@ -35,20 +38,23 @@ under the License.
padding:10px;
}
-#form-container .page-header { background: -moz-linear-gradient(top, #a9db80
0%, #96c56f 100%); /* FF3.6+ */
- background: -webkit-gradient(linear, left
top, left bottom, color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*
Chrome,Safari4+ */
- background: -webkit-linear-gradient(top,
#a9db80 0%,#96c56f 100%); /* Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80
0%,#96c56f 100%); /* Opera 11.10+ */
- background: -ms-linear-gradient(top, #a9db80
0%,#96c56f 100%); /* IE10+ */
- margin: 1% 9%;
- width: 83%; padding:10px;
- /* shadows and rounded borders */
- -moz-border-radius: 5px;
- -webkit-border-radius: 5px;
- border-radius: 5px;
- -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
- -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0,
0.3);
- box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+#form-container .page-header {
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /* FF3.6+ */
+ background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /* Chrome,Safari4+ */
+ background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*
Chrome10+,Safari5.1+ */
+ background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* Opera
11.10+ */
+ background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /* IE10+ */
+ margin: 1% 9%;
+ width: 83%; padding:10px;
+ /* shadows and rounded borders */
+ -moz-border-radius: 5px;
+ -webkit-border-radius: 5px;
+ border-radius: 5px;
+ -moz-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ -webkit-box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ box-shadow: 0px 2px 2px rgba(0, 0, 0, 0.3);
+ text-align: left;
+ font-weight: 700;
}
.signup-form {
@@ -93,79 +99,41 @@ under the License.
list-style: none;
}
-#previous {
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
- background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
- background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+*/
- background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+*/
- display: inline-block;
- color: black;
- padding-left: 8px;
- padding-right: 8px;
- margin-left: 5px;
-}
-
-#previous:hover {
- background: #658D5D;
-}
-
-#next{
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+ */
+#next,
+#previous,
+#save,
+#finish {
+ background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+*/
background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
background: -webkit-linear-gradient(top, #a9db80 0%,#96c56f 100%);
/*Chrome10+,Safari5.1+ */
background: -o-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*Opera
11.10+ */
background: -ms-linear-gradient(top, #a9db80 0%,#96c56f 100%); /*IE10+ */
display: inline-block;
- margin-left: 5px;
+
padding-left: 8px;
padding-right: 8px;
- float: right;
+ margin-left: 5px;
+ border: none;
color: black;
}
+#save:hover,
+#previous:hover,
+#finish:hover,
#next:hover {
background: #658D5D;
}
-#save{
- background: -moz-linear-gradient(top, #a9db80 0%, #96c56f 100%); /*FF3.6+*/
- background: -webkit-gradient(linear, left top, left bottom,
color-stop(0%,#a9db80), color-stop(100%,#96c56f)); /*Chrome,Safari4+ */
- background:
[4/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
[SYNCOPE-1019] Added dynamic templating feature to Enduser app Project: http://git-wip-us.apache.org/repos/asf/syncope/repo Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/ac909f2e Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/ac909f2e Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/ac909f2e Branch: refs/heads/2_1_X Commit: ac909f2ec079969b3860e31fc62470b493ea90eb Parents: 524c968 Author: skylark17 Authored: Tue Aug 28 10:11:47 2018 +0200 Committer: skylark17 Committed: Mon Sep 10 17:12:44 2018 +0200 -- .gitignore | 1 + archetype/pom.xml | 7 +- .../archetype-resources/enduser/pom.xml | 6 +- .../syncope/client/console/pages/BasePage.html | 2 +- .../syncope/client/console/pages/Login.html | 2 +- .../console/pages/MustChangePassword.html | 2 +- client/enduser/pom.xml | 4 +- .../enduser/SyncopeEnduserApplication.java | 130 +-- .../enduser/adapters/PlatformInfoAdapter.java | 4 +- .../enduser/model/CustomAttributesInfo.java | 15 - .../client/enduser/model/CustomTemplate.java| 77 .../enduser/model/CustomTemplateInfo.java | 72 .../client/enduser/model/CustomTemplateUrl.java | 37 ++ .../enduser/model/CustomTemplateWizard.java | 49 +++ .../enduser/model/PlatformInfoRequest.java | 10 +- .../resources/DynamicTemplateResource.java | 79 .../resources/ExternalResourceResource.java | 14 +- .../client/enduser/resources/GroupResource.java | 43 ++- .../client/enduser/resources/InfoResource.java | 8 +- .../enduser/resources/SchemaResource.java | 45 ++- .../resources/UserSelfCreateResource.java | 3 +- .../enduser/resources/UserSelfReadResource.java | 15 +- .../resources/UserSelfUpdateResource.java | 7 +- .../enduser/util/UserRequestValidator.java | 29 +- .../META-INF/resources/app/css/app.css | 107 +++--- .../resources/app/css/customSpinner.css | 49 +++ .../META-INF/resources/app/css/editUser.css | 369 +++ .../META-INF/resources/app/css/login.css| 41 +-- .../META-INF/resources/app/css/notification.css | 28 ++ .../resources/app/css/passwordReset.css | 37 ++ .../app/css/templates/dark/editUser.css | 95 + .../resources/app/css/templates/dark/login.css | 78 .../resources/META-INF/resources/app/index.html | 27 +- .../resources/META-INF/resources/app/js/app.js | 158 +--- .../app/js/controllers/LoginController.js | 11 +- .../app/js/controllers/OIDCClientController.js | 4 +- .../app/js/controllers/SAML2SPController.js | 4 +- .../app/js/controllers/UserController.js| 42 ++- .../app/js/directives/dynamicPlainAttribute.js | 10 +- .../app/js/directives/dynamicTemplateItem.js| 79 .../js/directives/dynamicVirtualAttribute.js| 22 +- .../js/directives/dynamicVirtualAttributes.js | 3 +- .../resources/app/js/directives/fileInput.js| 4 +- .../app/js/directives/navigationButtons.js | 71 .../js/directives/navigationButtonsPartial.js | 71 .../app/js/services/dynamicTemplateService.js | 67 .../resources/app/js/util/assetsManager.js | 105 ++ .../META-INF/resources/app/views/captcha.html | 14 +- .../app/views/confirmpasswordreset.html | 28 +- .../app/views/dynamicDerivedAttributes.html | 19 +- .../app/views/dynamicPlainAttribute.html| 139 --- .../app/views/dynamicPlainAttributes.html | 14 +- .../app/views/dynamicVirtualAttributes.html | 18 +- .../META-INF/resources/app/views/editUser.html | 31 +- .../resources/app/views/mustchangepassword.html | 22 +- .../resources/app/views/navigationButtons.html | 26 -- .../app/views/navigationButtonsPartial.html | 29 ++ .../resources/app/views/passwordreset.html | 55 +-- .../META-INF/resources/app/views/self.html | 60 +-- .../app/views/templates/editUserTemplate.html | 57 +++ .../onlyPlainAttrsDetails/editUserTemplate.html | 57 +++ .../views/templates/passwordresetTemplate.html | 79 .../app/views/templates/selfTemplate.html | 77 .../resources/app/views/user-credentials.html | 62 ++-- .../app/views/user-derived-schemas.html | 33 +- .../resources/app/views/user-form-finish.html | 29 +- .../resources/app/views/user-groups.html| 47 ++- .../resources/app/views/user-plain-schemas.html | 35 +- .../resources/app/views/user-resources.html | 37 +- .../app/views/user-virtual-schemas.html | 33 +- .../enduser/src/main/resources/customForm.json | 1 - .../main/resources/customFormAttributes.json| 1 + .../src/main/resources/customTemplate.json | 65 .../enduser/util/UserRequestValidatorTest.java | 40 +- .../enduser
[2/4] syncope git commit: [SYNCOPE-1019] Added dynamic templating feature to Enduser app
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac909f2e/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
index 70a94a9..8d165f3 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/confirmpasswordreset.html
@@ -17,25 +17,26 @@ specific language governing permissions and limitations
under the License.
-->
-
+
-
+
-
+
{{'CONFIRM_PASSWORD_RESET'| translate}}
-
-
+
+
- Password
reset
+ Password reset
-
+
@@ -45,7 +46,8 @@ under the License.
{{'CONFIRM_PASSWORD'|
translate}}
-
@@ -53,16 +55,18 @@ under the License.
{{'PASSWORD_STRENGTH'| translate}}:
-{{'INSECURE' |
translate}}
+{{'INSECURE'|
translate}}
{{'ALMOSTSECURE'| translate}}
{{'VERYGOOD'|
translate}}
-
+
- {{'SUBMIT'| translate}}
-
+ {{'SUBMIT'| translate}}
+
{{'CANCEL'| translate}}
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac909f2e/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
index fed3678..1454521 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicDerivedAttributes.html
@@ -17,30 +17,35 @@ specific language governing permissions and limitations
under the License.
-->
-
+
+ class="breadcrumb-header panel panel-default">
+
-{{derSchema.labels[language] ||
derSchema.simpleKey}} *
+{{derSchema.labels[language] ||
derSchema.simpleKey}}
+ *
+
+
-
-
+
-
-
+
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac909f2e/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
index e7b5bcc..c6b5042 100644
---
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
+++
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttribute.html
@@ -26,7 +26,7 @@ under the License.
-
+ ng-disabled="schema.readonly || customReadonly(schema.key)"
ng-init="initAttribute(schema, index)"
+ name="{{schema.key}}"/>
-
-
-
-
-
+
+
+
+
-
-
+
-
+
-
+
+
+
+
+
+
-
-
+ k-ng-model="selectedDate"
+ data-k-format="languageFormat"
+ />
+
-
-
-
-
+
+
+
+{{enumerationKeys[$index]|| value}}
+
+
+
-
-
-
- {{enumerationKeys[$index]|| value}}
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+ ng-init="initAttribute(schema, index)"/>
+
http://git-wip-us.apache.org/repos/asf/syncope/blob/ac909f2e/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
--
diff --git
a/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
b/client/enduser/src/main/resources/META-INF/resources/app/views/dynamicPlainAttributes.html
index 4f220aa..77554a0 100644
---
