From 60604ad3dbf8b78de046634eda35bb6f4899eb07 Mon Sep 17 00:00:00 2001 From: Thom Seddon Date: Tue, 12 May 2020 13:42:58 +0100 Subject: [PATCH] Always prompt user to select account on google login This closes #103 and as discussed in that issue, hopefully fixes a common source of error discussed in #31 --- internal/config_test.go | 2 ++ internal/provider/google.go | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/internal/config_test.go b/internal/config_test.go index 5b4e4ba..a4e6bc1 100644 --- a/internal/config_test.go +++ b/internal/config_test.go @@ -35,6 +35,8 @@ func TestConfigDefaults(t *testing.T) { assert.Equal(time.Second*time.Duration(43200), c.Lifetime) assert.Equal("/_oauth", c.Path) assert.Len(c.Whitelist, 0) + + assert.Equal("select_account", c.Providers.Google.Prompt) } func TestConfigParseArgs(t *testing.T) { diff --git a/internal/provider/google.go b/internal/provider/google.go index c19aaa0..1c0d6d1 100644 --- a/internal/provider/google.go +++ b/internal/provider/google.go @@ -13,7 +13,7 @@ type Google struct { ClientID string `long:"client-id" env:"CLIENT_ID" description:"Client ID"` ClientSecret string `long:"client-secret" env:"CLIENT_SECRET" description:"Client Secret" json:"-"` Scope string - Prompt string `long:"prompt" env:"PROMPT" description:"Space separated list of OpenID prompt options"` + Prompt string `long:"prompt" env:"PROMPT" default:"select_account" description:"Space separated list of OpenID prompt options"` LoginURL *url.URL TokenURL *url.URL