[airavata-data-lake] branch master updated: add cascade permission

[isjarana]

This is an automated email from the ASF dual-hosted git repository.

isjarana pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata-data-lake.git


The following commit(s) were added to refs/heads/master by this push:
     new d1009a4  add cascade permission
     new fe5e662  Merge pull request #186 from isururanawaka/mysql_conversion
d1009a4 is described below

commit d1009a48fe00b887ba135c7905886dfc0e035f8c
Author: Isuru Ranawaka <irjan...@gmail.com>
AuthorDate: Mon Oct 10 09:58:01 2022 -0400

    add cascade permission
---
 .../org/apache/airavata/drms/api/handlers/SharingServiceHandler.java  | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/SharingServiceHandler.java
 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/SharingServiceHandler.java
index 1f5a71c..4930e2e 100644
--- 
a/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/SharingServiceHandler.java
+++ 
b/data-resource-management-service/drms-rdbms-impl/drms-server/src/main/java/org/apache/airavata/drms/api/handlers/SharingServiceHandler.java
@@ -51,7 +51,6 @@ public class SharingServiceHandler extends 
DRMSSharingServiceGrpc.DRMSSharingSer
                         .setClientId(tenantId)
                         .setEntity(entity)
                         .setPermissionType(permissionTypeAdmin)
-                        .setCascade(true)
                         .addOwnerId(username).build();
                 org.apache.custos.sharing.service.Status statusAdmin = 
sharingManagementClient
                         .userHasAccess(tenantId, sharingRequestAdmin);
@@ -60,6 +59,7 @@ public class SharingServiceHandler extends 
DRMSSharingServiceGrpc.DRMSSharingSer
                             .newBuilder()
                             .setClientId(tenantId)
                             .setEntity(entity)
+                            .setCascade(true)
                             
.setPermissionType(PermissionType.newBuilder().setId(request.getPermissionId()).build())
                             .addOwnerId(request.getSharedUserId()).build();
                     sharingManagementClient.shareEntityWithUsers(tenantId, 
shrRequest);
@@ -107,7 +107,6 @@ public class SharingServiceHandler extends 
DRMSSharingServiceGrpc.DRMSSharingSer
                         .setClientId(tenantId)
                         .setEntity(entity)
                         .setPermissionType(permissionTypeAdmin)
-                        .setCascade(true)
                         .addOwnerId(username).build();
                 org.apache.custos.sharing.service.Status statusAdmin = 
sharingManagementClient
                         .userHasAccess(tenantId, sharingRequestAdmin);
@@ -116,6 +115,7 @@ public class SharingServiceHandler extends 
DRMSSharingServiceGrpc.DRMSSharingSer
                             .newBuilder()
                             .setClientId(tenantId)
                             .setEntity(entity)
+                            .setCascade(true)
                             
.setPermissionType(PermissionType.newBuilder().setId(request.getPermissionId()).build())
                             .addOwnerId(request.getSharedGroupId()).build();
                     sharingManagementClient.shareEntityWithGroups(tenantId, 
shrRequest);