From 6077461bf6cf6b96fdd9414a415138fe4b91934e Mon Sep 17 00:00:00 2001
From: Lennard Golsch <lennard.golsch@icloud.com>
Date: Thu, 8 Aug 2024 16:39:25 +0200
Subject: [PATCH] MCR-3157 Adapted MCRAccessKeyFilter for REST

---
 .../restapi/v2/filter/MCRAccessKeyFilter.java       | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/restapi/v2/filter/MCRAccessKeyFilter.java b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/restapi/v2/filter/MCRAccessKeyFilter.java
index 7f177c4ffb..27cd629288 100644
--- a/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/restapi/v2/filter/MCRAccessKeyFilter.java
+++ b/mycore-acl/src/main/java/org/mycore/mcr/acl/accesskey/restapi/v2/filter/MCRAccessKeyFilter.java
@@ -23,7 +23,8 @@
 import org.mycore.common.MCRException;
 import org.mycore.common.MCRSessionMgr;
 import org.mycore.datamodel.metadata.MCRObjectID;
-import org.mycore.mcr.acl.accesskey.MCRAccessKeyUtils;
+import org.mycore.mcr.acl.accesskey.config.MCRAccessKeyConfig;
+import org.mycore.mcr.acl.accesskey.service.MCRAccessKeyServiceFactory;
 import org.mycore.restapi.v2.MCRRestAuthorizationFilter;
 
 import jakarta.annotation.Priority;
@@ -33,6 +34,9 @@
 import jakarta.ws.rs.core.MultivaluedMap;
 import jakarta.ws.rs.ext.Provider;
 
+/**
+ * Sets access key to session by request header.
+ */
 @Provider
 @Priority(Priorities.AUTHENTICATION + 1)
 public class MCRAccessKeyFilter implements ContainerRequestFilter {
@@ -42,7 +46,7 @@ public class MCRAccessKeyFilter implements ContainerRequestFilter {
     @Override
     public void filter(ContainerRequestContext requestContext) {
         LOGGER.debug("Access key filter started.");
-        if (!MCRAccessKeyUtils.isAccessKeyForSessionAllowed()) {
+        if (MCRAccessKeyConfig.getAllowedSessionPermissionTypes().isEmpty()) {
             LOGGER.debug("Access keys are not allowed for session. Skipping filter...");
             return;
         }
@@ -52,14 +56,15 @@ public void filter(ContainerRequestContext requestContext) {
         }
         final String secret = requestContext.getHeaderString("X-Access-Key");
         if (secret != null) {
-            LOGGER.debug("Found X-Access-Key with value {}.", secret);
+            LOGGER.debug("Found X-Access-Key with secret {}.", secret);
             final MultivaluedMap<String, String> pathParameters = requestContext.getUriInfo().getPathParameters();
             final String objectIdString = pathParameters.getFirst(MCRRestAuthorizationFilter.PARAM_MCRID);
             if (objectIdString != null) {
                 try {
                     final MCRObjectID objectId = MCRObjectID.getInstance(objectIdString);
                     if (objectId != null) {
-                        MCRAccessKeyUtils.addAccessKeySecretToCurrentSession(objectId, secret);
+                        MCRAccessKeyServiceFactory.getAccessKeySessionService()
+                            .activateAccessKey(objectId.toString(), secret);
                     }
                 } catch (MCRException e) {
                     LOGGER.debug("The access key could not be added to the current session: ", e);