Fix oauth2 error handle not return immediately (#32514) (#32516)

GiteaBot · lunny · web-flow · commit 257ce61023aa · 2024-11-15T11:27:04.000+08:00
Backport #32514 by lunny Co-authored-by: Lunny Xiao <xiaolunwen@gmail.com>
diff --git a/routers/web/auth/oauth.go b/routers/web/auth/oauth.go
@@ -953,6 +953,8 @@ func SignInOAuthCallback(ctx *context.Context) {
 		}
 		if err, ok := err.(*go_oauth2.RetrieveError); ok {
 			ctx.Flash.Error("OAuth2 RetrieveError: "+err.Error(), true)
+			ctx.Redirect(setting.AppSubURL + "/user/login")
+			return
 		}
 		ctx.ServerError("UserSignIn", err)
 		return

Original file line number	Diff line number	Diff line change
`@@ -953,6 +953,8 @@ func SignInOAuthCallback(ctx *context.Context) {`
`953`	`953`	`}`
`954`	`954`	`if err, ok := err.(*go_oauth2.RetrieveError); ok {`
`955`	`955`	`ctx.Flash.Error("OAuth2 RetrieveError: "+err.Error(), true)`
	`956`	`+ ctx.Redirect(setting.AppSubURL + "/user/login")`
	`957`	`+ return`
`956`	`958`	`}`
`957`	`959`	`ctx.ServerError("UserSignIn", err)`
`958`	`960`	`return`