Revize e11e7ac7

Fixed Cors and endpoint /calendar/delete

server/src/main/java/cz/zcu/yamanager/ws/rest/ApiController.java

@@ -1 +1 @@
 package cz.zcu.yamanager.ws.rest;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
 import cz.zcu.yamanager.business.FileService;
 import cz.zcu.yamanager.business.Manager;
 import cz.zcu.yamanager.dto.BasicRequest;
@@ -236 +235 @@
 
     // *********************** DELETE ****************************
 
-    @RequestMapping(value = "/calendar/delete", method=DELETE)
+    @RequestMapping(value = "/calendar/{id}/delete", method=DELETE)
     public ResponseEntity calendarDelete(
-            @RequestParam(value = "lang", required = false) String lang,
-            @RequestBody String id)
+            @PathVariable("id") String id,
+            @RequestParam(value = "lang", required = false) String lang)
     {
-        return handle(getLanguage(lang), () -> {
-            Long vacationId = ((Integer) new ObjectMapper().readValue(id, HashMap.class).get("id")).longValue();
-            manager.deleteVacation(getUserId("me"), vacationId);
-        });
+        return handle(getLanguage(lang), () ->
+            manager.deleteVacation(getUserId("me"), StringUtils.isNumeric(id) ? Long.parseLong(id) : -1)
+        );
     }
 
     // *********************** FILE ****************************

server/src/main/java/cz/zcu/yamanager/ws/rest/RESTConfiguration.java

@@ -25 +25 @@
 
     @Override
     public void addCorsMappings(CorsRegistry registry) {
-        registry.addMapping("/api/**")
+        registry.addMapping("/**")
                 .allowedMethods("GET", "POST", "PUT", "DELETE");
     }