Merge branch 'main' of https://github.com/protegeproject/webprotege-a…

…uthorization-service into Configure_access_policies_for_WHOFIC_editors_#46 � Conflicts: � pom.xml
protegeproject · Jul 2, 2024 · ae868c3 · ae868c3
2 parents d00b5ec + fb87be8
commit ae868c3
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 7 deletions.
diff --git a/pom.xml b/pom.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-	xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
+		 xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd">
 	<modelVersion>4.0.0</modelVersion>
 	<parent>
 		<groupId>org.springframework.boot</groupId>
@@ -49,7 +49,7 @@
 		<dependency>
 			<groupId>edu.stanford.protege</groupId>
 			<artifactId>webprotege-ipc</artifactId>
-			<version>1.0.0</version>
+			<version>1.0.5</version>
 		</dependency>
 
 		<dependency>

diff --git a/src/main/java/edu/stanford/protege/webprotege/authorization/AccessManagerImpl.java b/src/main/java/edu/stanford/protege/webprotege/authorization/AccessManagerImpl.java
@@ -162,7 +162,7 @@ public Collection<Subject> getSubjectsWithAccessToResource(Resource resource, Ac
     private Collection<Subject> getSubjectsWithAccessToResource(Resource resource, Optional<ActionId> action) {
         String projectId = toProjectId(resource);
         Query query = query(where(PROJECT_ID).is(projectId));
-        action.ifPresent(a -> query.addCriteria(where(ACTION_CLOSURE).in(a.toString())));
+        action.ifPresent(a -> query.addCriteria(where(ACTION_CLOSURE).in(a.id())));
         return mongoTemplate.find(query, RoleAssignment.class)
                 .stream()
                 .map(ra -> {

diff --git a/src/main/resources/application.yml b/src/main/resources/application.yml
@@ -1,8 +1,6 @@
 server:
   port: 7771
-logging:
-  level:
-    root: DEBUG
+
 spring:
   application:
     name: AuthorizationService
@@ -19,8 +17,8 @@ spring:
       auto-index-creation: true
 
 webprotege.rabbitmq:
-  timeout: 60000
   requestqueue: webprotege-authorization-queue
   responsequeue: webprotege-authorization-response-queue
+  timeout: 60000
 
 keycloak-issuer-url: http://webprotege-local.edu/auth/realms/webprotege/protocol/openid-connect/certs