MaDgiK-CITE
/
argos
13
0
Fork 0
Code Issues Pull Requests Projects Releases 3 Wiki Activity

Replace CrossOrigin annotaion with global configuration

This commit is contained in:
George Kalampokis 2022-04-18 18:32:25 +03:00
parent 1d1226dc5f
commit 85b37dd16d
39 changed files with 16 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
dmp-backend/web/src/main/java/eu/eudat/configurations/WebMVCConfiguration.java
View File

@ -1,37 +1,43 @@
package eu.eudat.configurations;
import eu.eudat.controllers.interceptors.RequestInterceptor;
import eu.eudat.logic.handlers.PrincipalArgumentResolver;
import eu.eudat.logic.services.ApiContext;
import eu.eudat.logic.services.operations.authentication.AuthenticationService;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.context.annotation.Configuration;
import org.springframework.core.env.Environment;
import org.springframework.scheduling.annotation.EnableAsync;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.web.method.support.HandlerMethodArgumentResolver;
import org.springframework.web.servlet.config.annotation.CorsRegistry;
import org.springframework.web.servlet.config.annotation.InterceptorRegistry;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter;
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
import java.util.List;
@EnableAsync
@Configuration
@EnableScheduling
public class WebMVCConfiguration extends WebMvcConfigurerAdapter {
public class WebMVCConfiguration implements WebMvcConfigurer {
private ApiContext apiContext;
private AuthenticationService verifiedUserAuthenticationService;
private AuthenticationService nonVerifiedUserAuthenticationService;
private final AuthenticationService verifiedUserAuthenticationService;
private final AuthenticationService nonVerifiedUserAuthenticationService;
@Autowired
public WebMVCConfiguration(ApiContext apiContext, AuthenticationService verifiedUserAuthenticationService, AuthenticationService nonVerifiedUserAuthenticationService) {
private final Environment environment;
public WebMVCConfiguration(ApiContext apiContext, AuthenticationService verifiedUserAuthenticationService, AuthenticationService nonVerifiedUserAuthenticationService, Environment environment) {
this.apiContext = apiContext;
this.verifiedUserAuthenticationService = verifiedUserAuthenticationService;
this.nonVerifiedUserAuthenticationService = nonVerifiedUserAuthenticationService;
this.environment = environment;
}
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/api/**").allowedOrigins(this.environment.getProperty("dmp.domain"));
}
@Autowired
@Override
public void addArgumentResolvers(List<HandlerMethodArgumentResolver> argumentResolvers) {
argumentResolvers.add(new PrincipalArgumentResolver(verifiedUserAuthenticationService, nonVerifiedUserAuthenticationService));

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Admin.java
View File

@ -38,7 +38,6 @@ import static eu.eudat.types.Authorities.ADMIN;
import static eu.eudat.types.Authorities.DATASET_PROFILE_MANAGER;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/admin/"})
public class Admin extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/CommonController.java
View File

@ -18,7 +18,6 @@ import java.util.List;
* Created by ikalyvas on 3/28/2018.
*/
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/common"})
public class CommonController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/ContactEmail.java
View File

@ -15,7 +15,6 @@ import org.springframework.web.bind.annotation.*;
import javax.transaction.Transactional;
@RestController
@CrossOrigin
@RequestMapping(value = "api/contactEmail")
public class ContactEmail {
private static final Logger logger = LoggerFactory.getLogger(ContactEmail.class);

1
dmp-backend/web/src/main/java/eu/eudat/controllers/CurrencyController.java
View File

@ -12,7 +12,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = "api/currency")
public class CurrencyController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/DMPProfileController.java
View File

@ -31,7 +31,6 @@ import static eu.eudat.types.Authorities.ADMIN;
* Created by ikalyvas on 3/21/2018.
*/
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/dmpprofile"})
public class DMPProfileController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/DMPs.java
View File

@ -62,7 +62,6 @@ import static org.springframework.http.MediaType.*;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/dmps/"})
public class DMPs extends BaseController {
private static final Logger logger = LoggerFactory.getLogger(DMPs.class);

3
dmp-backend/web/src/main/java/eu/eudat/controllers/DashBoardController.java
View File

@ -22,11 +22,10 @@ import java.io.IOException;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class DashBoardController extends BaseController {
private DashBoardManager dashBoardManager;
private final DashBoardManager dashBoardManager;
@Autowired
public DashBoardController(ApiContext apiContext, DashBoardManager dashBoardManager) {
super(apiContext);

1
dmp-backend/web/src/main/java/eu/eudat/controllers/DataRepositories.java
View File

@ -19,7 +19,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/datarepos"})
public class DataRepositories extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfileController.java
View File

@ -23,7 +23,6 @@ import java.util.UUID;
import static eu.eudat.types.Authorities.ADMIN;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class DatasetProfileController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/DatasetProfiles.java
View File

@ -17,7 +17,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class DatasetProfiles extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Datasets.java
View File

@ -59,7 +59,6 @@ import static eu.eudat.types.Authorities.ANONYMOUS;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/datasets/"})
public class Datasets extends BaseController {
private static final Logger logger = LoggerFactory.getLogger(Datasets.class);

1
dmp-backend/web/src/main/java/eu/eudat/controllers/EmailConfirmation.java
View File

@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
import javax.transaction.Transactional;
@RestController
@CrossOrigin
@RequestMapping(value = "api/emailConfirmation")
public class EmailConfirmation {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/EmailMergeConfirmation.java
View File

@ -18,7 +18,6 @@ import org.springframework.web.bind.annotation.*;
import javax.transaction.Transactional;
@RestController
@CrossOrigin
@RequestMapping(value = "api/emailMergeConfirmation")
public class EmailMergeConfirmation {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/ExternalDatasets.java
View File

@ -24,7 +24,6 @@ import java.util.UUID;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class ExternalDatasets extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/FileController.java
View File

@ -40,7 +40,6 @@ import java.util.UUID;
import java.util.stream.Collectors;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/file/"})
public class FileController {
private static final Logger logger = LoggerFactory.getLogger(FileController.class);

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Funders.java
View File

@ -16,7 +16,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/funders/"})
public class Funders extends BaseController {
private FunderManager funderManager;

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Grants.java
View File

@ -28,7 +28,6 @@ import static eu.eudat.types.Authorities.ANONYMOUS;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/grants/"})
public class Grants extends BaseController {
private GrantManager grantManager;

1
dmp-backend/web/src/main/java/eu/eudat/controllers/JournalsController.java
View File

@ -19,7 +19,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/journals"})
public class JournalsController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/LanguageController.java
View File

@ -15,7 +15,6 @@ import java.io.*;
import java.util.UUID;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/language/"})
public class LanguageController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Licenses.java
View File

@ -17,7 +17,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/licenses"})
public class Licenses extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/LockController.java
View File

@ -14,7 +14,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.UUID;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/lock/"})
public class LockController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Login.java
View File

@ -50,7 +50,6 @@ import java.security.GeneralSecurityException;
@RestController
@CrossOrigin
@RequestMapping(value = "api/auth")
public class Login {
private static final Logger logger = LoggerFactory.getLogger(Login.class);

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Organisations.java
View File

@ -20,7 +20,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class Organisations extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Prefillings.java
View File

@ -14,7 +14,6 @@ import java.util.List;
import java.util.UUID;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class Prefillings {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Projects.java
View File

@ -17,7 +17,6 @@ import org.springframework.web.bind.annotation.*;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/projects/"})
public class Projects extends BaseController {
private ProjectManager projectManager;

1
dmp-backend/web/src/main/java/eu/eudat/controllers/PubRepositoriesController.java
View File

@ -17,7 +17,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/pubrepos"})
public class PubRepositoriesController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/PublicationsController.java
View File

@ -17,7 +17,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/publications"})
public class PublicationsController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/QuickWizardController.java
View File

@ -26,7 +26,6 @@ import javax.validation.Valid;
import java.util.UUID;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/quick-wizard/"})
public class QuickWizardController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Registries.java
View File

@ -19,7 +19,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class Registries extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Researchers.java
View File

@ -21,7 +21,6 @@ import java.util.Map;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/researchers"})
public class Researchers extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Services.java
View File

@ -19,7 +19,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class Services extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/TagController.java
View File

@ -25,7 +25,6 @@ import java.util.stream.Collectors;
* Created by ikalyvas on 7/5/2018.
*/
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class TagController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/TaxonomiesController.java
View File

@ -17,7 +17,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/external/taxonomies"})
public class TaxonomiesController extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/UserGuideController.java
View File

@ -26,7 +26,6 @@ import java.util.stream.Stream;
import static eu.eudat.types.Authorities.ADMIN;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api/userguide/"})
public class UserGuideController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/UserInvitationController.java
View File

@ -22,7 +22,6 @@ import java.util.UUID;
@RequestMapping("api/invite/")
@RestController
@CrossOrigin
public class UserInvitationController extends BaseController {
private InvitationsManager invitationsManager;

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Users.java
View File

@ -31,7 +31,6 @@ import static eu.eudat.types.Authorities.ADMIN;
@RestController
@CrossOrigin
@RequestMapping(value = "api/user")
public class Users extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/controllers/Validation.java
View File

@ -20,7 +20,6 @@ import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(value = {"/api"})
public class Validation extends BaseController {

1
dmp-backend/web/src/main/java/eu/eudat/logic/proxy/Proxy.java
View File

@ -11,7 +11,6 @@ import java.net.*;
@RestController
@CrossOrigin
public class Proxy {
private String allowedHost;