work on #1891

2 files changed, 12 insertions, 8 deletions

diff --git a/modules/middleware/auth.go b/modules/middleware/auth.go
index 823e457af6..2dd9b0fd98 100644
--- a/modules/middleware/auth.go
+++ b/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)
diff --git a/modules/middleware/context.go b/modules/middleware/context.go
index 4839ccf99e..4b217b6349 100644
--- a/modules/middleware/context.go
+++ b/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)