15107: Fix personFields parameter.

Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tclegg@veritasgenetics.com>

diff --git a/lib/controller/localdb/login.go b/lib/controller/localdb/login.go
index df5259a846bbac112c4ee3fa30c7dc5b7f03a60f..6d60adf146cac7779e2e9dd6ebfd2d8c17acc492 100644 (file)
--- a/lib/controller/localdb/login.go
+++ b/lib/controller/localdb/login.go
@@ -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

diff --git a/lib/controller/localdb/login_test.go b/lib/controller/localdb/login_test.go
index e722d04d5e127df44b8197212442518906f99670..c5b9ee06832cd663b10893ed3858a3a901437370 100644 (file)
--- a/lib/controller/localdb/login_test.go
+++ b/lib/controller/localdb/login_test.go
@@ -133,7 +133,7 @@ func (s *LoginSuite) SetUpTest(c *check.C) {
                w.Header().Set("Content-Type", "application/json")
                switch req.URL.Path {
                case "/v1/people/me":
-                       if f := req.Form.Get("fields"); f != "emailAddresses,names" {
+                       if f := req.Form.Get("personFields"); f != "emailAddresses,names" {
                                w.WriteHeader(http.StatusBadRequest)
                                break
                        }