[ARVADOS] updated: 2.1.0-903-gae1f6a36a

[Git user]

Summary of changes:
 lib/controller/localdb/login_oidc.go      |  4 ++--
 lib/controller/localdb/login_oidc_test.go | 11 +++++++----
 2 files changed, 9 insertions(+), 6 deletions(-)

       via  ae1f6a36ad655640138378657f1bc33c657ad56b (commit)
      from  5c8a7da1f403b44adfdd1f132988bdffc21d9228 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit ae1f6a36ad655640138378657f1bc33c657ad56b
Author: Nico Cesar <nico at nicocesar.com>
Date:   Tue Jun 8 15:06:39 2021 -0400

    given_name and family_name added
    
    Arvados-DCO-1.1-Signed-off-by: Nico Cesar <nico at curii.com>

diff --git a/lib/controller/localdb/login_oidc.go b/lib/controller/localdb/login_oidc.go
index 294b09d09..2cae14e39 100644
--- a/lib/controller/localdb/login_oidc.go
+++ b/lib/controller/localdb/login_oidc.go
@@ -176,11 +176,11 @@ func (ctrl *oidcLoginController) getAuthInfo(ctx context.Context, token *oauth2.
 		return nil, fmt.Errorf("error extracting claims from token: %s", err)
 	} else if verified, _ := claims[ctrl.EmailVerifiedClaim].(bool); verified || ctrl.EmailVerifiedClaim == "" {
 		givenName, ok := claims["given_name"].(string)
-		if ok {
+		if ok && givenName != "" {
 			ret.FirstName = givenName
 		}
 		familyName, ok := claims["family_name"].(string)
-		if ok {
+		if ok && familyName != "" {
 			ret.LastName = familyName
 		} else {
 			// Fall back to this info if the People API call
diff --git a/lib/controller/localdb/login_oidc_test.go b/lib/controller/localdb/login_oidc_test.go
index e719a8c5e..df18e380c 100644
--- a/lib/controller/localdb/login_oidc_test.go
+++ b/lib/controller/localdb/login_oidc_test.go
@@ -56,8 +56,8 @@ func (s *OIDCLoginSuite) SetUpTest(c *check.C) {
 	s.fakeProvider.AuthEmail = "active-user at arvados.local"
 	s.fakeProvider.AuthEmailVerified = true
 	s.fakeProvider.AuthName = "Fake User Name"
-	s.fakeProvider.AuthGivenName = "Fake"
-	s.fakeProvider.AuthFamilyName = "User Name"
+	s.fakeProvider.AuthGivenName = "Fake User"
+	s.fakeProvider.AuthFamilyName = "Name"
 	s.fakeProvider.ValidCode = fmt.Sprintf("abcdefgh-%d", time.Now().Unix())
 	s.fakeProvider.PeopleAPIResponse = map[string]interface{}{}
 
@@ -423,8 +423,8 @@ func (s *OIDCLoginSuite) TestGoogleLogin_Success(c *check.C) {
 	c.Check(token, check.Matches, `v2/zzzzz-gj3su-.{15}/.{32,50}`)
 
 	authinfo := getCallbackAuthInfo(c, s.railsSpy)
-	c.Check(authinfo.FirstName, check.Equals, "Fake")
-	c.Check(authinfo.LastName, check.Equals, "User Name")
+	c.Check(authinfo.FirstName, check.Equals, "Fake User")
+	c.Check(authinfo.LastName, check.Equals, "Name")
 	c.Check(authinfo.Email, check.Equals, "active-user at arvados.local")
 	c.Check(authinfo.AlternateEmails, check.HasLen, 0)
 
@@ -448,6 +448,7 @@ func (s *OIDCLoginSuite) TestGoogleLogin_Success(c *check.C) {
 
 func (s *OIDCLoginSuite) TestGoogleLogin_RealName(c *check.C) {
 	s.fakeProvider.AuthEmail = "joe.smith at primary.example.com"
+	s.fakeProvider.AuthEmailVerified = true
 	s.fakeProvider.PeopleAPIResponse = map[string]interface{}{
 		"names": []map[string]interface{}{
 			{
@@ -475,6 +476,8 @@ func (s *OIDCLoginSuite) TestGoogleLogin_RealName(c *check.C) {
 
 func (s *OIDCLoginSuite) TestGoogleLogin_OIDCRealName(c *check.C) {
 	s.fakeProvider.AuthName = "Joe P. Smith"
+	s.fakeProvider.AuthGivenName = ""
+	s.fakeProvider.AuthFamilyName = ""
 	s.fakeProvider.AuthEmail = "joe.smith at primary.example.com"
 	state := s.startLogin(c)
 	s.localdb.Login(context.Background(), arvados.LoginOptions{

-----------------------------------------------------------------------


hooks/post-receive
--