Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Who setup #6

Merged
merged 7 commits into from
Jun 27, 2024
Merged
Show file tree
Hide file tree
Changes from 5 commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions pom.xml
Original file line number Diff line number Diff line change
@@ -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>
Expand All @@ -10,7 +10,7 @@
</parent>
<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-authorization-service</artifactId>
<version>1.0.2</version>
<version>1.0.3</version>
<name>webprotege-authorization-service</name>
<description>A service that checks users are authorized to execute operations in WebProtége</description>
<properties>
Expand Down Expand Up @@ -49,7 +49,7 @@
<dependency>
<groupId>edu.stanford.protege</groupId>
<artifactId>webprotege-ipc</artifactId>
<version>1.0.0</version>
<version>1.0.1</version>
</dependency>

<dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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 -> {
Expand Down
10 changes: 6 additions & 4 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,6 @@
server:
port: 7771
logging:
level:
root: DEBUG

spring:
application:
name: AuthorizationService
Expand All @@ -11,6 +9,10 @@ spring:
port: 5672
username: guest
password: guest
kafka:
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How did this make it back in? Will accept and then remove this later.

consumer:
auto-offset-reset: earliest
group-id: ${spring.application.name}
data:
mongodb:
host: localhost
Expand All @@ -19,8 +21,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
Loading