Merge pull request #9 from ConductorOne/jirwin/manager-email

If a user has a manager set, also set the manager field to their email address

Author: jirwin

pkg/connector/users.go

@@ -9,13 +9,16 @@ import (
 	v2 "github.com/conductorone/baton-sdk/pb/c1/connector/v2"
 	"github.com/conductorone/baton-sdk/pkg/annotations"
 	"github.com/conductorone/baton-sdk/pkg/pagination"
+	"github.com/grpc-ecosystem/go-grpc-middleware/logging/zap/ctxzap"
+	"go.uber.org/zap"
 	"google.golang.org/protobuf/types/known/structpb"
 )
 
 type userResourceType struct {
 	resourceType *v2.ResourceType
 	client1      jc1Func
 	client2      jc2Func
+	managers     map[string]*jcapi1.Systemuserreturn
 }
 
 func (o *userResourceType) ResourceType(_ context.Context) *v2.ResourceType {
@@ -27,6 +30,7 @@ func newUserBuilder(jc1 jc1Func, jc2 jc2Func) *userResourceType {
 		resourceType: resourceTypeUser,
 		client1:      jc1,
 		client2:      jc2,
+		managers:     make(map[string]*jcapi1.Systemuserreturn),
 	}
 }
 
@@ -54,7 +58,7 @@ func (o *userResourceType) List(ctx context.Context, parentResourceID *v2.Resour
 
 	var rv []*v2.Resource
 	for i := range list.Results {
-		ur, err := userResource(ctx, &list.Results[i])
+		ur, err := o.userResource(ctx, &list.Results[i])
 		if err != nil {
 			return nil, "", nil, err
 		}
@@ -69,8 +73,8 @@ func (o *userResourceType) List(ctx context.Context, parentResourceID *v2.Resour
 	return rv, pageToken, nil, nil
 }
 
-func userResource(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.Resource, error) {
-	trait, err := userTrait(ctx, user)
+func (o *userResourceType) userResource(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.Resource, error) {
+	trait, err := o.userTrait(ctx, user)
 	if err != nil {
 		return nil, err
 	}
@@ -79,19 +83,43 @@ func userResource(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.Resou
 
 	return &v2.Resource{
 		Id:          fmtResourceId(resourceTypeUser.Id, user.GetId()),
-		DisplayName: userDisplayName(user),
+		DisplayName: o.userDisplayName(user),
 		Annotations: annos,
 	}, nil
 }
 
-func userDisplayName(user *jcapi1.Systemuserreturn) string {
+func (o *userResourceType) userDisplayName(user *jcapi1.Systemuserreturn) string {
 	if dn := user.GetDisplayname(); dn != "" {
 		return dn
 	}
 	return fmt.Sprintf("%s %s", user.GetFirstname(), user.GetLastname())
 }
 
-func userTrait(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.UserTrait, error) {
+func (o *userResourceType) fetchManager(ctx context.Context, managerID string) (*jcapi1.Systemuserreturn, error) {
+	ctx, client := o.client1(ctx)
+	l := ctxzap.Extract(ctx)
+
+	manager, ok := o.managers[managerID]
+	if ok {
+		return manager, nil
+	}
+
+	m, resp, err := client.SystemusersApi.SystemusersGet(ctx, managerID).Execute()
+	if err != nil {
+		l.Error(
+			"baton-jumpcloud: failed to fetch manager details",
+			zap.Error(err),
+			zap.String("manager_id", managerID),
+		)
+		return nil, err
+	}
+	defer resp.Body.Close()
+
+	o.managers[managerID] = m
+	return m, nil
+}
+
+func (o *userResourceType) userTrait(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.UserTrait, error) {
 	profile, err := structpb.NewStruct(map[string]interface{}{
 		"id": user.GetId(),
 	})
@@ -116,7 +144,12 @@ func userTrait(ctx context.Context, user *jcapi1.Systemuserreturn) (*v2.UserTrai
 	}
 
 	if user.HasManager() {
-		profile.Fields["manager_id"] = structpb.NewStringValue(user.GetManager())
+		managerID := user.GetManager()
+		profile.Fields["manager_id"] = structpb.NewStringValue(managerID)
+		manager, err := o.fetchManager(ctx, managerID)
+		if err == nil && manager != nil {
+			profile.Fields["manager"] = structpb.NewStringValue(manager.GetEmail())
+		}
 	}
 
 	if user.HasEmployeeIdentifier() {