Skip to content

Commit 8bb46c1

Browse files
chore: update organization api permission check for owner role (#1310)
1 parent 898a084 commit 8bb46c1

File tree

1 file changed

+10
-2
lines changed

1 file changed

+10
-2
lines changed

pkg/environment/api/organization.go

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,11 @@ func (s *EnvironmentService) GetOrganization(
5252
localizer := locale.NewLocalizer(ctx)
5353
_, err := s.checkSystemAdminRole(ctx, localizer)
5454
if err != nil {
55-
return nil, err
55+
// If not system admin, check if user is organization owner
56+
_, err = s.checkOrganizationRole(ctx, req.Id, accountproto.AccountV2_Role_Organization_OWNER, localizer)
57+
if err != nil {
58+
return nil, err
59+
}
5660
}
5761
if err := s.validateGetOrganizationRequest(req, localizer); err != nil {
5862
return nil, err
@@ -734,7 +738,11 @@ func (s *EnvironmentService) UpdateOrganization(
734738
localizer := locale.NewLocalizer(ctx)
735739
editor, err := s.checkSystemAdminRole(ctx, localizer)
736740
if err != nil {
737-
return nil, err
741+
// If not system admin, check if user is organization owner
742+
editor, err = s.checkOrganizationRole(ctx, req.Id, accountproto.AccountV2_Role_Organization_OWNER, localizer)
743+
if err != nil {
744+
return nil, err
745+
}
738746
}
739747
commands := s.getUpdateOrganizationCommands(req)
740748
if err := s.validateUpdateOrganizationRequest(req.Id, commands, localizer); err != nil {

0 commit comments

Comments
 (0)