From 897f92195f8496254cafe5f03307a021417dc09b Mon Sep 17 00:00:00 2001 From: Dmitriy Kopylenko Date: Fri, 4 Nov 2022 10:50:43 -0400 Subject: [PATCH] API, polishing --- .../admin/ui/repository/EntityDescriptorProjection.java | 3 ++- .../ui/security/permission/IShibUiPermissionEvaluator.java | 6 +++++- .../admin/ui/security/permission/PermissionType.java | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java index 5b60fd5b3..94dada3d8 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/repository/EntityDescriptorProjection.java @@ -2,6 +2,7 @@ import edu.internet2.tier.shibboleth.admin.ui.domain.EntityDescriptorProtocol; import lombok.Getter; +import org.hibernate.criterion.Projection; import java.time.LocalDateTime; @@ -53,4 +54,4 @@ public String getEntityId() { public EntityDescriptorProtocol getProtocol() { return protocol == null ? EntityDescriptorProtocol.SAML : protocol; } -} \ No newline at end of file +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java index 989132216..fde3ad023 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/IShibUiPermissionEvaluator.java @@ -1,6 +1,8 @@ package edu.internet2.tier.shibboleth.admin.ui.security.permission; +import edu.internet2.tier.shibboleth.admin.ui.domain.Auditable; import edu.internet2.tier.shibboleth.admin.ui.exception.ForbiddenException; +import liquibase.pro.packaged.T; import org.springframework.security.access.PermissionEvaluator; import org.springframework.security.core.Authentication; @@ -19,4 +21,6 @@ public interface IShibUiPermissionEvaluator extends PermissionEvaluator { * @throws ForbiddenException if the user does not have the correct authority required */ Collection getPersistentEntities(Authentication authentication, ShibUiPermissibleType type, PermissionType permissionType) throws ForbiddenException; -} \ No newline at end of file + + Collection getAuditableEntities(Authentication authentication, Class auditableType, PermissionType permissionType); +} diff --git a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java index 921462ab7..b807ecf32 100644 --- a/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java +++ b/backend/src/main/java/edu/internet2/tier/shibboleth/admin/ui/security/permission/PermissionType.java @@ -1,5 +1,5 @@ package edu.internet2.tier.shibboleth.admin.ui.security.permission; public enum PermissionType { - admin, approver, enable, fetch, viewOrEdit; -} \ No newline at end of file + admin, approve, enable, fetch, viewOrEdit; +}