From a46908ae8ddc873ae5b268396e4601bff8207bb2 Mon Sep 17 00:00:00 2001
From: Giuseppe Lo Presti <giuseppe.lopresti@cern.ch>
Date: Tue, 17 Sep 2024 17:10:59 +0200
Subject: [PATCH] rest: follow up from previous commit, make sure the username
 is correctly formatted for external accounts

---
 user/rest.go | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/user/rest.go b/user/rest.go
index b57155b..8e13575 100644
--- a/user/rest.go
+++ b/user/rest.go
@@ -224,12 +224,12 @@ func (m *manager) parseAndCacheUser(ctx context.Context, i *Identity) (*userpb.U
 			Idp:      m.conf.IDProvider,
 			Type:     i.UserType(),
 		},
-		Username:    i.Upn,
 		Mail:        i.PrimaryAccountEmail,
 		DisplayName: i.DisplayName,
 		UidNumber:   int64(i.UID),
 		GidNumber:   int64(i.GID),
 	}
+	u.Username = utils.FormatUserID(u.Id)
 
 	if err := m.cacheUserDetails(u); err != nil {
 		log.Error().Err(err).Msg("rest: error caching user details")