From 79c025fdeb843c9e7e742d0ba74b8d1e1b17b989 Mon Sep 17 00:00:00 2001 From: Mauro Mugnaini Date: Wed, 20 Jan 2021 01:00:52 +0100 Subject: [PATCH] Marked as deprecated all utils methods for session objects get/set (#20445) --- .../portal/oidc/lr62/IntraVMJWTCacheProxy.java | 2 +- .../org/gcube/portal/oidc/lr62/JWTTokenUtil.java | 14 ++++++-------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java b/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java index b3e163b..cf565d4 100644 --- a/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java +++ b/src/main/java/org/gcube/portal/oidc/lr62/IntraVMJWTCacheProxy.java @@ -101,7 +101,7 @@ public class IntraVMJWTCacheProxy extends JWTCacheProxy { if (log.isTraceEnabled()) { log.trace("Removing UMA token for user '" + user.getScreenName() + "' and session: " + sessionId); } - oidcTokens.get(user).remove(sessionId); + rptTokens.get(user).remove(sessionId); } else { if (log.isTraceEnabled()) { log.debug("No UMA token is stored for user '" + user.getScreenName() + "' and session: " + sessionId); diff --git a/src/main/java/org/gcube/portal/oidc/lr62/JWTTokenUtil.java b/src/main/java/org/gcube/portal/oidc/lr62/JWTTokenUtil.java index fe825a9..25c5237 100644 --- a/src/main/java/org/gcube/portal/oidc/lr62/JWTTokenUtil.java +++ b/src/main/java/org/gcube/portal/oidc/lr62/JWTTokenUtil.java @@ -22,38 +22,36 @@ public class JWTTokenUtil { return JWTToken.fromString((String) request.getAttribute(OIDC_TOKEN_ATTRIBUTE)); } - public static JWTToken getUMAFromRequest(HttpServletRequest request) { - return JWTToken.fromString((String) request.getAttribute(RPT_TOKEN_ATTRIBUTE)); - } - public static void putOIDCInRequest(JWTToken token, HttpServletRequest request) { request.setAttribute(OIDC_TOKEN_ATTRIBUTE, getRawContent(token)); } - public static void putUMAInRequest(JWTToken token, HttpServletRequest request) { - request.setAttribute(RPT_TOKEN_ATTRIBUTE, getRawContent(token)); - } - + @Deprecated public static JWTToken getOIDCFromSession(HttpSession session) { return JWTToken.fromString((String) session.getAttribute(OIDC_TOKEN_ATTRIBUTE)); } + @Deprecated public static JWTToken getUMAFromSession(HttpSession session) { return JWTToken.fromString((String) session.getAttribute(RPT_TOKEN_ATTRIBUTE)); } + @Deprecated public static void putOIDCInSession(JWTToken token, HttpSession session) { session.setAttribute(OIDC_TOKEN_ATTRIBUTE, getRawContent(token)); } + @Deprecated public static void putUMAInSession(JWTToken token, HttpSession session) { session.setAttribute(RPT_TOKEN_ATTRIBUTE, getRawContent(token)); } + @Deprecated public static void removeOIDCFromSession(HttpSession session) { session.removeAttribute(OIDC_TOKEN_ATTRIBUTE); } + @Deprecated public static void removeUMAFromSession(HttpSession session) { session.removeAttribute(RPT_TOKEN_ATTRIBUTE); }