diff --git a/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
new file mode 100644
index 0000000..4ce1dc5
--- /dev/null
+++ b/geoportal-service/src/main/java/org/gcube/application/geoportal/service/RequestFilter.java
@@ -0,0 +1,53 @@
+package org.gcube.application.geoportal.service;
+
+import lombok.extern.slf4j.Slf4j;
+import org.gcube.common.authorization.library.provider.AccessTokenProvider;
+import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
+import org.gcube.common.authorization.utils.manager.SecretManager;
+import org.gcube.common.authorization.utils.manager.SecretManagerProvider;
+import org.gcube.common.authorization.utils.secret.GCubeSecret;
+import org.gcube.common.authorization.utils.secret.JWTSecret;
+import org.gcube.common.authorization.utils.secret.Secret;
+
+import javax.ws.rs.container.*;
+import javax.ws.rs.ext.Provider;
+import java.io.IOException;
+
+@Provider
+@PreMatching
+@Slf4j
+public class RequestFilter implements ContainerRequestFilter, ContainerResponseFilter {
+
+
+    @Override
+    public void filter(ContainerRequestContext requestContext) throws IOException {
+        log.trace("PreMatching RequestFilter");
+
+        SecretManagerProvider.instance.reset();
+        SecretManager secretManager = new SecretManager();
+
+        String token = AccessTokenProvider.instance.get();
+        if(token!=null) {
+            Secret secret = new JWTSecret(token);
+            secretManager.addSecret(secret);
+        }
+
+        token = SecurityTokenProvider.instance.get();
+        if(token!=null) {
+            Secret secret = new GCubeSecret(token);
+            secretManager.addSecret(secret);
+        }
+
+        SecretManagerProvider.instance.set(secretManager);
+
+    }
+
+    @Override
+    public void filter(ContainerRequestContext requestContext, ContainerResponseContext responseContext)
+            throws IOException {
+        log.trace("ResponseFilter");
+        SecretManagerProvider.instance.reset();
+    }
+
+}
+