diff --git a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java index ecb01c1..dba88b8 100644 --- a/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java +++ b/src/main/java/org/gcube/common/authorization/library/AuthorizedTasks.java @@ -5,7 +5,6 @@ import java.util.concurrent.Callable; import org.gcube.common.authorization.library.provider.AuthorizationProvider; import org.gcube.common.authorization.library.provider.ClientInfo; import org.gcube.common.authorization.library.provider.SecurityTokenProvider; -import org.gcube.common.scope.api.ScopeProvider; public class AuthorizedTasks { @@ -17,7 +16,6 @@ public class AuthorizedTasks { */ static public Callable bind(final Callable task) { - final String callScope = ScopeProvider.instance.get(); final ClientInfo userCall = AuthorizationProvider.instance.get(); @@ -27,14 +25,12 @@ public class AuthorizedTasks { @Override public V call() throws Exception { - ScopeProvider.instance.set(callScope); AuthorizationProvider.instance.set(userCall); SecurityTokenProvider.instance.set(token); try { return task.call(); } finally { - ScopeProvider.instance.reset(); AuthorizationProvider.instance.reset(); SecurityTokenProvider.instance.reset(); } @@ -50,7 +46,6 @@ public class AuthorizedTasks { */ static public Runnable bind(final Runnable task) { - final String callScope = ScopeProvider.instance.get(); final ClientInfo userCall = AuthorizationProvider.instance.get(); @@ -59,14 +54,12 @@ public class AuthorizedTasks { return new Runnable() { @Override public void run() { - ScopeProvider.instance.set(callScope); AuthorizationProvider.instance.set(userCall); SecurityTokenProvider.instance.set(token); try { task.run(); } finally { - ScopeProvider.instance.reset(); AuthorizationProvider.instance.reset(); SecurityTokenProvider.instance.reset(); } diff --git a/src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java b/src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java index 5576879..525d156 100644 --- a/src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java +++ b/src/main/java/org/gcube/common/authorization/library/provider/SecurityTokenProvider.java @@ -1,13 +1,11 @@ package org.gcube.common.authorization.library.provider; -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; public class SecurityTokenProvider { public static SecurityTokenProvider instance = new SecurityTokenProvider(); - private static Logger logger = LoggerFactory.getLogger(SecurityTokenProvider.class); + //private static Logger logger = LoggerFactory.getLogger(SecurityTokenProvider.class); // Thread local variable containing each thread's ID private static final InheritableThreadLocal threadToken = @@ -22,12 +20,10 @@ public class SecurityTokenProvider { private SecurityTokenProvider(){} public String get(){ - logger.debug("gettin securityToken "+threadToken.get()+" in thread "+Thread.currentThread().getId()); return threadToken.get(); } public void set(String authorizationToken){ - logger.debug("setting securityToken "+authorizationToken+" in thread "+Thread.currentThread().getId()); threadToken.set(authorizationToken); }