diff --git a/pom.xml b/pom.xml index c8d5e0a..b9673b9 100644 --- a/pom.xml +++ b/pom.xml @@ -1,6 +1,6 @@ + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 https://maven.apache.org/xsd/maven-4.0.0.xsd"> 4.0.0 org.springframework.boot @@ -10,7 +10,7 @@ edu.stanford.protege webprotege-authorization-service - 1.0.2 + 1.0.3 webprotege-authorization-service A service that checks users are authorized to execute operations in WebProtége @@ -49,7 +49,7 @@ edu.stanford.protege webprotege-ipc - 1.0.0 + 1.0.5 diff --git a/src/main/java/edu/stanford/protege/webprotege/authorization/AccessManagerImpl.java b/src/main/java/edu/stanford/protege/webprotege/authorization/AccessManagerImpl.java index 669bb7d..0126771 100644 --- 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 getSubjectsWithAccessToResource(Resource resource, Ac private Collection getSubjectsWithAccessToResource(Resource resource, Optional 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 index 86e4f46..40ffe79 100644 --- 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