X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/bbb132e983f9ec5c7d50cf0ab709ec041af1f844..62c33a15f68895d6a388f68d2827e9fd5705c5df:/lib/controller/localdb/login_google.go diff --git a/lib/controller/localdb/login_google.go b/lib/controller/localdb/login_google.go index bf1754c158..144b04c46d 100644 --- a/lib/controller/localdb/login_google.go +++ b/lib/controller/localdb/login_google.go @@ -71,8 +71,8 @@ func (ctrl *googleLoginController) Login(ctx context.Context, opts arvados.Login return loginError(fmt.Errorf("error making redirect URL: %s", err)) } conf := &oauth2.Config{ - ClientID: ctrl.Cluster.Login.GoogleClientID, - ClientSecret: ctrl.Cluster.Login.GoogleClientSecret, + ClientID: ctrl.Cluster.Login.Google.ClientID, + ClientSecret: ctrl.Cluster.Login.Google.ClientSecret, Endpoint: provider.Endpoint(), Scopes: []string{oidc.ScopeOpenID, "profile", "email"}, RedirectURL: redirURL.String(), @@ -162,7 +162,7 @@ func (ctrl *googleLoginController) getAuthInfo(ctx context.Context, cluster *arv ret.Email = claims.Email } - if !ctrl.Cluster.Login.GoogleAlternateEmailAddresses { + if !ctrl.Cluster.Login.Google.AlternateEmailAddresses { if ret.Email == "" { return nil, fmt.Errorf("cannot log in with unverified email address %q", claims.Email) }