Add role to directory sync user (#339)

Add role to directory sync user

Author: ameesha

pkg/common/role.go

@@ -0,0 +1,6 @@
+package common
+
+type RoleResponse struct {
+	// The slug of the role
+	Slug string `json:"slug"`
+}

pkg/directorysync/client.go

@@ -131,6 +131,9 @@ type User struct {
 
 	// The User's updated at date
 	UpdatedAt string `json:"updated_at"`
+
+	// The role given to this Directory User
+	Role common.RoleResponse `json:"role,omitempty"`
 }
 
 // ListUsersOpts contains the options to request provisioned Directory Users.

pkg/directorysync/client_test.go

@@ -57,6 +57,9 @@ func TestListUsers(t *testing.T) {
 						State:            Active,
 						RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 						CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+						Role: common.RoleResponse{
+							Slug: "member",
+						},
 					},
 				},
 				ListMetadata: common.ListMetadata{
@@ -126,6 +129,7 @@ func listUsersTestHandler(w http.ResponseWriter, r *http.Request) {
 					State:            Active,
 					RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 					CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+					Role:             common.RoleResponse{Slug: "member"},
 				},
 			},
 			ListMetadata: common.ListMetadata{
@@ -291,6 +295,7 @@ func TestGetUser(t *testing.T) {
 				State:            Active,
 				RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 				CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+				Role:             common.RoleResponse{Slug: "member"},
 			},
 		},
 	}
@@ -349,6 +354,7 @@ func getUserTestHandler(w http.ResponseWriter, r *http.Request) {
 		State:            Active,
 		RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 		CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+		Role:             common.RoleResponse{Slug: "member"},
 	})
 	if err != nil {
 		w.WriteHeader(http.StatusInternalServerError)

pkg/directorysync/directorysync_test.go

@@ -21,6 +21,10 @@ func TestDirectorySyncListUsers(t *testing.T) {
 	}
 	SetAPIKey("test")
 
+	expectedRole := common.RoleResponse{
+		Slug: "member",
+	}
+
 	expectedResponse := ListUsersResponse{
 		Data: []User{
 			User{
@@ -45,6 +49,7 @@ func TestDirectorySyncListUsers(t *testing.T) {
 				State:            Active,
 				RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 				CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+				Role:             expectedRole,
 			},
 		},
 		ListMetadata: common.ListMetadata{
@@ -109,6 +114,10 @@ func TestDirectorySyncGetUser(t *testing.T) {
 	}
 	SetAPIKey("test")
 
+	expectedRole := common.RoleResponse{
+		Slug: "member",
+	}
+
 	expectedResponse := User{
 		ID:        "directory_user_id",
 		FirstName: "Rick",
@@ -131,6 +140,7 @@ func TestDirectorySyncGetUser(t *testing.T) {
 		State:            Active,
 		RawAttributes:    json.RawMessage(`{"foo":"bar"}`),
 		CustomAttributes: json.RawMessage(`{"foo":"bar"}`),
+		Role:             expectedRole,
 	}
 	directoryUserResponse, err := GetUser(context.Background(), GetUserOpts{
 		User: "directory_user_id",

pkg/usermanagement/client.go

@@ -113,11 +113,6 @@ const (
 	PendingOrganizationMembership OrganizationMembershipStatus = "pending"
 )
 
-type RoleResponse struct {
-	// The slug of the role
-	Slug string `json:"slug"`
-}
-
 // OrganizationMembership contains data about a particular OrganizationMembership.
 type OrganizationMembership struct {
 	// The Organization Membership's unique identifier.
@@ -130,7 +125,7 @@ type OrganizationMembership struct {
 	OrganizationID string `json:"organization_id"`
 
 	// The role given to this Organization Membership
-	Role RoleResponse `json:"role"`
+	Role common.RoleResponse `json:"role"`
 
 	// The Status of the Organization.
 	Status OrganizationMembershipStatus `json:"status"`

pkg/usermanagement/client_test.go

@@ -2313,7 +2313,7 @@ func TestCreateOrganizationMembership(t *testing.T) {
 				UserID:         "user_01E4ZCR3C5A4QZ2Z2JQXGKZJ9E",
 				OrganizationID: "org_01E4ZCR3C56J083X43JQXF3JK5",
 				Status:         Active,
-				Role: RoleResponse{
+				Role: common.RoleResponse{
 					Slug: "member",
 				},
 				CreatedAt: "2021-06-25T19:07:33.155Z",
@@ -2358,7 +2358,7 @@ func createOrganizationMembershipTestHandler(w http.ResponseWriter, r *http.Requ
 			UserID:         "user_01E4ZCR3C5A4QZ2Z2JQXGKZJ9E",
 			OrganizationID: "org_01E4ZCR3C56J083X43JQXF3JK5",
 			Status:         Active,
-			Role: RoleResponse{
+			Role: common.RoleResponse{
 				Slug: "member",
 			},
 			CreatedAt: "2021-06-25T19:07:33.155Z",
@@ -2401,7 +2401,7 @@ func TestUpdateOrganizationMembership(t *testing.T) {
 				UserID:         "user_01E4ZCR3C5A4QZ2Z2JQXGKZJ9E",
 				OrganizationID: "org_01E4ZCR3C56J083X43JQXF3JK5",
 				Status:         Active,
-				Role: RoleResponse{
+				Role: common.RoleResponse{
 					Slug: "member",
 				},
 				CreatedAt: "2021-06-25T19:07:33.155Z",
@@ -2446,7 +2446,7 @@ func updateOrganizationMembershipTestHandler(w http.ResponseWriter, r *http.Requ
 			UserID:         "user_01E4ZCR3C5A4QZ2Z2JQXGKZJ9E",
 			OrganizationID: "org_01E4ZCR3C56J083X43JQXF3JK5",
 			Status:         Active,
-			Role: RoleResponse{
+			Role: common.RoleResponse{
 				Slug: "member",
 			},
 			CreatedAt: "2021-06-25T19:07:33.155Z",

pkg/usermanagement/usermanagement_test.go

@@ -767,7 +767,7 @@ func TestUserManagementCreateOrganizationMembership(t *testing.T) {
 
 	SetAPIKey("test")
 
-	expectedRole := RoleResponse{
+	expectedRole := common.RoleResponse{
 		Slug: "member",
 	}
 
@@ -814,7 +814,7 @@ func TestUsersUpdateOrganizationMembership(t *testing.T) {
 
 	SetAPIKey("test")
 
-	expectedRole := RoleResponse{
+	expectedRole := common.RoleResponse{
 		Slug: "member",
 	}