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

Merge branch 'dmp-refactoring' of https://code-repo.d4science.org/MaDgiK-CITE/argos into dmp-refactoring

This commit is contained in:
Thomas Georgios Giannos 2023-10-23 11:17:23 +03:00
parent c338a93d71 6cde8ae2a9
commit 10df3db7aa
11 changed files with 19 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
dmp-backend/web/pom.xml
View File

@ -191,6 +191,14 @@
<artifactId>saaj-impl</artifactId>
<version>3.0.0-M2</version>
</dependency>
<!--CITE DEPENDENCIES-->
<dependency>
<groupId>gr.cite</groupId>
<artifactId>cors-web</artifactId>
<version>2.1.0</version>
</dependency>
</dependencies>
<build>

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

@ -32,7 +32,6 @@ import javax.management.InvalidApplicationException;
import java.util.*;
@RestController
@CrossOrigin
@RequestMapping(path = "api/description-template-type")
public class DescriptionTemplateTypeController {

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

@ -30,7 +30,6 @@ import javax.management.InvalidApplicationException;
import java.util.*;
@RestController
@CrossOrigin
@RequestMapping(path = "api/dmp-blueprint")
public class DmpBlueprintController {

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

@ -33,7 +33,6 @@ import javax.management.InvalidApplicationException;
import java.util.*;
@RestController
@CrossOrigin
@RequestMapping(path = "api/entity-doi")
public class EntityDoiController {

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

@ -28,7 +28,6 @@ import javax.management.InvalidApplicationException;
import java.util.List;
@RestController
@CrossOrigin
@RequestMapping(path = {"api/external-references"})
public class ExternalReferencesController extends BaseController {

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

@ -15,7 +15,6 @@ import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@RestController
@CrossOrigin
@RequestMapping(path = {"api/validation"})
public class ExternalValidationController extends BaseController {

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

@ -21,7 +21,6 @@ import eu.eudat.models.v2.Account;
import javax.management.InvalidApplicationException;
@RestController
@CrossOrigin
@RequestMapping(value = { "/api/principal/" })
public class PrincipalController {
private static final LoggerService logger = new LoggerService(LoggerFactory.getLogger(PrincipalController.class));

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

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

1
dmp-backend/web/src/main/resources/config/application.yml
View File

@ -15,5 +15,6 @@ spring:
optional:classpath:config/file-path.yml[.yml], optional:classpath:config/file-path-${spring.profiles.active}.yml[.yml], optional:file:../config/file-path-${spring.profiles.active}.yml[.yml],
optional:classpath:config/idpclaims.yml[.yml], optional:classpath:config/idpclaims-${spring.profiles.active}.yml[.yml], optional:file:../config/idpclaims-${spring.profiles.active}.yml[.yml],
optional:classpath:config/external.yml[.yml], optional:classpath:config/external-${spring.profiles.active}.yml[.yml], optional:file:../config/external-${spring.profiles.active}.yml[.yml],
optional:classpath:config/cors.yml[.yml], optional:classpath:config/cors-${spring.profiles.active}.yml[.yml], optional:file:../config/cors-${spring.profiles.active}.yml[.yml],
optional:classpath:config/swagger.yml[.yml], optional:classpath:config/swagger-${spring.profiles.active}.yml[.yml], optional:file:../config/swagger-${spring.profiles.active}.yml[.yml],
optional:classpath:config/deposit.yml[.yml], optional:classpath:config/deposit-${spring.profiles.active}.yml[.yml], optional:file:../config/deposit-${spring.profiles.active}.yml[.yml]

3
dmp-backend/web/src/main/resources/config/cors-devel.yml Normal file
View File

@ -0,0 +1,3 @@
web:
cors:
allowed-origins: [ http://localhost, http://localhost:4200 ]

7
dmp-backend/web/src/main/resources/config/cors.yml Normal file
View File

@ -0,0 +1,7 @@
web:
cors:
enabled: true
allowed-methods: [ HEAD, GET, POST, PUT, DELETE, PATCH ]
allowed-headers: [ Authorization, Cache-Control, Content-Type, Content-Disposition, x-tenant ]
exposed-headers: [ Authorization, Cache-Control, Content-Type, Content-Disposition ]
allow-credentials: false