From bc395ac99825d26949e6f7e39088d8fc373c58c8 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Fri, 20 Nov 2020 16:00:56 +0000 Subject: [PATCH] [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. --- .../configuration/AuthorizationConfiguration.java | 8 ++++---- .../security/AuthorizationService.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java index a562764..44e7304 100644 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/configuration/AuthorizationConfiguration.java @@ -4,10 +4,10 @@ import org.springframework.boot.context.properties.EnableConfigurationProperties import org.springframework.context.annotation.*; @Configuration -@PropertySources({ - @PropertySource("classpath:authorization.properties"), - @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) -}) +//@PropertySources({ +// @PropertySource("classpath:authorization.properties"), +// @PropertySource(value = "classpath:dnet-override.properties", ignoreResourceNotFound = true) +//}) @EnableConfigurationProperties({SecurityConfig.class}) @ComponentScan(basePackages = { "eu.dnetlib.uoaauthorizationlibrary" }) public class AuthorizationConfiguration { } diff --git a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java index d4be59a..1c24ab7 100644 --- a/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java +++ b/src/main/java/eu/dnetlib/uoaauthorizationlibrary/security/AuthorizationService.java @@ -30,7 +30,7 @@ public class AuthorizationService { * * */ public String curator(String type) { - return mapType(type).toUpperCase() + "_CURATOR"; + return "CURATOR_"+mapType(type).toUpperCase(); } /**