Merge pull request #600 from reubenmiller/fix-skip-sso-on-error

reubenmiller · web-flow · commit a145646786ef · 2026-02-04T21:16:45.000+01:00
fix(set-session): skip sso login type on errors and try other login strategies
diff --git a/pkg/c8ylogin/c8ylogin.go b/pkg/c8ylogin/c8ylogin.go
@@ -453,12 +453,8 @@ func (lh *LoginHandler) login() {
 						continue
 					}
 
-					// Check error type, and if the configuration can't be found, then skip SSO
-					// add a new formal type to cover this scenario
-					// could not get OpenID Connect configuration
-					lh.state <- LoginStateAbort
-					lh.Err = fmt.Errorf("OAuth2 device authorization flow failed. %w", loginErr)
-					return lh.Err
+					lh.Logger.Infof("Skipping login type (%s) as SSO login failed. err=%s", option.Type, loginErr)
+					continue
 				}
 
 				lh.Logger.Infof("Received access token via device flow. type=%s, scope=%s, tokenPresent=%v, refreshTokenPresent=%v", accessToken.Type, accessToken.Scope, accessToken.Token != "", accessToken.RefreshToken != "")

Original file line number	Diff line number	Diff line change
`@@ -453,12 +453,8 @@ func (lh *LoginHandler) login() {`
`453`	`453`	`continue`
`454`	`454`	`}`
`455`	`455`
`456`		`- // Check error type, and if the configuration can't be found, then skip SSO`
`457`		`- // add a new formal type to cover this scenario`
`458`		`- // could not get OpenID Connect configuration`
`459`		`- lh.state <- LoginStateAbort`
`460`		`- lh.Err = fmt.Errorf("OAuth2 device authorization flow failed. %w", loginErr)`
`461`		`- return lh.Err`
	`456`	`+ lh.Logger.Infof("Skipping login type (%s) as SSO login failed. err=%s", option.Type, loginErr)`
	`457`	`+ continue`
`462`	`458`	`}`
`463`	`459`
`464`	`460`	`lh.Logger.Infof("Received access token via device flow. type=%s, scope=%s, tokenPresent=%v, refreshTokenPresent=%v", accessToken.Type, accessToken.Scope, accessToken.Token != "", accessToken.RefreshToken != "")`