From 7a4fd54419525799952447a10268b57692449f57 Mon Sep 17 00:00:00 2001 From: Devtools Date: Fri, 2 May 2025 11:54:32 +0200 Subject: [PATCH 1/2] add givenname and famility name --- pkg/signup/service/signup_service.go | 6 ++++-- pkg/signup/service/signup_service_test.go | 2 ++ 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/signup/service/signup_service.go b/pkg/signup/service/signup_service.go index 8f6f1a90..b0f28b3e 100644 --- a/pkg/signup/service/signup_service.go +++ b/pkg/signup/service/signup_service.go @@ -344,8 +344,10 @@ func (s *ServiceImpl) DoGetSignup(ctx *gin.Context, cl namespaced.Client, userna } signupResponse := &signup.Signup{ - Name: userSignup.GetName(), - Username: userSignup.Spec.IdentityClaims.PreferredUsername, + Name: userSignup.GetName(), + Username: userSignup.Spec.IdentityClaims.PreferredUsername, + GivenName: userSignup.Spec.IdentityClaims.GivenName, + FamilyName: userSignup.Spec.IdentityClaims.FamilyName, } if userSignup.Status.CompliantUsername != "" { signupResponse.CompliantUsername = userSignup.Status.CompliantUsername diff --git a/pkg/signup/service/signup_service_test.go b/pkg/signup/service/signup_service_test.go index cf8c9b04..55b26b19 100644 --- a/pkg/signup/service/signup_service_test.go +++ b/pkg/signup/service/signup_service_test.go @@ -745,6 +745,8 @@ func (s *TestSignupServiceSuite) TestGetSignupStatusOK() { require.Equal(s.T(), us.Name, response.Name) require.Equal(s.T(), username, response.Username) + require.Equal(s.T(), us.Spec.IdentityClaims.GivenName, response.GivenName) + require.Equal(s.T(), us.Spec.IdentityClaims.FamilyName, response.FamilyName) require.Equal(s.T(), "ted", response.CompliantUsername) require.Equal(s.T(), mur.Status.ProvisionedTime.UTC().Format(time.RFC3339), response.StartDate) From 0eb4754dcda1dbfc33f95e169e4115a50b0da6d6 Mon Sep 17 00:00:00 2001 From: Alexey Kazakov Date: Fri, 2 May 2025 08:23:24 -0700 Subject: [PATCH 2/2] fix tests --- pkg/controller/signup_test.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/pkg/controller/signup_test.go b/pkg/controller/signup_test.go index 12b019a6..f1449d62 100644 --- a/pkg/controller/signup_test.go +++ b/pkg/controller/signup_test.go @@ -164,6 +164,8 @@ func (s *TestSignupSuite) TestSignupGetHandler() { Status: signup.Status{ Reason: "Provisioning", }, + FamilyName: "Bar", + GivenName: "Foo", } // when