From d6f4bf8aecfaa40180547d3eea895cd9e9e65444 Mon Sep 17 00:00:00 2001 From: Alessandro Pieve Date: Tue, 15 Nov 2016 11:38:07 +0000 Subject: [PATCH] git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portlets/admin/auth-portlet-manager@134173 82a268e6-3cf1-43bd-a215-b396298e98cf --- .../client/pagelayout/PolicyDataGrid.ui.xml | 9 +--- .../client/pagelayout/PolicyDataProvider.java | 4 -- .../client/pagelayout/PolicyFilter.java | 2 - .../server/AuthServiceImpl.java | 47 ++++++++++++------- 4 files changed, 32 insertions(+), 30 deletions(-) diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataGrid.ui.xml b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataGrid.ui.xml index f2dc353..5444e0f 100644 --- a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataGrid.ui.xml +++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataGrid.ui.xml @@ -13,7 +13,7 @@ @@ -23,12 +23,5 @@
-
- - - - - - - \ No newline at end of file diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataProvider.java b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataProvider.java index 9efcecc..f47367f 100644 --- a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataProvider.java +++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyDataProvider.java @@ -19,12 +19,8 @@ import java.util.ArrayList; import java.util.Collections; import java.util.List; -import org.gcube.common.scope.api.ScopeProvider; import org.gcube.portlets.admin.authportletmanager.shared.ConstantsSharing; import org.gcube.portlets.admin.authportletmanager.shared.PolicyAuth; -import org.gcube.vomanagement.usermanagement.GroupManager; -import org.gcube.vomanagement.usermanagement.impl.LiferayGroupManager; -import org.gcube.vomanagement.usermanagement.model.GCubeGroup; import com.google.gwt.core.shared.GWT; import com.google.gwt.view.client.HasData; diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyFilter.java b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyFilter.java index 26f0a14..5ee5d6d 100644 --- a/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyFilter.java +++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/client/pagelayout/PolicyFilter.java @@ -1,14 +1,12 @@ package org.gcube.portlets.admin.authportletmanager.client.pagelayout; import org.gcube.portlets.admin.authportletmanager.client.AuthManagerController; -import org.gcube.portlets.admin.authportletmanager.client.Entities; import org.gcube.portlets.admin.authportletmanager.client.event.ListPolicyEvent; import org.gcube.portlets.admin.authportletmanager.client.widget.BulletList; import org.gcube.portlets.admin.authportletmanager.client.widget.ListItem; import org.gcube.portlets.admin.authportletmanager.client.widget.Paragraph; import org.gcube.portlets.admin.authportletmanager.client.widget.Span; import org.gcube.portlets.admin.authportletmanager.shared.Caller.TypeCaller; -import org.gcube.portlets.admin.authportletmanager.shared.ConstantsSharing; import org.gcube.portlets.widgets.widgettour.client.extendedclasses.GCubeTour; import com.ait.toolkit.hopscotch.client.Placement; diff --git a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java index 423f98b..08de643 100644 --- a/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java +++ b/src/main/java/org/gcube/portlets/admin/authportletmanager/server/AuthServiceImpl.java @@ -17,6 +17,7 @@ import javax.servlet.ServletException; import javax.servlet.http.HttpSession; import org.gcube.application.framework.core.session.ASLSession; +import org.gcube.common.authorization.client.exceptions.ObjectNotFound; import org.gcube.common.authorization.library.policies.Action; import org.gcube.common.authorization.library.policies.Policy; import org.gcube.common.authorization.library.policies.PolicyType; @@ -53,7 +54,6 @@ import org.gcube.vomanagement.usermanagement.model.GCubeRole; import org.gcube.vomanagement.usermanagement.model.GCubeUser; import com.google.gwt.user.server.rpc.RemoteServiceServlet; - import com.liferay.portal.kernel.log.Log; import com.liferay.portal.kernel.log.LogFactoryUtil; @@ -101,9 +101,12 @@ implements AuthManagerService { logger.debug("loadListPolicy found context:"+null); context=aslSession.getScope(); } - String token= authorizationService().resolveTokenByUserAndContext(username, context); - if (token==null) - token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + String token; + try{ + token= authorizationService().resolveTokenByUserAndContext(username, context); + }catch (ObjectNotFound e){ + token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + } if (ConstantsSharing.DEBUG_MODE) { token=ConstantsSharing.DEBUG_TOKEN; @@ -203,9 +206,12 @@ implements AuthManagerService { if (context==null) context=aslSession.getScope(); - String token= authorizationService().resolveTokenByUserAndContext(username, context); - if (token==null) - token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + String token; + try{ + token= authorizationService().resolveTokenByUserAndContext(username, context); + }catch (ObjectNotFound e){ + token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + } //String token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); if (ConstantsSharing.DEBUG_MODE) { token=ConstantsSharing.DEBUG_TOKEN; @@ -286,9 +292,12 @@ implements AuthManagerService { else{ //Get List service String username = aslSession.getUsername(); - String token= authorizationService().resolveTokenByUserAndContext(username, context); - if (token==null) - token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + String token; + try{ + token= authorizationService().resolveTokenByUserAndContext(username, context); + }catch (ObjectNotFound e){ + token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + } //String token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); SecurityTokenProvider.instance.set(token); @@ -417,9 +426,12 @@ implements AuthManagerService { List policies = new ArrayList(); //String token =aslSession.getSecurityToken(); String username = aslSession.getUsername(); - String token= authorizationService().resolveTokenByUserAndContext(username, context); - if (token==null) - token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + String token; + try{ + token= authorizationService().resolveTokenByUserAndContext(username, context); + }catch (ObjectNotFound e){ + token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + } //String token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); if (ConstantsSharing.DEBUG_MODE) { @@ -499,9 +511,12 @@ implements AuthManagerService { if (context==null) context=aslSession.getScope(); String username = aslSession.getUsername(); - String token= authorizationService().resolveTokenByUserAndContext(username, context); - if (token==null) - token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + String token; + try{ + token= authorizationService().resolveTokenByUserAndContext(username, context); + }catch (ObjectNotFound e){ + token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context); + } //String token = authorizationService().generateUserToken(new UserInfo(username, new ArrayList()), context);