X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bf51a7513e3c82f9f6e662597bb9db217463af9c..d97c9ecca25f449ad928963f6257a01a8bbbf1e7:/lib/controller/localdb/login.go

diff --git a/lib/controller/localdb/login.go b/lib/controller/localdb/login.go
index df5259a846..13ae366eb4 100644
--- a/lib/controller/localdb/login.go
+++ b/lib/controller/localdb/login.go
@@ -128,7 +128,7 @@ func (ctrl *googleLoginController) Login(ctx context.Context, cluster *arvados.C
 // Google API does not indicate one.
 func (ctrl *googleLoginController) getAuthInfo(ctx context.Context, cluster *arvados.Cluster, conf *oauth2.Config, token *oauth2.Token, idToken *oidc.IDToken) (*rpc.UserSessionAuthInfo, error) {
 	var ret rpc.UserSessionAuthInfo
-	defer ctxlog.FromContext(ctx).Infof("ret: %#v", &ret) // debug
+	defer ctxlog.FromContext(ctx).WithField("ret", &ret).Debug("getAuthInfo returned")
 
 	var claims struct {
 		Name     string `json:"name"`
@@ -164,7 +164,7 @@ func (ctrl *googleLoginController) getAuthInfo(ctx context.Context, cluster *arv
 		// Override normal API endpoint (for testing)
 		svc.BasePath = p
 	}
-	person, err := people.NewPeopleService(svc).Get("people/me").Fields("emailAddresses,names").Do()
+	person, err := people.NewPeopleService(svc).Get("people/me").PersonFields("emailAddresses,names").Do()
 	if err != nil {
 		if strings.Contains(err.Error(), "Error 403") && strings.Contains(err.Error(), "accessNotConfigured") {
 			// Log the original API error, but display
@@ -176,8 +176,6 @@ func (ctrl *googleLoginController) getAuthInfo(ctx context.Context, cluster *arv
 		}
 	}
 
-	ctxlog.FromContext(ctx).Infof("people/me response: %#v", person) // debug
-
 	// The given/family names returned by the People API and
 	// flagged as "primary" (if any) take precedence over the
 	// split-by-whitespace result from above.
@@ -195,7 +193,7 @@ func (ctrl *googleLoginController) getAuthInfo(ctx context.Context, cluster *arv
 	}
 	for _, ea := range person.EmailAddresses {
 		if ea.Metadata == nil || !ea.Metadata.Verified {
-			ctxlog.FromContext(ctx).WithField("address", ea.Value).Debug("skipping unverified email address")
+			ctxlog.FromContext(ctx).WithField("address", ea.Value).Info("skipping unverified email address")
 			continue
 		}
 		altEmails[ea.Value] = true