You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by sc...@apache.org on 2016/11/11 17:24:14 UTC
[4/4] airavata git commit: fixing AIRAVATA-2185 : Add OWNER
ResourcePermissionType to sharing API
fixing AIRAVATA-2185 : Add OWNER ResourcePermissionType to sharing API
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo
Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/177a2484
Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/177a2484
Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/177a2484
Branch: refs/heads/develop
Commit: 177a2484dfffaf5f46d92d4bdc6755fcc1ce07d0
Parents: 400e24d
Author: scnakandala <su...@gmail.com>
Authored: Fri Nov 11 12:24:05 2016 -0500
Committer: scnakandala <su...@gmail.com>
Committed: Fri Nov 11 12:24:05 2016 -0500
----------------------------------------------------------------------
.../server/handler/AiravataServerHandler.java | 4 +
.../main/resources/lib/airavata/Airavata.cpp | 2801 +++++++++++++-----
.../src/main/resources/lib/airavata/Airavata.h | 451 +++
.../lib/airavata/Airavata_server.skeleton.cpp | 99 +
.../lib/airavata/group_manager_model_types.cpp | 8 +-
.../lib/airavata/group_manager_model_types.h | 3 +-
.../lib/Airavata/Model/Group/Types.php | 2 +
.../lib/apache/airavata/api/Airavata-remote | 14 +
.../lib/apache/airavata/api/Airavata.py | 966 +++++-
.../lib/apache/airavata/model/group/ttypes.py | 3 +
.../model/group/ResourcePermissionType.java | 5 +-
.../db/repositories/UserRepository.java | 3 +
.../SharingRegistryServerHandlerTest.java | 2 +
.../user-group-models/group_manager_cpi.thrift | 95 -
.../group_manager_model.thrift | 3 +-
15 files changed, 3470 insertions(+), 989 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/airavata/blob/177a2484/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
----------------------------------------------------------------------
diff --git a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
index 5a65f5a..a55f926 100644
--- a/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
+++ b/airavata-api/airavata-api-server/src/main/java/org/apache/airavata/api/server/handler/AiravataServerHandler.java
@@ -3989,6 +3989,10 @@ public class AiravataServerHandler implements Airavata.Iface {
sharingRegistryServerHandler.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ ":READ").stream().forEach(u->accessibleUsers.add(u.userId));
+ else if(permissionType.equals(ResourcePermissionType.OWNER))
+ sharingRegistryServerHandler.getListOfSharedUsers(authzToken.getClaimsMap().get(Constants.GATEWAY_ID),
+ resourceId, authzToken.getClaimsMap().get(Constants.GATEWAY_ID)
+ + ":OWNER").stream().forEach(u->accessibleUsers.add(u.userId));
return accessibleUsers;
} catch (Exception e) {
String msg = "Error in getting all accessible users for resource. Resource ID : " + resourceId + " Resource Type : " + resourceType.toString() ;