Skip to content

ARGO-5670 Fix Quarkus Authorization CDI integration after Quarkus Auth API changed #199

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.

Sign up for GitHub

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

Open
cthermolia-grnet wants to merge 1 commit into
base: devel
Choose a base branch
from
Open

ARGO-5670 Fix Quarkus Authorization CDI integration after Quarkus Auth API changed #199

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
1 change: 1 addition & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,6 +198,7 @@ According to [Keep a Changelog](https://keepachangelog.com/en/1.0.0/) , the `Unr
- [#138](https://github.com/ARGOeu/argo-mon-status-api/pull/138) ARGO-5687 Fix entitlement searching for list tenants
- [#135](https://github.com/ARGOeu/argo-mon-status-api/pull/135) ARGO-5688 Enhance tenant invitation with quarkus auth role management
- [#114](https://github.com/ARGOeu/argo-mon-status-api/pull/114) ARGO-5471: Add node capabilities endpoints for availability and status
- [#199](https://github.com/ARGOeu/argo-mon-status-api/pull/199) ARGO-5670 Fix Quarkus Authorization CDI integration after Quarkus Auth API changed

### Removed

Expand Down
5 changes: 4 additions & 1 deletion service/src/main/java/org/grnet/status/services/GroupManagementService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@

import org.grnet.endpoint.scanner.runtime.clients.groupmanagement.AuthGroupManagement;
import org.grnet.endpoint.scanner.runtime.clients.groupmanagement.response.*;
import org.grnet.endpoint.scanner.runtime.services.OidcResourceAuthorizationService;
import org.grnet.endpoint.scanner.runtime.entitlements.qualifiers.ExternalSystemAuthorization;
import org.grnet.endpoint.scanner.runtime.services.ResourceAuthorizationService;
import org.grnet.status.dtos.pagination.PageResource;
import org.grnet.status.entities.Page;
Expand Down Expand Up @@ -35,7 +37,8 @@ public class GroupManagementService {
TenantRepository tenantRepository;

@Inject
ResourceAuthorizationService resourceAuthorizationService;
@ExternalSystemAuthorization
OidcResourceAuthorizationService resourceAuthorizationService;

@ConfigProperty(name = "api.auth.entitlements.parent-group")
String parentGroup;
Expand Down
6 changes: 5 additions & 1 deletion service/src/main/java/org/grnet/status/services/TenantService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,9 @@
import org.grnet.endpoint.scanner.runtime.clients.groupmanagement.AuthGroupManagement;
import org.grnet.endpoint.scanner.runtime.clients.groupmanagement.response.GroupUserResponse;
import org.grnet.endpoint.scanner.runtime.context.RoleEndpointHolder;
import org.grnet.endpoint.scanner.runtime.services.OidcResourceAuthorizationService;
import org.grnet.endpoint.scanner.runtime.entitlements.qualifiers.ExternalSystemAuthorization;

import org.grnet.endpoint.scanner.runtime.services.ResourceAuthorizationService;
import org.grnet.status.dtos.ams.PublishRequest;
import org.grnet.status.dtos.pagination.PageResource;
Expand Down Expand Up @@ -81,7 +84,8 @@ public class TenantService {
AuthGroupManagement groupManagement;

@Inject
ResourceAuthorizationService resourceAuthorizationService;
@ExternalSystemAuthorization
OidcResourceAuthorizationService resourceAuthorizationService;

@Inject
Utility utility;
Expand Down