mirrors/gitea
1
0
Fork 0
mirror of https://github.com/go-gitea/gitea.git synced 2025-10-06 16:56:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

Make "/user/login" page redirect if the current user has signed in (#29583) (#29599)

Browse Source 
Backport #29583
This commit is contained in:
wxiaoguang
2024-03-05 21:03:45 +08:00
committed by GitHub
parent 4ef7e496b8
commit 02df269d24
4 changed files with 65 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
routers/web/auth/auth.go
View File

@@ -109,9 +109,21 @@ func resetLocale(ctx *context.Context, u *user_model.User) error {
return nil
}
func RedirectAfterLogin(ctx *context.Context) {
redirectTo := ctx.FormString("redirect_to")
if redirectTo == "" {
redirectTo = ctx.GetSiteCookie("redirect_to")
}
middleware.DeleteRedirectToCookie(ctx.Resp)
nextRedirectTo := setting.AppSubURL + string(setting.LandingPageURL)
if setting.LandingPageURL == setting.LandingPageLogin {
nextRedirectTo = setting.AppSubURL + "/" // do not cycle-redirect to the login page
}
ctx.RedirectToFirst(redirectTo, nextRedirectTo)
}
func checkAutoLogin(ctx *context.Context) bool {
// Check auto-login
isSucceed, err := AutoSignIn(ctx)
isSucceed, err := AutoSignIn(ctx) // try to auto-login
if err != nil {
ctx.ServerError("AutoSignIn", err)
return true
@@ -120,17 +132,10 @@ func checkAutoLogin(ctx *context.Context) bool {
redirectTo := ctx.FormString("redirect_to")
if len(redirectTo) > 0 {
middleware.SetRedirectToCookie(ctx.Resp, redirectTo)
} else {
redirectTo = ctx.GetSiteCookie("redirect_to")
}
if isSucceed {
middleware.DeleteRedirectToCookie(ctx.Resp)
nextRedirectTo := setting.AppSubURL + string(setting.LandingPageURL)
if setting.LandingPageURL == setting.LandingPageLogin {
nextRedirectTo = setting.AppSubURL + "/" // do not cycle-redirect to the login page
}
ctx.RedirectToFirst(redirectTo, nextRedirectTo)
RedirectAfterLogin(ctx)
return true
}
@@ -146,6 +151,10 @@ func SignIn(ctx *context.Context) {
return
}
if ctx.IsSigned {
RedirectAfterLogin(ctx)
return
}
orderedOAuth2Names, oauth2Providers, err := oauth2.GetOAuth2ProvidersMap(true)
if err != nil {
ctx.ServerError("UserSignIn", err)