diff --git a/client/src/main.ts b/client/src/main.ts index 9ab6b80..068aaae 100644 --- a/client/src/main.ts +++ b/client/src/main.ts @@ -33,7 +33,7 @@ interface AlpineState { removeAdministrator: (userId: number) => void, deleteUser: (userId: number) => void, - onClickHideCheckbox: (event: Event) => void, + onClickHideCheckbox: (event: PointerEvent) => void, init: () => void, setServerMessage: (newMessage: Sykkelaksjon) => void, diff --git a/server/src/main/java/no/asprusten/sykkelaksjon/Server.java b/server/src/main/java/no/asprusten/sykkelaksjon/Server.java index 2e3c298..29d30fb 100644 --- a/server/src/main/java/no/asprusten/sykkelaksjon/Server.java +++ b/server/src/main/java/no/asprusten/sykkelaksjon/Server.java @@ -74,7 +74,7 @@ public class Server { return activityMessage; } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @GetMapping("/api") public ServerMessageSchema respondToRequest() throws ServerExceptionHandler.InvalidUserException { var optionalUserProfile = profileManager.getProfile(); @@ -188,7 +188,7 @@ public class Server { return serverMessage; } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PostMapping(path = "/api/submitActivity", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void submitActivity( @RequestParam("activity-type") Long activityTypeId, @@ -213,7 +213,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PostMapping(path = "/api/submitActivityTemplate", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void submitActivityTemplate( @RequestParam("activity-type") Long activityTypeId, @@ -238,7 +238,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @DeleteMapping(path = "/api/deleteActivityTemplate", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void deleteActivityTemplate(@RequestParam("activity-template-id") Long activityTemplateId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -253,7 +253,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @DeleteMapping(path = "/api/deleteActivity", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void deleteActivity(@RequestParam("activity-id") Long activityId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -268,7 +268,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PostMapping(path = "/api/addActivityType", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void createActivityType( @RequestParam("activity-type-name") String name, @@ -288,7 +288,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @DeleteMapping(path = "/api/deleteActivityType", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void deleteActivityType(@RequestParam("activity-type-id") Long activityTypeId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -301,7 +301,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PutMapping(path = "/api/makeAdmin", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void makeAdmin(@RequestParam("user-id") Long userId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -317,7 +317,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PutMapping(path = "/api/removeAdmin", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void removeAdmin(@RequestParam("user-id") Long userId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -333,7 +333,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @DeleteMapping(path = "/api/deleteUser", consumes = MediaType.MULTIPART_FORM_DATA_VALUE) public void deleteUser(@RequestParam("user-id") Long userId) { profileManager.getProfile().ifPresent(userProfile -> { @@ -346,7 +346,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @GetMapping(path = "/api/openid") public OpenidSchema provideOpenidConfig() { OpenidSchema openidSchema = new OpenidSchema(); @@ -355,7 +355,7 @@ public class Server { return openidSchema; } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PutMapping(path = "/api/hideMe") public void hideUser() { profileManager.getProfile().ifPresent(userProfile -> { @@ -367,7 +367,7 @@ public class Server { }); } - @CrossOrigin(origins = {"http://localhost:5173"}, allowCredentials = "true") + @CrossOrigin @PutMapping(path = "/api/showMe") public void showUser() { profileManager.getProfile().ifPresent(userProfile -> {