Просмотр исходного кода

Backend auth: remember cookie is needed for oauth logins as well

Torkel Ödegaard 10 лет назад
Родитель
Сommit
fc47fb8f64
1 измененных файлов с 4 добавлено и 9 удалено
  1. 4 9
      pkg/api/login.go

+ 4 - 9
pkg/api/login.go

@@ -103,15 +103,6 @@ func LoginPost(c *middleware.Context, cmd dtos.LoginCommand) {
 		return
 		return
 	}
 	}
 
 
-	// default to true here for now
-	cmd.Remember = true
-
-	if cmd.Remember {
-		days := 86400 * setting.LogInRememberDays
-		c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/")
-		c.SetSuperSecureCookie(util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/")
-	}
-
 	loginUserWithUser(user, c)
 	loginUserWithUser(user, c)
 
 
 	result := map[string]interface{}{
 	result := map[string]interface{}{
@@ -133,6 +124,10 @@ func loginUserWithUser(user *m.User, c *middleware.Context) {
 		log.Error(3, "User login with nil user")
 		log.Error(3, "User login with nil user")
 	}
 	}
 
 
+	days := 86400 * setting.LogInRememberDays
+	c.SetCookie(setting.CookieUserName, user.Login, days, setting.AppSubUrl+"/")
+	c.SetSuperSecureCookie(util.EncodeMd5(user.Rands+user.Password), setting.CookieRememberName, user.Login, days, setting.AppSubUrl+"/")
+
 	c.Session.Set(middleware.SESS_KEY_USERID, user.Id)
 	c.Session.Set(middleware.SESS_KEY_USERID, user.Id)
 }
 }