From 415f7fee2c323488bc615e65f46aa138e688edc3 Mon Sep 17 00:00:00 2001 From: Alan Davis Date: Wed, 1 Apr 2015 01:25:45 +0000 Subject: [PATCH] Merged HEAD-BUG-FIX (5.1/Cloud) to HEAD (5.1/Cloud) 100986: Merged 5.0.N (5.0.2) to HEAD-BUG-FIX (5.1/Cloud) 100829: Merged V4.2-BUG-FIX (4.2.5) to 5.0.N (5.0.2) 100693: Merged DEV to V4.2-BUG-FIX (4.2.5) 89520 : MNT-12597: Share: Accepting site invitation via email does not show on the 'Completed Task' task. - Using asignee from request parameter git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@101001 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261 --- .../web/scripts/invite/InviteResponse.java | 20 +++++++++++++++++-- 1 file changed, 18 insertions(+), 2 deletions(-) diff --git a/source/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java b/source/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java index 864223b446..8453d49a2e 100644 --- a/source/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java +++ b/source/java/org/alfresco/repo/web/scripts/invite/InviteResponse.java @@ -79,10 +79,10 @@ public class InviteResponse extends DeclarativeWebScript protected Map executeImpl(final WebScriptRequest req, final Status status) { String tenantDomain = TenantService.DEFAULT_DOMAIN; + final String inviteeUserName = req.getParameter(PARAM_INVITEE_USER_NAME); if (tenantService.isEnabled()) { - String inviteeUserName = req.getParameter(PARAM_INVITEE_USER_NAME); if (inviteeUserName != null) { tenantDomain = tenantService.getUserDomain(inviteeUserName); @@ -94,7 +94,23 @@ public class InviteResponse extends DeclarativeWebScript { public Map doWork() throws Exception { - return execute(req, status); + String oldUser = null; + try + { + if (inviteeUserName != null && !inviteeUserName.equals(oldUser)) + { + oldUser = AuthenticationUtil.getFullyAuthenticatedUser(); + AuthenticationUtil.setFullyAuthenticatedUser(inviteeUserName); + } + return execute(req, status); + } + finally + { + if (oldUser != null && !oldUser.equals(inviteeUserName)) + { + AuthenticationUtil.setFullyAuthenticatedUser(oldUser); + } + } } }, tenantDomain); }