fix permission conversion

Signed-off-by: Jörn Friedrich Dreyer <jfd@butonic.de>
cs3org · Dec 16, 2020 · 765a47f · 765a47f
1 parent b976591
commit 765a47f
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/internal/http/services/owncloud/ocs/conversions/role.go b/internal/http/services/owncloud/ocs/conversions/role.go
@@ -280,7 +280,7 @@ func RoleFromOCSPermissions(p Permissions) *Role {
 	role := ""
 	if p.Contain(PermissionRead) {
 		role = RoleViewer
-		if p.Contain(PermissionWrite | PermissionCreate | PermissionDelete) {
+		if p.Contain(PermissionWrite) && p.Contain(PermissionCreate) && p.Contain(PermissionDelete) {
 			role = RoleEditor
 			if p.Contain(PermissionShare) {
 				role = RoleCoowner
@@ -374,7 +374,7 @@ func RoleFromResourcePermissions(rp *provider.ResourcePermissions) *Role {
 		r.ocsPermissions = r.ocsPermissions | PermissionShare
 	}
 	if r.ocsPermissions.Contain(PermissionRead) {
-		if r.ocsPermissions.Contain(PermissionWrite | PermissionCreate | PermissionDelete) {
+		if r.ocsPermissions.Contain(PermissionWrite) && r.ocsPermissions.Contain(PermissionCreate) && r.ocsPermissions.Contain(PermissionDelete) {
 			r.Name = RoleEditor
 			if r.ocsPermissions.Contain(PermissionShare) {
 				r.Name = RoleCoowner

diff --git a/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go b/internal/http/services/owncloud/ocs/handlers/apps/sharing/shares/shares.go
@@ -153,7 +153,7 @@ func (h *Handler) createShare(w http.ResponseWriter, r *http.Request) {
 		response.WriteOCSError(w, r, response.MetaBadRequest.StatusCode, "shareType must be an integer", nil)
 		return
 	}
-	// TODO get user permissions on the shared file
+	// get user permissions on the shared file
 
 	c, err := pool.GetGatewayServiceClient(h.gatewayAddr)
 	if err != nil {