Revision 59932
Added by Konstantina Galouni over 3 years ago
modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java | ||
---|---|---|
4 | 4 |
import org.springframework.context.annotation.*; |
5 | 5 |
|
6 | 6 |
@Configuration |
7 |
@PropertySources({ |
|
8 |
@PropertySource("classpath:authorization.properties"), |
|
9 |
@PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) |
|
10 |
}) |
|
7 |
//@PropertySources({
|
|
8 |
// @PropertySource("classpath:authorization.properties"),
|
|
9 |
// @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true)
|
|
10 |
//})
|
|
11 | 11 |
@EnableConfigurationProperties({SecurityConfig.class}) |
12 | 12 |
@ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" }) |
13 | 13 |
public class AuthorizationConfiguration { } |
modules/uoa-authorization-library/trunk/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java | ||
---|---|---|
30 | 30 |
* |
31 | 31 |
* */ |
32 | 32 |
public String curator(String type) { |
33 |
return mapType(type).toUpperCase() + "_CURATOR";
|
|
33 |
return "CURATOR_"+mapType(type).toUpperCase();
|
|
34 | 34 |
} |
35 | 35 |
|
36 | 36 |
/** |
Also available in: Unified diff
[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.