diff --git a/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApiImpl.java b/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApiImpl.java index 83d5508..52461ad 100644 --- a/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApiImpl.java +++ b/src/main/java/eu/dnetlib/repo/manager/service/controllers/UserApiImpl.java @@ -38,6 +38,7 @@ public class UserApiImpl implements UserApi { body.put("email",authentication.getUserInfo().getEmail()); List roles = authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority).collect(Collectors.toList()); body.put("role",roles); + return new ResponseEntity<>(body, HttpStatus.OK); } } diff --git a/src/main/resources/eu/dnetlib/repo/manager/service/application.properties b/src/main/resources/eu/dnetlib/repo/manager/service/application.properties index 4c7f6c9..efdfe7c 100644 --- a/src/main/resources/eu/dnetlib/repo/manager/service/application.properties +++ b/src/main/resources/eu/dnetlib/repo/manager/service/application.properties @@ -25,6 +25,7 @@ ValidatorService.url=http://adonis.athenarc.gr:8080/validator-service/services/v # Broker Service services.broker.url = http://broker1-dev-dnet.d4science.org +#services.broker.url = http://beta.lbs.openaire.eu #services.broker.url = http://localhost services.broker.port = 8080 #services.broker.port = 9090 @@ -36,6 +37,7 @@ services.broker.openaire = openaireBroker configurationFileClassPath=classpath:application-context.xml api.baseAddress=https://dev-openaire.d4science.org/openaire +#api.baseAddress=http://beta.services.openaire.eu:8080/openaire service.repository-rest-api.baseUrl = http://localhost:8080 @@ -113,7 +115,7 @@ oidc.dev.home = http://audrey.athenarc.gr:8380/repomanager-service-dev/openid_co webapp.dev.front = http://audrey.athenarc.gr:3000/dashboard -redis.host = 194.177.192.121 +redis.host = aleka.athenarc.gr redis.port = 6379 redis.password = E#Szvnidd diff --git a/src/main/webapp/WEB-INF/aai-security.xml b/src/main/webapp/WEB-INF/aai-security.xml index b853ffa..2992858 100644 --- a/src/main/webapp/WEB-INF/aai-security.xml +++ b/src/main/webapp/WEB-INF/aai-security.xml @@ -2,9 +2,12 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xmlns:util="http://www.springframework.org/schema/util" - xsi:schemaLocation="http://www.springframework.org/schema/security http://www.springframework.org/schema/security/spring-security-3.2.xsd - http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-4.1.xsd - http://www.springframework.org/schema/util http://www.springframework.org/schema/util/spring-util-4.1.xsd" + xsi:schemaLocation="http://www.springframework.org/schema/security + http://www.springframework.org/schema/security/spring-security-3.2.xsd + http://www.springframework.org/schema/beans + http://www.springframework.org/schema/beans/spring-beans-4.1.xsd + http://www.springframework.org/schema/util + http://www.springframework.org/schema/util/spring-util-4.1.xsd" default-autowire="byType"> diff --git a/src/main/webapp/WEB-INF/log4j.properties b/src/main/webapp/WEB-INF/log4j.properties index 9446c5a..e18e297 100644 --- a/src/main/webapp/WEB-INF/log4j.properties +++ b/src/main/webapp/WEB-INF/log4j.properties @@ -11,14 +11,14 @@ log4j.logger.com.opensymphony.xwork2.ObjectFactory = FATAL log4j.logger.eu.dnetlib.repo.manager=DEBUG log4j.appender.R=org.apache.log4j.RollingFileAppender -log4j.appender.R.File=/var/log/dnet45/repomanager-service-dev/repomanager-service.log +log4j.appender.R.File=/var/log/dnet/repository-service/repository-service.log log4j.appender.R.MaxFileSize=10MB log4j.appender.R.MaxBackupIndex=10 log4j.appender.R.layout=org.apache.log4j.PatternLayout log4j.appender.R.layout.ConversionPattern= %d %p %t [%c] - %m%n log4j.appender.S=org.apache.log4j.RollingFileAppender -log4j.appender.S.File=/var/log/dnet45/repomanager-service-dev/repomanager-service-spring.log +log4j.appender.S.File=/var/log/dnet/repository-service/repository-service-spring.log log4j.appender.S.MaxFileSize=10MB log4j.appender.S.MaxBackupIndex=10 log4j.appender.S.layout=org.apache.log4j.PatternLayout