fix: org members should be allowed to get org details

Signed-off-by: Kush Sharma <[email protected]>
raystack · Sep 21, 2023 · 0ea437b · 0ea437b
1 parent 5e00304
commit 0ea437b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 5 deletions.
diff --git a/core/serviceuser/service.go b/core/serviceuser/service.go
@@ -141,7 +141,7 @@ func (s Service) Delete(ctx context.Context, id string) error {
 	// delete all of serviceuser relationships
 	// before deleting the serviceuser
 	if err := s.relService.Delete(ctx, relation.Relation{
-		Object: relation.Object{
+		Subject: relation.Subject{
 			ID:        id,
 			Namespace: schema.ServiceUserPrincipal,
 		},

diff --git a/core/user/service.go b/core/user/service.go
@@ -109,9 +109,9 @@ func (s Service) Disable(ctx context.Context, id string) error {
 }
 
 func (s Service) Delete(ctx context.Context, id string) error {
-	if err := s.relationService.Delete(ctx, relation.Relation{Object: relation.Object{
+	if err := s.relationService.Delete(ctx, relation.Relation{Subject: relation.Subject{
 		ID:        id,
-		Namespace: schema.ProjectNamespace,
+		Namespace: schema.UserPrincipal,
 	}}); err != nil {
 		return err
 	}

diff --git a/internal/bootstrap/schema/base_schema.zed b/internal/bootstrap/schema/base_schema.zed
@@ -32,7 +32,7 @@ definition app/organization {
 
     permission delete = platform->superuser + granted->app_organization_administer + granted->app_organization_delete + owner
     permission update = platform->superuser + granted->app_organization_administer + granted->app_organization_update + owner
-    permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + owner
+    permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + owner + member
     permission rolemanage = platform->superuser + granted->app_organization_administer + granted->app_organization_rolemanage + owner
     permission policymanage = platform->superuser + granted->app_organization_administer + granted->app_organization_policymanage + owner
     permission projectlist = platform->superuser + granted->app_organization_administer + granted->app_organization_projectlist + owner

diff --git a/internal/bootstrap/testdata/compiled_schema.zed b/internal/bootstrap/testdata/compiled_schema.zed
@@ -31,7 +31,7 @@ definition app/organization {
 	permission compute_receipt_get = owner + platform->superuser + granted->app_organization_administer + granted->compute_receipt_get
 	permission compute_receipt_update = owner + platform->superuser + granted->app_organization_administer + granted->compute_receipt_update
 	permission delete = platform->superuser + granted->app_organization_administer + granted->app_organization_delete + owner
-	permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + owner
+	permission get = platform->superuser + granted->app_organization_administer + granted->app_organization_get + owner + member
 	relation granted: app/rolebinding
 
 	// synthetic permissions - group