work on #1891

modules/middleware/auth.go

@@ -109,6 +109,18 @@ func Toggle(options *ToggleOptions) macaron.Handler {
 			}
 		}
 
+		// Try auto-signin when not signed in.
+		if !ctx.IsSigned {
+			succeed, err := AutoSignIn(ctx)
+			if err != nil {
+				ctx.Handle(500, "AutoSignIn", err)
+				return
+			} else if succeed {
+				ctx.Redirect(ctx.Req.URL.Path)
+				return
+			}
+		}
+
 		if options.AdminRequire {
 			if !ctx.User.IsAdmin {
 				ctx.Error(403)

modules/middleware/context.go

@@ -209,14 +209,6 @@ func Contexter() macaron.Handler {
 
 		ctx.Data["PageStartTime"] = time.Now()
 
-		// Check auto-signin.
-		if sess.Get("uid") == nil {
-			if _, err := AutoSignIn(ctx); err != nil {
-				ctx.Handle(500, "AutoSignIn", err)
-				return
-			}
-		}
-
 		// Get user from session if logined.
 		ctx.User, ctx.IsBasicAuth = auth.SignedInUser(ctx.Context, ctx.Session)
 

routers/user/auth.go

@@ -40,8 +40,9 @@ func SignIn(ctx *middleware.Context) {
 		if redirectTo, _ := url.QueryUnescape(ctx.GetCookie("redirect_to")); len(redirectTo) > 0 {
 			ctx.SetCookie("redirect_to", "", -1, setting.AppSubUrl)
 			ctx.Redirect(redirectTo)
+		} else {
+			ctx.Redirect(setting.AppSubUrl + "/")
 		}
-		ctx.Redirect(setting.AppSubUrl + "/")
 		return
 	}