Add First and Last name to the user identity object

Signed-off-by: Radoslav Dimitrov <[email protected]>

internal/auth/interface.go

@@ -50,6 +50,11 @@ type Identity struct {
 	// UserID and HumanName are only unique within the context of a single
 	// identity provider.
 	Provider IdentityProvider
+	// FirstName and LastName are optional fields that may be provided by the
+	// identity provider. These are not guaranteed to be present, and may be
+	// empty.
+	FirstName string
+	LastName  string
 }
 
 // String implements strings.Stringer, and also provides a stable storage

internal/auth/keycloak/keycloak.go

@@ -157,11 +157,19 @@ func (k *KeyCloak) userToIdentity(user client.UserRepresentation) *auth.Identity
 	if user.Attributes == nil || user.Id == nil {
 		return nil
 	}
-	return &auth.Identity{
+	ret := &auth.Identity{
 		UserID:    *user.Id,
 		HumanName: *user.Username,
 		Provider:  k,
 	}
+	// If the user has a first and last name, return them too
+	if user.FirstName != nil {
+		ret.FirstName = *user.FirstName
+	}
+	if user.LastName != nil {
+		ret.LastName = *user.LastName
+	}
+	return ret
 }
 
 func (_ *KeyCloak) lookupGithubUser(_ context.Context, _ string) (*auth.Identity, error) {

internal/controlplane/handlers_authz.go

@@ -262,6 +262,8 @@ func (s *Server) ListRoleAssignments(
 			continue
 		}
 		as[i].DisplayName = identity.Human()
+		as[i].FirstName = identity.FirstName
+		as[i].LastName = identity.LastName
 		if mapIdToDisplay[as[i].Subject] == "" {
 			mapIdToDisplay[as[i].Subject] = identity.Human()
 		}