Skip to content

Commit 8d274e4

Browse files
committed
fix: add CrossOrigin annotation to controllers
1 parent c15b662 commit 8d274e4

10 files changed

+37
-4
lines changed

src/main/java/org/radarbase/appserver/config/MultiHttpSecurityConfig.java

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -112,8 +112,10 @@ public WebMvcConfigurer corsConfigurer() {
112112
return new WebMvcConfigurer() {
113113
@Override
114114
public void addCorsMappings(@NonNull CorsRegistry registry) {
115-
registry.addMapping("/**").allowedMethods("GET", "POST", "PUT", "DELETE").allowedOrigins("*");
116-
// NOTE: allowedHeaders("*") is causing CORS issues so this has been removed (empty allows all headers by default)
115+
registry.addMapping("/**")
116+
.allowedMethods("GET", "POST", "PUT", "DELETE")
117+
.allowedOrigins("*")
118+
.allowedHeaders("*");
117119
}
118120
};
119121
}

src/main/java/org/radarbase/appserver/controller/FcmDataMessageController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.radarbase.appserver.dto.fcm.FcmDataMessages;
3232
import org.radarbase.appserver.service.FcmDataMessageService;
3333
import org.springframework.http.ResponseEntity;
34+
import org.springframework.web.bind.annotation.CrossOrigin;
3435
import org.springframework.web.bind.annotation.DeleteMapping;
3536
import org.springframework.web.bind.annotation.GetMapping;
3637
import org.springframework.web.bind.annotation.PathVariable;
@@ -47,6 +48,7 @@
4748
*
4849
* @author yatharthranjan
4950
*/
51+
@CrossOrigin
5052
@RestController
5153
public class FcmDataMessageController {
5254

src/main/java/org/radarbase/appserver/controller/FcmNotificationController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131
import org.radarbase.appserver.dto.fcm.FcmNotifications;
3232
import org.radarbase.appserver.service.FcmNotificationService;
3333
import org.springframework.http.ResponseEntity;
34+
import org.springframework.web.bind.annotation.CrossOrigin;
3435
import org.springframework.web.bind.annotation.DeleteMapping;
3536
import org.springframework.web.bind.annotation.GetMapping;
3637
import org.springframework.web.bind.annotation.PathVariable;
@@ -47,6 +48,7 @@
4748
*
4849
* @author yatharthranjan
4950
*/
51+
@CrossOrigin
5052
@RestController
5153
public class FcmNotificationController {
5254

src/main/java/org/radarbase/appserver/controller/GithubEndpoint.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@
2626
import org.springframework.beans.factory.annotation.Autowired;
2727
import org.springframework.http.HttpStatus;
2828
import org.springframework.http.ResponseEntity;
29+
import org.springframework.web.bind.annotation.CrossOrigin;
2930
import org.springframework.web.bind.annotation.GetMapping;
3031
import org.springframework.web.bind.annotation.RequestParam;
3132
import org.springframework.web.bind.annotation.RestController;
@@ -34,6 +35,7 @@
3435
import java.io.IOException;
3536
import java.net.MalformedURLException;
3637

38+
@CrossOrigin
3739
@RestController
3840
public class GithubEndpoint {
3941

src/main/java/org/radarbase/appserver/controller/NotificationStateEventController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@
2828
import org.radarbase.appserver.dto.NotificationStateEventDto;
2929
import org.radarbase.appserver.service.NotificationStateEventService;
3030
import org.springframework.http.ResponseEntity;
31+
import org.springframework.web.bind.annotation.CrossOrigin;
3132
import org.springframework.web.bind.annotation.GetMapping;
3233
import org.springframework.web.bind.annotation.PathVariable;
3334
import org.springframework.web.bind.annotation.PostMapping;
@@ -36,6 +37,7 @@
3637
import radar.spring.auth.common.Authorized;
3738
import radar.spring.auth.common.PermissionOn;
3839

40+
@CrossOrigin
3941
@RestController
4042
public class NotificationStateEventController {
4143

src/main/java/org/radarbase/appserver/controller/ProtocolEndpoint.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -30,12 +30,14 @@
3030
import org.radarbase.appserver.config.AuthConfig.AuthEntities;
3131
import org.radarbase.appserver.config.AuthConfig.AuthPermissions;
3232
import org.springframework.beans.factory.annotation.Autowired;
33+
import org.springframework.web.bind.annotation.CrossOrigin;
3334
import org.springframework.web.bind.annotation.GetMapping;
3435
import org.springframework.web.bind.annotation.PathVariable;
3536
import org.springframework.web.bind.annotation.RestController;
3637
import radar.spring.auth.common.Authorized;
3738
import radar.spring.auth.common.PermissionOn;
3839

40+
@CrossOrigin
3941
@RestController
4042
public class ProtocolEndpoint {
4143

src/main/java/org/radarbase/appserver/controller/QuestionnaireScheduleEndpoint.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
import java.util.Locale;
4343
import java.util.Optional;
4444

45+
@CrossOrigin
4546
@RestController
4647
@SuppressWarnings("PMD.DataflowAnomalyAnalysis")
4748
public class QuestionnaireScheduleEndpoint {

src/main/java/org/radarbase/appserver/controller/RadarProjectController.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,7 @@
3838
import org.radarbase.auth.token.RadarToken;
3939
import org.springframework.http.MediaType;
4040
import org.springframework.http.ResponseEntity;
41+
import org.springframework.web.bind.annotation.CrossOrigin;
4142
import org.springframework.web.bind.annotation.GetMapping;
4243
import org.springframework.web.bind.annotation.PathVariable;
4344
import org.springframework.web.bind.annotation.PostMapping;
@@ -58,6 +59,7 @@
5859
* @see <a href="https://github.com/RADAR-base/ManagementPortal">Management Portal</a>
5960
* @author yatharthranjan
6061
*/
62+
@CrossOrigin
6163
@RestController
6264
@Slf4j
6365
public class RadarProjectController {

src/main/java/org/radarbase/appserver/controller/RadarUserController.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,15 @@
3636
import org.radarbase.appserver.service.UserService;
3737
import org.radarbase.auth.token.RadarToken;
3838
import org.springframework.http.ResponseEntity;
39-
import org.springframework.web.bind.annotation.*;
39+
import org.springframework.web.bind.annotation.CrossOrigin;
40+
import org.springframework.web.bind.annotation.DeleteMapping;
41+
import org.springframework.web.bind.annotation.GetMapping;
42+
import org.springframework.web.bind.annotation.PathVariable;
43+
import org.springframework.web.bind.annotation.PostMapping;
44+
import org.springframework.web.bind.annotation.PutMapping;
45+
import org.springframework.web.bind.annotation.RequestBody;
46+
import org.springframework.web.bind.annotation.RequestParam;
47+
import org.springframework.web.bind.annotation.RestController;
4048
import radar.spring.auth.common.AuthAspect;
4149
import radar.spring.auth.common.Authorization;
4250
import radar.spring.auth.common.Authorized;
@@ -51,6 +59,7 @@
5159
* @see <a href="https://github.com/RADAR-base/ManagementPortal">Management Portal</a>
5260
* @author yatharthranjan
5361
*/
62+
@CrossOrigin
5463
@RestController
5564
public class RadarUserController {
5665

src/main/java/org/radarbase/appserver/controller/TaskStateEventController.java

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,13 +26,22 @@
2626
import org.radarbase.appserver.dto.TaskStateEventDto;
2727
import org.radarbase.appserver.service.TaskStateEventService;
2828
import org.springframework.http.ResponseEntity;
29-
import org.springframework.web.bind.annotation.*;
29+
import org.springframework.web.bind.annotation.CrossOrigin;
30+
import org.springframework.web.bind.annotation.DeleteMapping;
31+
import org.springframework.web.bind.annotation.GetMapping;
32+
import org.springframework.web.bind.annotation.PathVariable;
33+
import org.springframework.web.bind.annotation.PostMapping;
34+
import org.springframework.web.bind.annotation.PutMapping;
35+
import org.springframework.web.bind.annotation.RequestBody;
36+
import org.springframework.web.bind.annotation.RequestParam;
37+
import org.springframework.web.bind.annotation.RestController;
3038
import radar.spring.auth.common.Authorized;
3139
import radar.spring.auth.common.PermissionOn;
3240

3341
import javax.naming.SizeLimitExceededException;
3442
import java.util.List;
3543

44+
@CrossOrigin
3645
@RestController
3746
public class TaskStateEventController {
3847

0 commit comments

Comments
 (0)