From 85d8ec87d293db3de3d368c7352451413365b440 Mon Sep 17 00:00:00 2001 From: Massimiliano Assante Date: Mon, 12 Sep 2016 13:52:10 +0000 Subject: [PATCH] updated to auth2 git-svn-id: http://svn.research-infrastructures.eu/public/d4science/gcube/trunk/portal/social-mail-servlet@131298 82a268e6-3cf1-43bd-a215-b396298e98cf --- distro/changelog.xml | 1 + .../java/org/gcube/portal/socialmail/PeriodicTask.java | 8 +++++--- src/main/webapp/index.jsp | 4 +++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/distro/changelog.xml b/distro/changelog.xml index 6366bd1..2630d8b 100644 --- a/distro/changelog.xml +++ b/distro/changelog.xml @@ -2,6 +2,7 @@ Added possibility to change poller time at runtime as well as to quit it by editing a property file in the server + Added support for Auth2 diff --git a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java index dc115e5..4fbf2b4 100644 --- a/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java +++ b/src/main/java/org/gcube/portal/socialmail/PeriodicTask.java @@ -35,6 +35,7 @@ import org.gcube.applicationsupportlayer.social.mailing.AppType; import org.gcube.applicationsupportlayer.social.mailing.SocialMailingUtil; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingSite; import org.gcube.applicationsupportlayer.social.shared.SocialNetworkingUser; +import org.gcube.common.authorization.library.provider.UserInfo; import org.gcube.common.homelibrary.home.HomeLibrary; import org.gcube.common.homelibrary.home.exceptions.HomeNotFoundException; import org.gcube.common.homelibrary.home.exceptions.InternalErrorException; @@ -181,7 +182,7 @@ public class PeriodicTask implements Runnable { } 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 scope = session.getScope(); ScopeProvider.instance.set(scope); @@ -189,10 +190,11 @@ public class PeriodicTask implements Runnable { List userRoles = new ArrayList<>(); userRoles.add(DEFAULT_ROLE); 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); session.setSecurityToken(token); - _log.info("Security token set in session for: "+username + " on " + scope); + _log.debug("PeriodicTask EmailParser: Security token set in session for: "+username + " on " + scope); } public void check(String portalName, String host, String user, String password) { diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp index af7335c..b0a1943 100644 --- a/src/main/webapp/index.jsp +++ b/src/main/webapp/index.jsp @@ -2,6 +2,8 @@

Hello From D4Science Email reader service!

-RUN Email reader service (repeat: every minute [Default]) +RUN Email reader service (repeat: every minutes [Default]) + +You can change this value by editing the property file gcube-data.properties under $CATALINA_HOME/conf