[entraid] parse user's given name and surname (#49496)

To populate the given name and surname traits, we must parse them from Entra ID responses. This PR parses the given name and surname artifacts from the json response. Signed-off-by: Tiago Silva <[email protected]>
gravitational · Nov 27, 2024 · a1cdc9a · a1cdc9a
1 parent e4378be
commit a1cdc9a
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 0 deletions.
diff --git a/lib/msgraph/client_test.go b/lib/msgraph/client_test.go
@@ -227,9 +227,13 @@ func TestIterateUsers(t *testing.T) {
 	require.Equal(t, "[email protected]", *users[0].Mail)
 	require.Equal(t, "Alice Alison", *users[0].DisplayName)
 	require.Equal(t, "[email protected]", *users[0].UserPrincipalName)
+	require.Nil(t, users[0].Surname)
+	require.Nil(t, users[0].GivenName)
 
 	require.Equal(t, "[email protected]", *users[1].Mail)
 	require.Equal(t, "[email protected]", *users[1].UserPrincipalName)
+	require.Equal(t, "Bobert", *users[1].Surname)
+	require.Equal(t, "Bob", *users[1].GivenName)
 
 	require.Equal(t, "[email protected]", *users[2].Mail)
 	require.Equal(t, "[email protected]", *users[2].UserPrincipalName)

diff --git a/lib/msgraph/models.go b/lib/msgraph/models.go
@@ -59,6 +59,8 @@ type User struct {
 	Mail                     *string `json:"mail,omitempty"`
 	OnPremisesSAMAccountName *string `json:"onPremisesSamAccountName,omitempty"`
 	UserPrincipalName        *string `json:"userPrincipalName,omitempty"`
+	Surname                  *string `json:"surname,omitempty"`
+	GivenName                *string `json:"givenName,omitempty"`
 }
 
 func (g *User) isGroupMember() {}