diff --git a/client/internal/auth/pkce_flow.go b/client/internal/auth/pkce_flow.go index c03376f5b..cc43c8648 100644 --- a/client/internal/auth/pkce_flow.go +++ b/client/internal/auth/pkce_flow.go @@ -107,10 +107,9 @@ func (p *PKCEAuthorizationFlow) RequestAuthInfo(ctx context.Context) (AuthFlowIn if !p.providerConfig.DisablePromptLogin { switch p.providerConfig.LoginFlag { case common.LoginFlagPromptLogin: - params = append(params, oauth2.SetAuthURLParam("prompt", "login select_account")) + params = append(params, oauth2.SetAuthURLParam("prompt", "login")) case common.LoginFlagMaxAge0: params = append(params, oauth2.SetAuthURLParam("max_age", "0")) - params = append(params, oauth2.SetAuthURLParam("prompt", "select_account")) } } if p.providerConfig.LoginHint != "" { diff --git a/client/internal/auth/pkce_flow_test.go b/client/internal/auth/pkce_flow_test.go index b5843f104..b77a17eaa 100644 --- a/client/internal/auth/pkce_flow_test.go +++ b/client/internal/auth/pkce_flow_test.go @@ -15,9 +15,8 @@ import ( func TestPromptLogin(t *testing.T) { const ( - promptSelectAccountLogin = "prompt=login+select_account" - promptSelectAccount = "prompt=select_account" - maxAge0 = "max_age=0" + promptLogin = "prompt=login" + maxAge0 = "max_age=0" ) tt := []struct { @@ -27,14 +26,14 @@ func TestPromptLogin(t *testing.T) { expectContains []string }{ { - name: "Prompt login with select account", + name: "Prompt login", loginFlag: mgm.LoginFlagPromptLogin, - expectContains: []string{promptSelectAccountLogin}, + expectContains: []string{promptLogin}, }, { - name: "Max age 0 with select account", + name: "Max age 0", loginFlag: mgm.LoginFlagMaxAge0, - expectContains: []string{maxAge0, promptSelectAccount}, + expectContains: []string{maxAge0}, }, { name: "Disable prompt login", diff --git a/shared/management/client/common/types.go b/shared/management/client/common/types.go index 550bcde30..451578358 100644 --- a/shared/management/client/common/types.go +++ b/shared/management/client/common/types.go @@ -6,14 +6,14 @@ package common // // | Value | Flag | OAuth Parameters | // |-------|----------------------|-----------------------------------------| -// | 0 | LoginFlagPromptLogin | prompt=select_account login | -// | 1 | LoginFlagMaxAge0 | max_age=0 & prompt=select_account | +// | 0 | LoginFlagPromptLogin | prompt=login | +// | 1 | LoginFlagMaxAge0 | max_age=0 | type LoginFlag uint8 const ( - // LoginFlagPromptLogin adds prompt=select_account login to the authorization request + // LoginFlagPromptLogin adds prompt=login to the authorization request LoginFlagPromptLogin LoginFlag = iota - // LoginFlagMaxAge0 adds max_age=0 and prompt=select_account to the authorization request + // LoginFlagMaxAge0 adds max_age=0 to the authorization request LoginFlagMaxAge0 // LoginFlagNone disables all login flags LoginFlagNone