feat: Add/delete/change roles to organization members- Including Team…

… level roles
jianyuan · Dec 7, 2023 · 5b056fb · 5b056fb
1 parent d6f394e
commit 5b056fb
Show file tree

Hide file tree

Showing 2 changed files with 322 additions and 44 deletions.
diff --git a/sentry/organization_members.go b/sentry/organization_members.go
@@ -9,27 +9,31 @@ import (
 // OrganizationMember represents a User's membership to the organization.
 // https://github.com/getsentry/sentry/blob/22.5.0/src/sentry/api/serializers/models/organization_member/response.py#L57-L69
 type OrganizationMember struct {
-	ID           string          `json:"id"`
-	Email        string          `json:"email"`
-	Name         string          `json:"name"`
-	User         User            `json:"user"`
-	Role         string          `json:"role"`
-	RoleName     string          `json:"roleName"`
-	Pending      bool            `json:"pending"`
-	Expired      bool            `json:"expired"`
-	Flags        map[string]bool `json:"flags"`
-	DateCreated  time.Time       `json:"dateCreated"`
-	InviteStatus string          `json:"inviteStatus"`
-	InviterName  *string         `json:"inviterName"`
-	Teams        []string        `json:"teams"`
+	ID               string          `json:"id"`
+	Email            string          `json:"email"`
+	Name             string          `json:"name"`
+	User             User            `json:"user"`
+	Role             string          `json:"role"`     // Deprecated
+	RoleName         string          `json:"roleName"` // Deprecated
+	OrganizationRole string          `json:"orgRole"`
+	Pending          bool            `json:"pending"`
+	Expired          bool            `json:"expired"`
+	Flags            map[string]bool `json:"flags"`
+	DateCreated      time.Time       `json:"dateCreated"`
+	InviteStatus     string          `json:"inviteStatus"`
+	InviterName      *string         `json:"inviterName"`
+	Teams            []string        `json:"teams"`
+	TeamRoles        []TeamRole      `json:"teamRoles"`
 }
 
 const (
-	RoleMember  string = "member"
-	RoleBilling string = "billing"
-	RoleAdmin   string = "admin"
-	RoleOwner   string = "owner"
-	RoleManager string = "manager"
+	OrganizationRoleBilling string = "billing"
+	OrganizationRoleMember  string = "member"
+	OrganizationRoleManager string = "manager"
+	OrganizationRoleOwner   string = "owner"
+
+	TeamRoleContributor string = "contributor"
+	TeamRoleAdmin       string = "admin"
 )
 
 // OrganizationMembersService provides methods for accessing Sentry membership API endpoints.
@@ -92,9 +96,14 @@ func (s *OrganizationMembersService) Create(ctx context.Context, organizationSlu
 	return member, resp, nil
 }
 
+type TeamRole struct {
+	TeamSlug string `json:"teamSlug"`
+	Role     string `json:"role"`
+}
+
 type UpdateOrganizationMemberParams struct {
-	Role  string   `json:"role"`
-	Teams []string `json:"teams,omitempty"`
+	OrganizationRole string     `json:"role"`
+	TeamRoles        []TeamRole `json:"teamRoles"`
 }
 
 func (s *OrganizationMembersService) Update(ctx context.Context, organizationSlug string, memberID string, params *UpdateOrganizationMemberParams) (*OrganizationMember, *Response, error) {