From 261fad3aa121f98cd2b64e4906201addc08e5306 Mon Sep 17 00:00:00 2001
From: Enrico Vianello <enrico.vianello@cnaf.infn.it>
Date: Mon, 22 Jan 2024 20:11:27 +0100
Subject: [PATCH] Remove client logo URI from DTO and from service logic

---
 .../iam/api/client/service/ClientConverter.java |  3 ---
 .../api/common/client/RegisteredClientDTO.java  | 17 -----------------
 .../webapp/WEB-INF/views/iam/approveClient.jsp  |  3 ---
 .../othersettings/othersettings.component.html  | 10 ----------
 .../migration/h2/V99__clear_client_logo_URI.sql |  1 +
 .../mysql/V99__clear_client_logo_URI.sql        |  1 +
 6 files changed, 2 insertions(+), 33 deletions(-)
 create mode 100644 iam-persistence/src/main/resources/db/migration/h2/V99__clear_client_logo_URI.sql
 create mode 100644 iam-persistence/src/main/resources/db/migration/mysql/V99__clear_client_logo_URI.sql

diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/ClientConverter.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/ClientConverter.java
index c298dda2d..3a23f6ade 100644
--- a/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/ClientConverter.java
+++ b/iam-login-service/src/main/java/it/infn/mw/iam/api/client/service/ClientConverter.java
@@ -116,7 +116,6 @@ public RegisteredClientDTO registeredClientDtoFromEntity(ClientDetailsEntity ent
       .collect(toSet()));
 
     clientDTO.setJwksUri(entity.getJwksUri());
-    clientDTO.setLogoUri(entity.getLogoUri());
     clientDTO.setRedirectUris(cloneSet(entity.getRedirectUris()));
 
     clientDTO.setTokenEndpointAuthMethod(TokenEndpointAuthenticationMethod
@@ -139,7 +138,6 @@ public RegisteredClientDTO registeredClientDtoFromEntity(ClientDetailsEntity ent
     clientDTO.setJwksUri(entity.getJwksUri());
 
     Optional.ofNullable(entity.getJwks()).ifPresent(k -> clientDTO.setJwk(k.toString()));
-    clientDTO.setLogoUri(entity.getLogoUri());
     clientDTO.setPolicyUri(entity.getPolicyUri());
     clientDTO.setRefreshTokenValiditySeconds(entity.getRefreshTokenValiditySeconds());
 
@@ -185,7 +183,6 @@ public ClientDetailsEntity entityFromRegistrationRequest(RegisteredClientDTO dto
       client.setJwks(JWKSet.parse(dto.getJwk()));
     }
 
-    client.setLogoUri(dto.getLogoUri());
     client.setPolicyUri(dto.getPolicyUri());
     
     client.setRedirectUris(cloneSet(dto.getRedirectUris()));
diff --git a/iam-login-service/src/main/java/it/infn/mw/iam/api/common/client/RegisteredClientDTO.java b/iam-login-service/src/main/java/it/infn/mw/iam/api/common/client/RegisteredClientDTO.java
index b71f46e73..f483b27e6 100644
--- a/iam-login-service/src/main/java/it/infn/mw/iam/api/common/client/RegisteredClientDTO.java
+++ b/iam-login-service/src/main/java/it/infn/mw/iam/api/common/client/RegisteredClientDTO.java
@@ -113,15 +113,6 @@ public class RegisteredClientDTO {
       ClientViews.DynamicRegistration.class})
   private String clientUri;
 
-  @Size(max = 2048,
-      groups = {OnDynamicClientRegistration.class, OnDynamicClientUpdate.class,
-          OnClientCreation.class, OnClientUpdate.class})
-  @URL(groups = {OnDynamicClientRegistration.class, OnDynamicClientUpdate.class,
-      OnClientCreation.class, OnClientUpdate.class})
-  @JsonView({ClientViews.Full.class, ClientViews.ClientManagement.class,
-      ClientViews.DynamicRegistration.class})
-  private String logoUri;
-
   @Size(max = 2048,
       groups = {OnDynamicClientRegistration.class, OnDynamicClientUpdate.class,
           OnClientCreation.class, OnClientUpdate.class})
@@ -304,14 +295,6 @@ public void setClientUri(String clientUri) {
     this.clientUri = clientUri;
   }
 
-  public String getLogoUri() {
-    return logoUri;
-  }
-
-  public void setLogoUri(String logoUri) {
-    this.logoUri = logoUri;
-  }
-
   public String getTosUri() {
     return tosUri;
   }
diff --git a/iam-login-service/src/main/webapp/WEB-INF/views/iam/approveClient.jsp b/iam-login-service/src/main/webapp/WEB-INF/views/iam/approveClient.jsp
index 0737c9d5c..652f18eed 100644
--- a/iam-login-service/src/main/webapp/WEB-INF/views/iam/approveClient.jsp
+++ b/iam-login-service/src/main/webapp/WEB-INF/views/iam/approveClient.jsp
@@ -67,9 +67,6 @@
 					</c:otherwise>
 				</c:choose>
 			</h2>
-			<c:if test="${ not empty client.logoUri }">
-				<img src="api/clients/${ client.id }/logo" width="60" height="60" />
-			</c:if>
 
 			<c:if
 				test="${ (not empty client.clientDescription) || (not empty client.clientUri) || (not empty client.policyUri) || (not empty client.tosUri) || (not empty contacts) }">
diff --git a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/clients/client/othersettings/othersettings.component.html b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/clients/client/othersettings/othersettings.component.html
index 4e06374fb..48126bdbe 100644
--- a/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/clients/client/othersettings/othersettings.component.html
+++ b/iam-login-service/src/main/webapp/resources/iam/apps/dashboard-app/components/clients/client/othersettings/othersettings.component.html
@@ -26,16 +26,6 @@
             the consent page
         </p>
     </div>
-    <div class="form-group">
-        <label for="logo">Logo</label>
-        <input id="logo" name="logo" class="form-control" type="url" ng-model="$ctrl.client.logo_uri"
-            placeholder="https://app.example.org/logo.png">
-        <p class="help-block">
-            URL that points to a logo image,
-            will be displayed to the user in the consent
-            page
-        </p>
-    </div>
     <div class="form-group">
         <label for="tos_uri">Terms of service</label>
         <input id="tos_uri" name="tos_uri" class="form-control" type="url" ng-model="$ctrl.client.tos_uri"
diff --git a/iam-persistence/src/main/resources/db/migration/h2/V99__clear_client_logo_URI.sql b/iam-persistence/src/main/resources/db/migration/h2/V99__clear_client_logo_URI.sql
new file mode 100644
index 000000000..5fbeb3ace
--- /dev/null
+++ b/iam-persistence/src/main/resources/db/migration/h2/V99__clear_client_logo_URI.sql
@@ -0,0 +1 @@
+UPDATE client_details set logo_uri = NULL;
\ No newline at end of file
diff --git a/iam-persistence/src/main/resources/db/migration/mysql/V99__clear_client_logo_URI.sql b/iam-persistence/src/main/resources/db/migration/mysql/V99__clear_client_logo_URI.sql
new file mode 100644
index 000000000..5fbeb3ace
--- /dev/null
+++ b/iam-persistence/src/main/resources/db/migration/mysql/V99__clear_client_logo_URI.sql
@@ -0,0 +1 @@
+UPDATE client_details set logo_uri = NULL;
\ No newline at end of file