From 53ba669ba6021787003e997552e417ac4c8cd134 Mon Sep 17 00:00:00 2001
From: akuma06 <demon.akuma06@gmail.com>
Date: Sat, 26 Aug 2017 04:57:02 +0200
Subject: [PATCH] Add remember me checkbox back (#1397)

I tried locally and I'm kept logged in. @ewhal check after update that you do have the same hash set in both nyaa and sukebei. If you do, just change the domain name (".pantsu.cat") in the functions getDomainName() to the subdomain. Because I don't see why it wouldn't work otherwise
---
 templates/site/user/login.jet.html | 9 +++------
 templates/template_test.go         | 2 +-
 utils/cookies/helpers.go           | 9 +++++++--
 utils/cookies/user.go              | 5 ++++-
 utils/validator/user/forms.go      | 3 ++-
 utils/validator/user/forms_test.go | 2 +-
 6 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/templates/site/user/login.jet.html b/templates/site/user/login.jet.html
index 88fb3cfd..80ab84fe 100644
--- a/templates/site/user/login.jet.html
+++ b/templates/site/user/login.jet.html
@@ -13,13 +13,10 @@
       {{ yield errors(name="Username")}}
       <input type="password" name="password" id="password" class="form-input up-input" placeholder="{{  T("password")}}"/>
       <br/>
-      <input type="hidden" name="redirectTo" value="{{ Form.RedirectTo }}"/>
       {{ yield errors(name="Password")}}
-      <!-- <span class="button-checkbox">
-      <button type="button" class="btn hidden" data-color="info">{{  T("remember_me")}}</button>
-      <input type="checkbox" name="remember_me" id="remember_me" checked="checked">
-      <a href="" class="btn btn-link pull-right">{{  T("forgot_password")}}</a>
-    </span> -->
+      <input type="hidden" name="redirectTo" value="{{ Form.RedirectTo }}"/>
+      <input type="checkbox" name="remember_me" id="remember_me" value="remember" checked="checked"><label class="input-label" for="remember_me">{{ T("remember_me") }}</label><br><br>
+
     <input type="submit" class="form-input" value="{{  T("signin")}}"/>
     <a href="/register" class="btn btn-lg btn-primary btn-block">{{  T("register")}}</a>
   </form>
diff --git a/templates/template_test.go b/templates/template_test.go
index d82eb3be..0aad1285 100644
--- a/templates/template_test.go
+++ b/templates/template_test.go
@@ -61,7 +61,7 @@ func walkDirTest(dir string, t *testing.T) {
 	fakeDB := &models.DatabaseDump{time.Now(), 3, "test", "test"}
 	fakeLanguage := &publicSettings.Language{"English", "en", "en-us"}
 	fakeTorrentRequest := &torrentValidator.TorrentRequest{Name: "test", Magnet: "", Category: "", Remake: false, Description: "", Status: 1, Hidden: false, CaptchaID: "", WebsiteLink: "", SubCategory: 0, Languages: nil, Infohash: "", SubCategoryID: 0, CategoryID: 0, Filesize: 0, Filepath: "", FileList: nil, Trackers: nil, Tags: torrentValidator.TagsRequest{}}
-	fakeLogin := &userValidator.LoginForm{"test", "test", "/"}
+	fakeLogin := &userValidator.LoginForm{"test", "test", "/", "false"}
 	fakeRegistration := &userValidator.RegistrationForm{"test", "", "test", "test", "xxxx", "1"}
 	fakeReport := &models.TorrentReport{1, "test", 1, 1, time.Now(), fakeTorrent, fakeUser}
 	fakeOauthForm := apiValidator.CreateForm{"", "f", []string{fu}, []string{}, []string{}, "", "fedr", fu, fu, fu, fu, []string{em}, ""}
diff --git a/utils/cookies/helpers.go b/utils/cookies/helpers.go
index cbf97600..20625693 100644
--- a/utils/cookies/helpers.go
+++ b/utils/cookies/helpers.go
@@ -1,6 +1,8 @@
 package cookies
 
-import "github.com/NyaaPantsu/nyaa/config"
+import (
+	"github.com/NyaaPantsu/nyaa/config"
+)
 
 func getDomainName() string {
 	domain := config.Get().Cookies.DomainName
@@ -10,6 +12,9 @@ func getDomainName() string {
 	return domain
 }
 
-func getMaxAge() int {
+func getMaxAge(rememberMe bool) int {
+	if rememberMe {
+		return 365 * 24 * 3600
+	}
 	return config.Get().Cookies.MaxAge
 }
diff --git a/utils/cookies/user.go b/utils/cookies/user.go
index 287bc0ed..bb229683 100644
--- a/utils/cookies/user.go
+++ b/utils/cookies/user.go
@@ -101,7 +101,10 @@ func Clear(c *gin.Context) {
 
 // SetLogin sets the authentication cookie
 func SetLogin(c *gin.Context, user *models.User) (int, error) {
-	maxAge := getMaxAge()
+	maxAge := getMaxAge(false)
+	if c.PostForm("remember_me") == "remember" {
+		maxAge = getMaxAge(true)
+	}
 	validUntil := timeHelper.FewDurationLater(time.Duration(maxAge) * time.Second)
 	encoded, err := Encode(user.ID, validUntil)
 	if err != nil {
diff --git a/utils/validator/user/forms.go b/utils/validator/user/forms.go
index 8165822d..8ac6171c 100644
--- a/utils/validator/user/forms.go
+++ b/utils/validator/user/forms.go
@@ -14,7 +14,8 @@ type RegistrationForm struct {
 type LoginForm struct {
 	Username   string `validate:"required" json:"username" form:"username"`
 	Password   string `validate:"required" json:"password" form:"password"`
-	RedirectTo string `validate:"-" form:"redirectTo" json:"omitempty"`
+	RedirectTo string `validate:"-" form:"redirectTo" json:"-"`
+	RememberMe string `validate:"-" form:"remember_me" json:"-"`
 }
 
 // UserForm is used when updating a user.
diff --git a/utils/validator/user/forms_test.go b/utils/validator/user/forms_test.go
index 720640c3..c02f31ee 100644
--- a/utils/validator/user/forms_test.go
+++ b/utils/validator/user/forms_test.go
@@ -35,7 +35,7 @@ func TestForms(t *testing.T) {
 	registration := &RegistrationForm{
 		"lol", "", "testing", "testing", "xxx", "1",
 	}
-	login := &LoginForm{"lol", "testing", "/"}
+	login := &LoginForm{"lol", "testing", "/", "false"}
 	user := &UserForm{"lol", "", "", "testing", "testing", "testing", 0, ""}
 	userSettings := &UserSettingsForm{}
 	password := &PasswordForm{"testing", "testing"}