mauro.mugnaini
/
threadlocal-vars-cleaner
forked from gCubeSystem/threadlocal-vars-cleaner
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Changed the proxy class name and renamed packages from com.nubisware.* to org.gcube.*

This commit is contained in:
Mauro Mugnaini 2020-06-18 12:32:03 +02:00
parent ee7a088be2
commit b156114d3d
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/org/gcube/portal/threadlocalexec/SmartGearsPortalValve.java
View File

@ -22,17 +22,17 @@ import org.gcube.common.authorization.library.provider.UmaJWTProvider;
import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.authorization.library.provider.UserInfo;
import org.gcube.common.portal.PortalContext; import org.gcube.common.portal.PortalContext;
import org.gcube.common.scope.api.ScopeProvider; import org.gcube.common.scope.api.ScopeProvider;
import org.gcube.oidc.rest.JWTToken;
import org.gcube.oidc.rest.OpenIdConnectConfiguration;
import org.gcube.oidc.rest.OpenIdConnectRESTHelper;
import org.gcube.portal.oidc.lr62.JWTTokenUtil;
import org.gcube.portal.oidc.lr62.LiferayOpenIdConnectConfiguration;
import org.gcube.portal.oidc.lr62.OIDCTokenCacheProxy;
import org.slf4j.Logger; import org.slf4j.Logger;
import org.slf4j.LoggerFactory; import org.slf4j.LoggerFactory;
import com.liferay.portal.model.User; import com.liferay.portal.model.User;
import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil;
import com.nubisware.oidc.lr62.JWTTokenUtil;
import com.nubisware.oidc.lr62.LiferayOpenIdConnectConfiguration;
import com.nubisware.oidc.lr62.OIDCTokenProxy;
import com.nubisware.oidc.rest.JWTToken;
import com.nubisware.oidc.rest.OpenIdConnectConfiguration;
import com.nubisware.oidc.rest.OpenIdConnectRESTHelper;
/** /**
* *
@ -121,7 +121,7 @@ public class SmartGearsPortalValve extends ValveBase {
if (_log.isDebugEnabled()) { if (_log.isDebugEnabled()) {
_log.debug("Trying to get UMA token from cache proxy"); _log.debug("Trying to get UMA token from cache proxy");
} }
umaToken = OIDCTokenProxy.getInstance().getUMAToken(user, session); umaToken = OIDCTokenCacheProxy.getInstance().getUMAToken(user, session);
if (umaToken == null || !umaToken.getAud().contains(urlEncodedScope)) { if (umaToken == null || !umaToken.getAud().contains(urlEncodedScope)) {
if (umaToken == null) { if (umaToken == null) {
if (_log.isDebugEnabled()) { if (_log.isDebugEnabled()) {
@ -163,7 +163,7 @@ public class SmartGearsPortalValve extends ValveBase {
if (_log.isDebugEnabled()) { if (_log.isDebugEnabled()) {
_log.debug("Setting UMA token in cache proxy"); _log.debug("Setting UMA token in cache proxy");
} }
OIDCTokenProxy.getInstance().setRPTToken(user, session, umaToken); OIDCTokenCacheProxy.getInstance().setRPTToken(user, session, umaToken);
if (_log.isDebugEnabled()) { if (_log.isDebugEnabled()) {
_log.debug("Setting UMA token in session"); _log.debug("Setting UMA token in session");
} }
@ -177,7 +177,7 @@ public class SmartGearsPortalValve extends ValveBase {
} }
private JWTToken getOIDCTokeFromProxyAndSetInSession(User user, HttpServletRequest request, HttpSession session) { private JWTToken getOIDCTokeFromProxyAndSetInSession(User user, HttpServletRequest request, HttpSession session) {
JWTToken token = OIDCTokenProxy.getInstance().getOIDCToken(user, session); JWTToken token = OIDCTokenCacheProxy.getInstance().getOIDCToken(user, session);
if (token == null) { if (token == null) {
_log.warn("OIDC token is null also in cache proxy!"); _log.warn("OIDC token is null also in cache proxy!");
} else { } else {