MaDgIK
/
uoa-monitor-service
13
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[Trunk | Monitor Service]: 

1. StakeholderController.java: In method "getAllRealStakeholders()" (/stakeholder), return also stakeholders with "restricted" visibility, without checking user's roles.
2. pom.xml: 
	a. Update parent from "spring-boot-starter-parent" to "dnet45-parent" ==> add <dependencyManagement> and "maven-war-plugin" and comment "spring-boot-maven-plugin".
	b. For dependencies "uoa-authorization-library" and "uoa-notification-service", use version 1.0.0 (released version), not 1.0.0-SNAPSHOT.
This commit is contained in:
Konstantina Galouni 2021-10-05 21:01:19 +00:00
parent 9b18159e2f
commit 3f0bbbd81c
2 changed files with 44 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
pom.xml
View File

@ -11,19 +11,21 @@
<name>uoa-monitor-service</name> <name>uoa-monitor-service</name>
<parent> <!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-parent</artifactId>
<version>1.5.8.RELEASE</version>
<relativePath/> <!-- lookup parent from repository -->
</parent>
<!-- <parent>--> <!-- <parent>-->
<!-- <groupId>eu.dnetlib</groupId>--> <!-- <groupId>org.springframework.boot</groupId>-->
<!-- <artifactId>dnet45-parent</artifactId>--> <!-- <artifactId>spring-boot-starter-parent</artifactId>-->
<!-- <version>1.0.0-SNAPSHOT</version>--> <!-- <version>1.5.8.RELEASE</version>-->
<!-- <relativePath/> &lt;!&ndash; lookup parent from repository &ndash;&gt;-->
<!-- </parent>--> <!-- </parent>-->
<!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->
<parent>
<groupId>eu.dnetlib</groupId>
<artifactId>dnet45-parent</artifactId>
<version>1.0.0</version>
</parent>
<properties> <properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding> <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding> <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
@ -32,6 +34,18 @@
<maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format> <maven.build.timestamp.format>E MMM dd HH:mm:ss z yyyy</maven.build.timestamp.format>
</properties> </properties>
<!-- Comment parent with artifact dnet45-parent and <dependencyManagement> in order to run springboot run command -->
<dependencyManagement>
<dependencies>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-dependencies</artifactId>
<version>1.5.8.RELEASE</version>
<type>pom</type>
<scope>import</scope>
</dependency>
</dependencies>
</dependencyManagement>
<dependencies> <dependencies>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -77,12 +91,12 @@
<dependency> <dependency>
<groupId>eu.dnetlib</groupId> <groupId>eu.dnetlib</groupId>
<artifactId>uoa-authorization-library</artifactId> <artifactId>uoa-authorization-library</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>eu.dnetlib</groupId> <groupId>eu.dnetlib</groupId>
<artifactId>uoa-notification-service</artifactId> <artifactId>uoa-notification-service</artifactId>
<version>1.0.0-SNAPSHOT</version> <version>1.0.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.springframework.boot</groupId> <groupId>org.springframework.boot</groupId>
@ -97,10 +111,12 @@
<build> <build>
<plugins> <plugins>
<plugin> <!-- Use parent with artifact spring-boot-starter-parent and add plugin with artifact spring-boot-maven-plugin in order to run springboot run command-->
<groupId>org.springframework.boot</groupId> <!-- <plugin>-->
<artifactId>spring-boot-maven-plugin</artifactId> <!-- <groupId>org.springframework.boot</groupId>-->
</plugin> <!-- <artifactId>spring-boot-maven-plugin</artifactId>-->
<!-- </plugin>-->
<!--3d answer: https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi--> <!--3d answer: https://stackoverflow.com/questions/23260057/the-forked-vm-terminated-without-saying-properly-goodbye-vm-crash-or-system-exi-->
<!--If you use openjdk there might be a problem with surfire plugin - uncomment following lines--> <!--If you use openjdk there might be a problem with surfire plugin - uncomment following lines-->
<plugin> <plugin>
@ -112,6 +128,16 @@
<useSystemClassLoader>false</useSystemClassLoader> <useSystemClassLoader>false</useSystemClassLoader>
</configuration> </configuration>
</plugin> </plugin>
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-war-plugin</artifactId>
<version>2.6</version>
<configuration>
<failOnMissingWebXml>false</failOnMissingWebXml>
</configuration>
</plugin>
</plugins> </plugins>
<finalName>uoa-monitor-service</finalName> <finalName>uoa-monitor-service</finalName>
<resources> <resources>

3
src/main/java/eu/dnetlib/uoamonitorservice/controllers/StakeholderController.java
View File

@ -378,7 +378,8 @@ public class StakeholderController {
if(rolesUtils.isCurator(roles, stakeholder.getType()) if(rolesUtils.isCurator(roles, stakeholder.getType())
|| rolesUtils.isManager(roles, stakeholder.getType(), stakeholder.getAlias()) || rolesUtils.isManager(roles, stakeholder.getType(), stakeholder.getAlias())
|| stakeholder.getVisibility() == Visibility.PUBLIC || stakeholder.getVisibility() == Visibility.PUBLIC
|| (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) { || stakeholder.getVisibility() == Visibility.RESTRICTED) {
// || (stakeholder.getVisibility() == Visibility.RESTRICTED && rolesUtils.isMember(roles, stakeholder.getType(), stakeholder.getAlias()))) {
//stakeholdersFull.add(this.setFullEntities(stakeholder)); //stakeholdersFull.add(this.setFullEntities(stakeholder));
continue; continue;
} }