gCubeSystem
/
custom-portal-handler
16
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

updated to auth2 

git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/custom-portal-handler@131157 82a268e6-3cf1-43bd-a215-b396298e98cf
This commit is contained in:
Massimiliano Assante 2016-09-06 14:19:06 +00:00
parent f13b69fb45
commit 2e99cc2501
2 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -10,7 +10,7 @@
<groupId>org.gcube.portal</groupId> <groupId>org.gcube.portal</groupId>
<artifactId>custom-portal-handler</artifactId> <artifactId>custom-portal-handler</artifactId>
<version>2.0.1-SNAPSHOT</version> <version>2.1.0-SNAPSHOT</version>
<packaging>jar</packaging> <packaging>jar</packaging>
<name>Custom Portal Handler</name> <name>Custom Portal Handler</name>
<description> <description>

17
src/main/java/org/gcube/portal/custom/scopemanager/scopehelper/ScopeHelper.java
View File

@ -33,6 +33,8 @@ import com.liferay.portal.service.RoleLocalServiceUtil;
import com.liferay.portal.service.UserLocalServiceUtil; import com.liferay.portal.service.UserLocalServiceUtil;
import com.liferay.portal.theme.ThemeDisplay; import com.liferay.portal.theme.ThemeDisplay;
import org.gcube.common.authorization.library.provider.SecurityTokenProvider; import org.gcube.common.authorization.library.provider.SecurityTokenProvider;
import org.gcube.common.authorization.library.provider.UserInfo;
import static org.gcube.common.authorization.client.Constants.authorizationService; import static org.gcube.common.authorization.client.Constants.authorizationService;
public class ScopeHelper { public class ScopeHelper {
@ -126,20 +128,14 @@ public class ScopeHelper {
SessionManager.getInstance().getASLSession(sessionID, username).setUserGender(isMale? GenderType.MALE : GenderType.FEMALE); SessionManager.getInstance().getASLSession(sessionID, username).setUserGender(isMale? GenderType.MALE : GenderType.FEMALE);
setAuthorizationToken(SessionManager.getInstance().getASLSession(sessionID, username)); setAuthorizationToken(SessionManager.getInstance().getASLSession(sessionID, username));
} catch (UserManagementSystemException e) { } catch (Exception e) {
e.printStackTrace(); e.printStackTrace();
} catch (GroupRetrievalFault e) { }
e.printStackTrace();
} catch (PortalException e) {
e.printStackTrace();
} catch (SystemException e) {
e.printStackTrace();
}
} }
private final static String DEFAULT_ROLE = "OrganizationMember"; private final static String DEFAULT_ROLE = "OrganizationMember";
private static void setAuthorizationToken(ASLSession session) { private static void setAuthorizationToken(ASLSession session) throws Exception {
String username = session.getUsername(); String username = session.getUsername();
String scope = session.getScope(); String scope = session.getScope();
ScopeProvider.instance.set(scope); ScopeProvider.instance.set(scope);
@ -147,7 +143,8 @@ public class ScopeHelper {
List<String> userRoles = new ArrayList<>(); List<String> userRoles = new ArrayList<>();
userRoles.add(DEFAULT_ROLE); userRoles.add(DEFAULT_ROLE);
session.setSecurityToken(null); session.setSecurityToken(null);
String token = authorizationService().build().generate(session.getUsername(), userRoles); String token = authorizationService().generateUserToken(new UserInfo(session.getUsername(), userRoles), scope);
_log.debug("received token: "+token); _log.debug("received token: "+token);
session.setSecurityToken(token); session.setSecurityToken(token);
_log.info("Security token set in session for: "+username + " on " + scope); _log.info("Security token set in session for: "+username + " on " + scope);