Browse Source

提交代码,增加登录重定向

Signed-off-by: zouap <zouap@pcl.ac.cn>
pull/3499/head
zouap 2 years ago
parent
commit
fcc3824bbd
2 changed files with 7 additions and 3 deletions
  1. +7
    -2
      modules/context/auth.go
  2. +0
    -1
      modules/context/context.go

+ 7
- 2
modules/context/auth.go View File

@@ -81,8 +81,13 @@ func Toggle(options *ToggleOptions) macaron.Handler {

// Redirect to dashboard if user tries to visit any non-login page.
if options.SignOutRequired && ctx.IsSigned && ctx.Req.URL.RequestURI() != "/" {
log.Info("YYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYYY")
ctx.Redirect(setting.AppSubURL + "/")
redirectTo := ctx.Query("redirect_to")
log.Info("redirect_to=" + redirectTo)
if len(redirectTo) > 0 {
ctx.Redirect(redirectTo)
} else {
ctx.Redirect(setting.AppSubURL + "/")
}
return
}



+ 0
- 1
modules/context/context.go View File

@@ -308,7 +308,6 @@ func Contexter() macaron.Handler {

if ctx.User != nil {
ctx.IsSigned = true
log.Info("XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX")
ctx.Data["IsSigned"] = ctx.IsSigned
ctx.Data["SignedUser"] = ctx.User
ctx.Data["SignedUserID"] = ctx.User.ID


Loading…
Cancel
Save