Update change logo endpoint to POST with image as form data

rest/rest-api/src/main/java/org/ow2/proactive_grid_cloud_portal/common/SchedulerRestInterface.java

@@ -3045,11 +3045,11 @@ void deleteLabel(@HeaderParam("sessionid") String sessionId, @PathParam("labelId
      *
      * @param sessionId
      *            current session
-     * @param imageData
-    *             PNG or JPEG image as a byte array
+     * @param multipart
+     *             PNG or Baseline JPEG image
      */
-    @PUT
+    @POST
     @Path("logo")
-    @Consumes(MediaType.APPLICATION_OCTET_STREAM)
-    void updateLogo(@HeaderParam("sessionid") String sessionId, byte[] imageData) throws RestException;
+    @Consumes(MediaType.MULTIPART_FORM_DATA)
+    void updateLogo(@HeaderParam("sessionid") String sessionId, MultipartFormDataInput multipart) throws RestException;
 }

rest/rest-api/src/main/java/org/ow2/proactive_grid_cloud_portal/scheduler/client/SchedulerRestClient.java

@@ -229,6 +229,35 @@ public boolean pushFile(String sessionId, String space, String path, String file
         return response.readEntity(Boolean.class);
     }
 
+    public void updateLogo(String sessionId, InputStream fileContent) throws NotConnectedRestException {
+
+        String uriTmpl = (new StringBuilder(restEndpointURL)).append(addSlashIfMissing(restEndpointURL))
+                                                             .append("scheduler/logo/")
+                                                             .toString();
+
+        ResteasyClient client = buildResteasyClient(providerFactory);
+
+        ResteasyWebTarget target = client.target(uriTmpl);
+
+        MultipartFormDataOutput formData = new MultipartFormDataOutput();
+        formData.addFormData("fileContent", fileContent, MediaType.APPLICATION_OCTET_STREAM_TYPE);
+
+        GenericEntity<MultipartFormDataOutput> entity = new GenericEntity<MultipartFormDataOutput>(formData) {
+        };
+
+        Response response = target.request()
+                                  .header("sessionid", sessionId)
+                                  .post(Entity.entity(entity, MediaType.MULTIPART_FORM_DATA_TYPE));
+
+        if (response.getStatus() != HttpURLConnection.HTTP_OK) {
+            if (response.getStatus() == HttpURLConnection.HTTP_UNAUTHORIZED) {
+                throw new NotConnectedRestException("User not authenticated or session timeout.");
+            } else {
+                throwException(String.format("Update logo failed. Status code: %d", response.getStatus()), response);
+            }
+        }
+    }
+
     public void pullFile(String sessionId, String space, String path, String outputPath) throws Exception {
         String uriTmpl = (new StringBuilder(restEndpointURL)).append(addSlashIfMissing(restEndpointURL))
                                                              .append("scheduler/dataspace/")
@@ -787,6 +816,5 @@ public void write(OutputStream outputStream) throws IOException, WebApplicationE
             }
 
         }
-
     }
 }

rest/rest-client/src/main/java/org/ow2/proactive/scheduler/rest/SchedulerClient.java

@@ -41,11 +41,7 @@
 import static org.ow2.proactive.scheduler.rest.data.DataUtility.toSchedulerUserInfos;
 import static org.ow2.proactive.scheduler.rest.data.DataUtility.toTaskResult;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.io.InputStream;
-import java.io.Serializable;
+import java.io.*;
 import java.lang.reflect.Proxy;
 import java.net.URL;
 import java.net.URLConnection;
@@ -79,6 +75,7 @@
 import org.apache.http.ssl.SSLContextBuilder;
 import org.apache.log4j.Logger;
 import org.jboss.resteasy.client.jaxrs.engines.ApacheHttpClient4Engine;
+import org.jboss.resteasy.plugins.providers.multipart.MultipartFormDataInput;
 import org.jboss.resteasy.spi.ResteasyProviderFactory;
 import org.objectweb.proactive.utils.StackTraceUtil;
 import org.ow2.proactive.authentication.ConnectionInfo;
@@ -2039,8 +2036,8 @@ public void removeJobLabels(List<String> jobIds) throws NotConnectedException, P
 
     @Override
     public void updateLogo(byte[] image) throws NotConnectedException, PermissionException {
-        try {
-            restApi().updateLogo(sid, image);
+        try (ByteArrayInputStream byteArrayInputStream = new ByteArrayInputStream(image)) {
+            restApiClient().updateLogo(sid, byteArrayInputStream);
         } catch (Exception e) {
             throwNCEOrPE(e);
         }

rest/rest-server/src/main/java/org/ow2/proactive_grid_cloud_portal/scheduler/SchedulerStateRest.java

@@ -87,6 +87,7 @@
 import org.ow2.proactive.authentication.crypto.Credentials;
 import org.ow2.proactive.db.SortOrder;
 import org.ow2.proactive.db.SortParameter;
+import org.ow2.proactive.permissions.RoleAdmin;
 import org.ow2.proactive.permissions.RoleRead;
 import org.ow2.proactive.permissions.RoleWrite;
 import org.ow2.proactive.scheduler.common.*;
@@ -3703,12 +3704,26 @@ public void deleteLabel(String sessionId, final String labelId) throws RestExcep
     }
 
     @Override
-    public void updateLogo(String sessionId, byte[] imageData) throws RestException {
+    @RoleAdmin
+    public void updateLogo(String sessionId, MultipartFormDataInput multipart) throws RestException {
+        Scheduler scheduler = checkAccess(sessionId);
         try {
-            Scheduler scheduler = checkAccess(sessionId);
-            scheduler.updateLogo(imageData);
-        } catch (SchedulerException e) {
-            throw RestException.wrapExceptionToRest(e);
+            Map<String, List<InputPart>> formDataMap = multipart.getFormDataMap();
+
+            List<InputPart> fCL = formDataMap.get("fileContent");
+            if ((fCL == null) || (fCL.isEmpty())) {
+                throw new IllegalArgumentException("Illegal multipart argument definition (fileContent), received " +
+                                                   fCL);
+            }
+
+            InputStream fileContent = fCL.get(0).getBody(InputStream.class, null);
+            scheduler.updateLogo(IOUtils.toByteArray(fileContent));
+        } catch (SchedulerException | IOException e) {
+            throw RestException.wrapExceptionToRest(new SchedulerException(e));
+        } finally {
+            if (multipart != null) {
+                multipart.close();
+            }
         }
     }
 }

scheduler/scheduler-server/src/main/java/org/ow2/proactive/scheduler/core/SchedulerFrontend.java

@@ -3003,7 +3003,7 @@ public void updateLogo(byte[] image) throws NotConnectedException, PermissionExc
                                                                      "You don't have permissions to update a new logo");
         try {
             schedulingService.updateLogo(image, ident.getUsername());
-        } catch (Exception e) {
+        } catch (IOException e) {
             throw new ImageValidationException(String.format("Failed to update logo uploaded by %s ",
                                                              ident.getUsername()),
                                                e);