From commits-return-18823-archive-asf-public=cust-asf.ponee.io@airavata.apache.org Tue Jan 23 23:38:17 2018 Return-Path: X-Original-To: archive-asf-public@eu.ponee.io Delivered-To: archive-asf-public@eu.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by mx-eu-01.ponee.io (Postfix) with ESMTP id 5DCA1180676 for ; Tue, 23 Jan 2018 23:38:17 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 4C1C5160C24; Tue, 23 Jan 2018 22:38:17 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 94BEC160C3A for ; Tue, 23 Jan 2018 23:38:16 +0100 (CET) Received: (qmail 79168 invoked by uid 500); 23 Jan 2018 22:38:15 -0000 Mailing-List: contact commits-help@airavata.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@airavata.apache.org Delivered-To: mailing list commits@airavata.apache.org Received: (qmail 79057 invoked by uid 99); 23 Jan 2018 22:38:15 -0000 Received: from ec2-52-202-80-70.compute-1.amazonaws.com (HELO gitbox.apache.org) (52.202.80.70) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 23 Jan 2018 22:38:15 +0000 Received: by gitbox.apache.org (ASF Mail Server at gitbox.apache.org, from userid 33) id 3159C82055; Tue, 23 Jan 2018 22:38:13 +0000 (UTC) Date: Tue, 23 Jan 2018 22:38:13 +0000 To: "commits@airavata.apache.org" Subject: [airavata] branch develop updated: Fix for setting ownerId on new group MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit Message-ID: <151674709360.18907.2013931770371223796@gitbox.apache.org> From: machristie@apache.org X-Git-Host: gitbox.apache.org X-Git-Repo: airavata X-Git-Refname: refs/heads/develop X-Git-Reftype: branch X-Git-Oldrev: bc22d0da25fe151ed3f63b5427f7eb5ff6e40a50 X-Git-Newrev: 6f4ae172524119da280dacf290c04e27060aa5f2 X-Git-Rev: 6f4ae172524119da280dacf290c04e27060aa5f2 X-Git-NotificationType: ref_changed_plus_diff X-Git-Multimail-Version: 1.5.dev Auto-Submitted: auto-generated This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/airavata.git The following commit(s) were added to refs/heads/develop by this push: new 6f4ae17 Fix for setting ownerId on new group 6f4ae17 is described below commit 6f4ae172524119da280dacf290c04e27060aa5f2 Author: Marcus Christie AuthorDate: Tue Jan 23 17:38:00 2018 -0500 Fix for setting ownerId on new group --- .../service/profile/handlers/GroupManagerServiceHandler.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java index 62f27a5..fd93ba8 100644 --- a/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java +++ b/airavata-services/profile-service/profile-service-server/src/main/java/org/apache/airavata/service/profile/handlers/GroupManagerServiceHandler.java @@ -41,11 +41,13 @@ public class GroupManagerServiceHandler implements GroupManagerService.Iface { sharingUserGroup.setName(groupModel.getName()); sharingUserGroup.setDescription(groupModel.getDescription()); sharingUserGroup.setGroupType(GroupType.USER_LEVEL_GROUP); - sharingUserGroup.setDomainId(authzToken.getClaimsMap().get(Constants.GATEWAY_ID)); - sharingUserGroup.setOwnerId(authzToken.getClaimsMap().get(Constants.USER_NAME)); + String gatewayId = authzToken.getClaimsMap().get(Constants.GATEWAY_ID); + sharingUserGroup.setDomainId(gatewayId); + String username = authzToken.getClaimsMap().get(Constants.USER_NAME); + sharingUserGroup.setOwnerId(username + "@" + gatewayId); String groupId = sharingClient.createGroup(sharingUserGroup); - sharingClient.addUsersToGroup(authzToken.getClaimsMap().get(Constants.GATEWAY_ID), groupModel.getMembers(), groupId); + sharingClient.addUsersToGroup(gatewayId, groupModel.getMembers(), groupId); return groupId; } catch (Exception e) { -- To stop receiving notification emails like this one, please contact machristie@apache.org.