diff options
Diffstat (limited to 'routers/user/auth.go')
| -rw-r--r-- | routers/user/auth.go | 12 |
1 files changed, 4 insertions, 8 deletions
diff --git a/routers/user/auth.go b/routers/user/auth.go index 6edcb914b1..d44939f50d 100644 --- a/routers/user/auth.go +++ b/routers/user/auth.go @@ -93,12 +93,8 @@ func checkAutoLogin(ctx *context.Context) bool { } if isSucceed { - if len(redirectTo) > 0 { - ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) - ctx.Redirect(redirectTo) - } else { - ctx.Redirect(setting.AppSubURL + string(setting.LandingPageURL)) - } + ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) + ctx.RedirectToFirst(redirectTo, setting.AppSubURL+string(setting.LandingPageURL)) return true } @@ -350,7 +346,7 @@ func handleSignInFull(ctx *context.Context, u *models.User, remember bool, obeyR if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) if obeyRedirect { - ctx.Redirect(redirectTo) + ctx.RedirectToFirst(redirectTo) } return } @@ -439,7 +435,7 @@ func handleOAuth2SignIn(u *models.User, gothUser goth.User, ctx *context.Context if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 { ctx.SetCookie("redirect_to", "", -1, setting.AppSubURL) - ctx.Redirect(redirectTo) + ctx.RedirectToFirst(redirectTo) return } |