[Trunk | Authorization Library]:
1. AuthorizationService.java: [Bug fix] In method "curator()", "CURATOR" is a prefix, not suffix in role. 2. AuthorizationConfiguration.java: Comment "@PropertySources" as this is a library project and properties are set by parent project.
This commit is contained in:
parent
d01da64406
commit
bc395ac998
|
@ -4,10 +4,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties
|
||||||
import org.springframework.context.annotation.*;
|
import org.springframework.context.annotation.*;
|
||||||
|
|
||||||
@Configuration
|
@Configuration
|
||||||
@PropertySources({
|
//@PropertySources({
|
||||||
@PropertySource("classpath:authorization.properties"),
|
// @PropertySource("classpath:authorization.properties"),
|
||||||
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
// @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
||||||
})
|
//})
|
||||||
@EnableConfigurationProperties({SecurityConfig.class})
|
@EnableConfigurationProperties({SecurityConfig.class})
|
||||||
@ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" })
|
@ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" })
|
||||||
public class AuthorizationConfiguration { }
|
public class AuthorizationConfiguration { }
|
||||||
|
|
|
@ -30,7 +30,7 @@ public class AuthorizationService {
|
||||||
*
|
*
|
||||||
* */
|
* */
|
||||||
public String curator(String type) {
|
public String curator(String type) {
|
||||||
return mapType(type).toUpperCase() + "_CURATOR";
|
return "CURATOR_"+mapType(type).toUpperCase();
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
|
|
Loading…
Reference in New Issue