Add possible Content-Type for SignedStrings (application/cms) (#113)

eu-digital-green-certificates · Jul 7, 2021 · 0975316 · 0975316
1 parent f3091b3
commit 0975316
Show file tree

Hide file tree

Showing 3 changed files with 85 additions and 38 deletions.
diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/controller/ValidationRuleController.java
@@ -135,7 +135,8 @@ public ResponseEntity<Map<String, List<ValidationRuleDto>>> downloadValidationRu
      * Endpoint to upload a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @PostMapping(path = "", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @PostMapping(path = "", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),
@@ -177,7 +178,7 @@ public ResponseEntity<Void> uploadValidationRule(
                 "Submitted string needs to be signed by a valid upload certificate");
         }
 
-        ValidationRuleEntity createdValidationRule = null;
+        ValidationRuleEntity createdValidationRule;
 
         try {
             createdValidationRule = validationRuleService.addValidationRule(
@@ -233,7 +234,8 @@ public ResponseEntity<Void> uploadValidationRule(
      * Endpoint to delete a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @DeleteMapping(path = "", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @DeleteMapping(path = "", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),
@@ -330,7 +332,8 @@ public ResponseEntity<Void> deleteValidationRules(
      * Alias endpoint to delete a Validation Rule.
      */
     @CertificateAuthenticationRequired
-    @PostMapping(path = "/delete", consumes = CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE)
+    @PostMapping(path = "/delete", consumes = {
+        CmsStringMessageConverter.CONTENT_TYPE_CMS_TEXT_VALUE, CmsStringMessageConverter.CONTENT_TYPE_CMS_VALUE})
     @Operation(
         security = {
             @SecurityRequirement(name = OpenApiConfig.SECURITY_SCHEMA_HASH),

diff --git a/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java b/src/main/java/eu/europa/ec/dgc/gateway/restapi/converter/CmsStringMessageConverter.java
@@ -41,9 +41,11 @@ public class CmsStringMessageConverter extends AbstractHttpMessageConverter<Sign
 
     public static final MediaType CONTENT_TYPE_CMS_TEXT = new MediaType("application", "cms-text");
     public static final String CONTENT_TYPE_CMS_TEXT_VALUE = "application/cms-text";
+    public static final MediaType CONTENT_TYPE_CMS = new MediaType("application", "cms");
+    public static final String CONTENT_TYPE_CMS_VALUE = "application/cms";
 
     public CmsStringMessageConverter() {
-        super(CONTENT_TYPE_CMS_TEXT);
+        super(CONTENT_TYPE_CMS_TEXT, CONTENT_TYPE_CMS);
     }
 
     @Override