You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2023/03/03 09:53:31 UTC

[syncope] branch 3_0_X updated: Adds the possibility to specify a logo for a ClientApp (#419)

This is an automated email from the ASF dual-hosted git repository.

ilgrosso pushed a commit to branch 3_0_X
in repository https://gitbox.apache.org/repos/asf/syncope.git


The following commit(s) were added to refs/heads/3_0_X by this push:
     new 72e712de4d Adds the possibility to specify a logo for a ClientApp (#419)
72e712de4d is described below

commit 72e712de4d706f847ddfdfb438f038cdeb154000
Author: Fabio Martelli <fa...@tirasa.net>
AuthorDate: Fri Mar 3 10:53:26 2023 +0100

    Adds the possibility to specify a logo for a ClientApp (#419)
---
 .../console/clientapps/ClientAppModalPanelBuilder.java      |  4 ++++
 .../org/apache/syncope/client/ui/commons/Constants.java     |  2 ++
 .../java/org/apache/syncope/common/lib/to/ClientAppTO.java  | 12 ++++++++++++
 .../syncope/core/persistence/api/entity/am/ClientApp.java   |  4 ++++
 .../core/persistence/jpa/entity/am/AbstractClientApp.java   | 13 +++++++++++++
 .../provisioning/java/data/ClientAppDataBinderImpl.java     |  2 ++
 .../syncope/wa/starter/mapping/AbstractClientAppMapper.java |  1 +
 7 files changed, 38 insertions(+)

diff --git a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
index 975a42d34e..6f1b1f36db 100644
--- a/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
+++ b/client/am/console/src/main/java/org/apache/syncope/client/console/clientapps/ClientAppModalPanelBuilder.java
@@ -180,6 +180,10 @@ public class ClientAppModalPanelBuilder<T extends ClientAppTO> extends AbstractM
             fields.add(new AjaxTextFieldPanel(
                     "field", Constants.DESCRIPTION_FIELD_NAME,
                     new PropertyModel<>(clientAppTO, Constants.DESCRIPTION_FIELD_NAME), false));
+            
+            fields.add(new AjaxTextFieldPanel(
+                    "field", Constants.LOGO_FIELD_NAME,
+                    new PropertyModel<>(clientAppTO, Constants.LOGO_FIELD_NAME), false));
 
             AjaxDropDownChoicePanel<String> accessPolicy = new AjaxDropDownChoicePanel<>(
                     "field", "accessPolicy", new PropertyModel<>(clientAppTO, "accessPolicy"), false);
diff --git a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
index 644ce96cdb..d8fbd16fdb 100644
--- a/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
+++ b/client/idrepo/common-ui/src/main/java/org/apache/syncope/client/ui/commons/Constants.java
@@ -47,6 +47,8 @@ public final class Constants {
 
     public static final String DESCRIPTION_FIELD_NAME = "description";
 
+    public static final String LOGO_FIELD_NAME = "logo";
+
     public static final String USERNAME_FIELD_NAME = "username";
 
     public static final String NAME_FIELD_NAME = "name";
diff --git a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
index e1daf364a0..97ae8100f9 100644
--- a/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
+++ b/common/am/lib/src/main/java/org/apache/syncope/common/lib/to/ClientAppTO.java
@@ -53,6 +53,8 @@ public abstract class ClientAppTO implements NamedEntityTO {
 
     private String description;
 
+    private String logo;
+
     private String authPolicy;
 
     private String accessPolicy;
@@ -147,6 +149,14 @@ public abstract class ClientAppTO implements NamedEntityTO {
         this.description = description;
     }
 
+    public String getLogo() {
+        return logo;
+    }
+
+    public void setLogo(final String logo) {
+        this.logo = logo;
+    }
+
     @JacksonXmlElementWrapper(localName = "properties")
     @JacksonXmlProperty(localName = "property")
     public List<Attr> getProperties() {
@@ -162,6 +172,7 @@ public abstract class ClientAppTO implements NamedEntityTO {
                 .append(clientAppId)
                 .append(name)
                 .append(description)
+                .append(logo)
                 .append(authPolicy)
                 .append(accessPolicy)
                 .append(attrReleasePolicy)
@@ -189,6 +200,7 @@ public abstract class ClientAppTO implements NamedEntityTO {
                 .append(this.clientAppId, rhs.clientAppId)
                 .append(this.name, rhs.name)
                 .append(this.description, rhs.description)
+                .append(this.logo, rhs.logo)
                 .append(this.authPolicy, rhs.authPolicy)
                 .append(this.accessPolicy, rhs.accessPolicy)
                 .append(this.attrReleasePolicy, rhs.attrReleasePolicy)
diff --git a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
index 222c4ebf4b..800f0c9923 100644
--- a/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
+++ b/core/persistence-api/src/main/java/org/apache/syncope/core/persistence/api/entity/am/ClientApp.java
@@ -40,6 +40,10 @@ public interface ClientApp extends Entity {
 
     void setDescription(String description);
 
+    String getLogo();
+
+    void setLogo(String logo);
+
     AuthPolicy getAuthPolicy();
 
     void setAuthPolicy(AuthPolicy policy);
diff --git a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
index 2241f7bc29..6895514e87 100644
--- a/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
+++ b/core/persistence-jpa/src/main/java/org/apache/syncope/core/persistence/jpa/entity/am/AbstractClientApp.java
@@ -56,6 +56,9 @@ public class AbstractClientApp extends AbstractGeneratedKeyEntity implements Cli
     @Column
     private String description;
 
+    @Column
+    private String logo;
+
     @Column
     private String theme;
 
@@ -104,6 +107,16 @@ public class AbstractClientApp extends AbstractGeneratedKeyEntity implements Cli
         this.description = description;
     }
 
+    @Override
+    public String getLogo() {
+        return logo;
+    }
+
+    @Override
+    public void setLogo(final String logo) {
+        this.logo = logo;
+    }
+
     @Override
     public JPAAuthPolicy getAuthPolicy() {
         return authPolicy;
diff --git a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
index f1db100516..a9d4fd3dcf 100644
--- a/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
+++ b/core/provisioning-java/src/main/java/org/apache/syncope/core/provisioning/java/data/ClientAppDataBinderImpl.java
@@ -155,6 +155,7 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientAppTO.setRealm(Optional.ofNullable(clientApp.getRealm()).map(Realm::getFullPath).orElse(null));
         clientAppTO.setName(clientApp.getName());
         clientAppTO.setDescription(clientApp.getDescription());
+        clientAppTO.setLogo(clientApp.getLogo());
         clientAppTO.setClientAppId(clientApp.getClientAppId());
         clientAppTO.setTheme(clientApp.getTheme());
 
@@ -268,6 +269,7 @@ public class ClientAppDataBinderImpl implements ClientAppDataBinder {
         clientApp.setName(clientAppTO.getName());
         clientApp.setClientAppId(clientAppTO.getClientAppId());
         clientApp.setDescription(clientAppTO.getDescription());
+        clientApp.setLogo(clientAppTO.getLogo());
         clientApp.setTheme(clientAppTO.getTheme());
 
         if (clientAppTO.getAuthPolicy() == null) {
diff --git a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
index f9a9685c16..37e3f1b25e 100644
--- a/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
+++ b/wa/starter/src/main/java/org/apache/syncope/wa/starter/mapping/AbstractClientAppMapper.java
@@ -36,6 +36,7 @@ abstract class AbstractClientAppMapper implements ClientAppMapper {
         service.setId(clientApp.getClientAppId());
         service.setName(clientApp.getName());
         service.setDescription(clientApp.getDescription());
+        service.setLogo(clientApp.getLogo());
 
         if (!clientApp.getProperties().isEmpty()) {
             Map<String, RegisteredServiceProperty> properties = clientApp.getProperties().stream().