From 0182c41ec079677ad4564469a5e3ff05f3c60706 Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Mon, 7 Jun 2021 11:42:03 +0200 Subject: [PATCH] Definitively removed the `UMATokensProvider` class since is no more useful to anyone --- .../gcube/portal/oidc/lr62/OIDCUmaUtil.java | 4 +-- .../portal/oidc/lr62/UMATokensProvider.java | 30 ------------------- 2 files changed, 1 insertion(+), 33 deletions(-) delete mode 100644 src/main/java/org/gcube/portal/oidc/lr62/UMATokensProvider.java diff --git a/src/main/java/org/gcube/portal/oidc/lr62/OIDCUmaUtil.java b/src/main/java/org/gcube/portal/oidc/lr62/OIDCUmaUtil.java index 8baef89..02c9827 100644 --- a/src/main/java/org/gcube/portal/oidc/lr62/OIDCUmaUtil.java +++ b/src/main/java/org/gcube/portal/oidc/lr62/OIDCUmaUtil.java @@ -391,10 +391,8 @@ public class OIDCUmaUtil { } - @SuppressWarnings("deprecation") public static void provideTokensInThreadlocal(JWTToken umaTokens) { - log.debug("Setting UMA token with jti {} in UMA providers", umaTokens.getJti()); - UMATokensProvider.instance.set(JWTTokenUtil.getRawContent(umaTokens)); + log.debug("Setting UMA token with jti {} in AccessToken provider", umaTokens.getJti()); AccessTokenProvider.instance.set(JWTTokenUtil.getAccessTokenString(umaTokens)); } diff --git a/src/main/java/org/gcube/portal/oidc/lr62/UMATokensProvider.java b/src/main/java/org/gcube/portal/oidc/lr62/UMATokensProvider.java deleted file mode 100644 index 4dcc561..0000000 --- a/src/main/java/org/gcube/portal/oidc/lr62/UMATokensProvider.java +++ /dev/null @@ -1,30 +0,0 @@ -package org.gcube.portal.oidc.lr62; - -public class UMATokensProvider { - - public static UMATokensProvider instance = new UMATokensProvider(); - - private static final InheritableThreadLocal threadToken = new InheritableThreadLocal() { - - @Override - protected String initialValue() { - return null; - } - - }; - - private UMATokensProvider() { - } - - public String get() { - return threadToken.get(); - } - - public void set(String jwt) { - threadToken.set(jwt); - } - - public void reset() { - threadToken.remove(); - } -} \ No newline at end of file