Merge pull request #14 from ConductorOne/mstanbCO/add_member_role

Adds support for syncing member roles
ConductorOne · Mar 11, 2024 · 5025011 · 5025011
2 parents 19c69c8 + 6242458
commit 5025011
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/pkg/connector/roles.go b/pkg/connector/roles.go
@@ -20,6 +20,7 @@ const (
 	SingleChannelGuestRoleID = "single_channel_guest"
 	InvitedMemberRoleID      = "invited_member"
 	BotRoleID                = "bot"
+	MemberRoleID             = "member"
 
 	RoleAssignmentEntitlement = "assigned"
 )
@@ -32,6 +33,7 @@ var roles = map[string]string{
 	SingleChannelGuestRoleID: "Single Channel Guest",
 	InvitedMemberRoleID:      "Invited member",
 	BotRoleID:                "Bot",
+	MemberRoleID:             "Member",
 }
 
 type workspaceRoleType struct {

diff --git a/pkg/connector/user.go b/pkg/connector/user.go
@@ -89,6 +89,14 @@ func (o *userResourceType) Grants(ctx context.Context, resource *v2.Resource, pt
 		userRoles = append(userRoles, rr)
 	}
 
+	if !user.IsRestricted && !user.IsUltraRestricted && !user.IsInvitedUser && !user.IsStranger {
+		rr, err := roleResource(MemberRoleID, resource.ParentResourceId)
+		if err != nil {
+			return nil, "", nil, err
+		}
+		userRoles = append(userRoles, rr)
+	}
+
 	if user.IsRestricted {
 		if user.IsUltraRestricted {
 			rr, err := roleResource(SingleChannelGuestRoleID, resource.ParentResourceId)