Merge pull request #23 from CaritasDeutschland/feature-file-upload-re…

…striction feat: optimize quota reached header
Onlineberatung · Dec 2, 2020 · ec3b6b3 · ec3b6b3
2 parents 6bb0bf3 + 42d7337
commit ec3b6b3
Show file tree

Hide file tree

Showing 3 changed files with 33 additions and 4 deletions.
diff --git a/src/main/java/de/caritas/cob/uploadservice/api/ApiResponseEntityExceptionHandler.java b/src/main/java/de/caritas/cob/uploadservice/api/ApiResponseEntityExceptionHandler.java
@@ -1,5 +1,7 @@
 package de.caritas.cob.uploadservice.api;
 
+import static de.caritas.cob.uploadservice.api.exception.cutomheader.CustomHttpHeader.QUOTA_REACHED;
+
 import de.caritas.cob.uploadservice.api.exception.InvalidFileTypeException;
 import de.caritas.cob.uploadservice.api.exception.KeycloakException;
 import de.caritas.cob.uploadservice.api.exception.httpresponses.InternalServerErrorException;
@@ -218,9 +220,8 @@ public ResponseEntity<Object> handleInternal(final QuotaReachedException ex,
       final WebRequest request) {
     ex.executeLogging();
 
-    HttpHeaders headers = new HttpHeaders();
-    headers.add("Reason", "quota reached");
-    return handleExceptionInternal(null, null, headers, HttpStatus.FORBIDDEN, request);
+    return handleExceptionInternal(null, null, QUOTA_REACHED.buildHeader(), HttpStatus.FORBIDDEN,
+        request);
   }
 
 }
diff --git a/src/main/java/de/caritas/cob/uploadservice/api/exception/cutomheader/CustomHttpHeader.java b/src/main/java/de/caritas/cob/uploadservice/api/exception/cutomheader/CustomHttpHeader.java
@@ -0,0 +1,28 @@
+package de.caritas.cob.uploadservice.api.exception.cutomheader;
+
+import lombok.AllArgsConstructor;
+import org.springframework.http.HttpHeaders;
+
+/**
+ * Constants to build custom http headers.
+ */
+@AllArgsConstructor
+public enum CustomHttpHeader {
+
+  QUOTA_REACHED("X-Reason", "QUOTA_REACHED");
+
+  private final String headerName;
+  private final String headerValue;
+
+  /**
+   * Builds the {@link HttpHeaders} for the custom values.
+   *
+   * @return the {@link HttpHeaders} instance
+   */
+  public HttpHeaders buildHeader() {
+    HttpHeaders headers = new HttpHeaders();
+    headers.add(headerName, headerValue);
+    return headers;
+  }
+
+}
diff --git a/src/test/java/de/caritas/cob/uploadservice/api/controller/UploadControllerTestIT.java b/src/test/java/de/caritas/cob/uploadservice/api/controller/UploadControllerTestIT.java
@@ -292,7 +292,7 @@ public void uploadFileToRoom_Should_ReturnForbiddenWithCustomHeader_When_quotaLi
             .header(RC_TOKEN_HEADER_PARAMETER_NAME, RC_TOKEN)
             .header(RC_USER_ID_HEADER_PARAMETER_NAME, RC_USER_ID))
         .andExpect(status().isForbidden())
-        .andExpect(header().string("Reason", "quota reached"));
+        .andExpect(header().string("X-Reason", "QUOTA_REACHED"));
   }
 
   private String convertObjectToJson(Object object) throws JsonProcessingException {