diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java index 5ae0a4a..d5b4f04 100644 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java @@ -2,8 +2,24 @@ package eu.dnetlib.uoaauthorizationlibrary.configuration; import org.springframework.boot.context.properties.EnableConfigurationProperties; import org.springframework.context.annotation.*; +import org.springframework.web.servlet.config.annotation.CorsRegistry; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurer; +import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; @Configuration @EnableConfigurationProperties({SecurityConfig.class, GlobalVars.class}) @ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" }) -public class AuthorizationConfiguration { } +public class AuthorizationConfiguration { + + @Bean + public WebMvcConfigurer corsConfigurer() { + return new WebMvcConfigurerAdapter() { + @Override + public void addCorsMappings(CorsRegistry registry) { + registry.addMapping("/**") + .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS") + .allowCredentials(true); + } + }; + } +} diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/IgnoreSecurityConfiguration.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/IgnoreSecurityConfiguration.java new file mode 100644 index 0000000..2c70d83 --- /dev/null +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/IgnoreSecurityConfiguration.java @@ -0,0 +1,12 @@ +package eu.dnetlib.uoaauthorizationlibrary.configuration; + +import eu.dnetlib.uoaauthorizationlibrary.security.AuthorizationService; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; + +@Configuration +@ComponentScan( + basePackageClasses = {AuthorizationService.class} +) +public class IgnoreSecurityConfiguration { +} diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/CorsConfig.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/CorsConfig.java deleted file mode 100644 index 893326e..0000000 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/CorsConfig.java +++ /dev/null @@ -1,16 +0,0 @@ -package eu.dnetlib.uoaauthorizationlibrary.security; - -import org.springframework.context.annotation.Configuration; -import org.springframework.web.servlet.config.annotation.CorsRegistry; -import org.springframework.web.servlet.config.annotation.WebMvcConfigurerAdapter; - -@Configuration -public class CorsConfig extends WebMvcConfigurerAdapter { - - @Override - public void addCorsMappings(CorsRegistry registry) { - registry.addMapping("/**") - .allowedMethods("GET", "POST", "PUT", "DELETE", "HEAD", "OPTIONS") - .allowCredentials(true); - } -}