From 1ce4b8f49ee9a7611413dd017af47629a535edf5 Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Fri, 10 Jun 2022 10:25:24 +0430 Subject: CORS fix --- .../com/terminaldweller/doc/DocController.java | 6 +----- .../com/terminaldweller/main/DevConfiguration.java | 24 ++++++++++++++++++++++ 2 files changed, 25 insertions(+), 5 deletions(-) create mode 100644 src/main/java/com/terminaldweller/main/DevConfiguration.java (limited to 'src/main/java/com/terminaldweller') diff --git a/src/main/java/com/terminaldweller/doc/DocController.java b/src/main/java/com/terminaldweller/doc/DocController.java index a6a1734..53f2748 100644 --- a/src/main/java/com/terminaldweller/doc/DocController.java +++ b/src/main/java/com/terminaldweller/doc/DocController.java @@ -17,7 +17,7 @@ import org.springframework.web.bind.annotation.RestController; /** The document controller class. */ @RestController // @CrossOrigin(origins = {"https://localhost:7080, https://editor.terminaldweller.com"}) -// @CrossOrigin(origins = "https://localhost:7080") +@CrossOrigin(origins = "https://editor.terminaldweller.com", maxAge = 3600) @RequestMapping(path = "api/v1/doc") public class DocController { private final DocService docService; @@ -27,26 +27,22 @@ public class DocController { this.docService = docService; } - @CrossOrigin(origins = "https://localhost:7080") @GetMapping(path = "{Id}") public Optional getDocs(@PathVariable("Id") Long id) { return docService.getDocs(id); } - @CrossOrigin(origins = "https://localhost:7080") @PostMapping(path = "{Id}") @ResponseStatus(HttpStatus.CREATED) public void postDocs(@PathVariable("Id") Long id, @RequestBody Doc doc) { docService.addNewDoc(id, doc); } - @CrossOrigin(origins = "https://localhost:7080") @DeleteMapping(path = "{Id}") public void deleteDocs(@PathVariable("Id") Long id) { docService.deleteDoc(id); } - @CrossOrigin(origins = "https://localhost:7080") @PutMapping(path = "{Id}") public void updatDoc(@RequestBody Doc doc, @PathVariable("Id") long id) { docService.updateDoc(doc, id); diff --git a/src/main/java/com/terminaldweller/main/DevConfiguration.java b/src/main/java/com/terminaldweller/main/DevConfiguration.java new file mode 100644 index 0000000..0b253df --- /dev/null +++ b/src/main/java/com/terminaldweller/main/DevConfiguration.java @@ -0,0 +1,24 @@ +package com.terminaldweller; + +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.Profile; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.EnableWebMvc; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; + +@Configuration +@EnableWebMvc +@Profile("development") +public class DevConfiguration implements WebMvcConfigurer { + + @Override + public void addCorsMappings(CorsRegistry registry) { + registry + .addMapping("/api/**") + .allowedOrigins("https://editor.terminaldweller.com") + .allowedMethods("GET", "POST", "PUT", "DELETE", "OPTIONS") + .allowedHeaders("*") + .maxAge(3600); + // .allowedOrigins("https://localhost:7080", "https://editor.terminaldweller.com") + } +} -- cgit v1.2.3