dkforest

commit 3c6630d150f40c584e1728d3159df10b22df185a
parent fb2803111131f213df873833d650952d58267528
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 14 Dec 2022 15:43:41 -0500

rename cookie

Diffstat:
M
pkg/web/handlers/handlers.go
 | 
13
+++++++------
M
pkg/web/handlers/utils/utils.go
 | 
2
+-

2 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -599,7 +599,7 @@ func SignupInvitationHandler(c echo.Context) error {
 	if _, err := database.GetUnusedInvitationByToken(invitationToken); err != nil {
 		return c.Redirect(http.StatusFound, "/")
 	}
-	return waitPageWrapper(c, signupHandler, hutils.SignupCookieName)
+	return waitPageWrapper(c, signupHandler, hutils.WaitCookieName)
 }
 
 func AesNB64(in string) string {
@@ -720,13 +720,13 @@ func SignupHandler(c echo.Context) error {
 	if config.SignupFakeEnabled.IsFalse() && config.SignupEnabled.IsFalse() {
 		return c.Render(http.StatusOK, "signup-invite", nil)
 	}
-	return waitPageWrapper(c, signupHandler, hutils.SignupCookieName)
+	return waitPageWrapper(c, signupHandler, hutils.WaitCookieName)
 }
 
 func waitPageWrapper(c echo.Context, clb echo.HandlerFunc, cookieName string) error {
 	start := time.Now().UnixNano()
 	var signupToken string
-	if cc, err := c.Cookie(hutils.SignupCookieName); err != nil {
+	if cc, err := c.Cookie(hutils.WaitCookieName); err != nil {
 		// No cookie found, we create one and display the waiting page.
 		waitTime := utils.Random(5, 15)
 		signupToken = utils.GenerateToken10()
@@ -851,7 +851,7 @@ func signupHandler(c echo.Context) error {
 
 		// If SignupFakeEnabled is enabled, we always say the account was created, but we do not create it.
 		if config.SignupFakeEnabled.IsTrue() {
-			c.SetCookie(hutils.DeleteCookie(hutils.SignupCookieName))
+			c.SetCookie(hutils.DeleteCookie(hutils.WaitCookieName))
 			return c.Render(http.StatusOK, "flash", FlashResponse{"Your account has been created", "/login", "alert-success"})
 		}
 
@@ -900,7 +900,7 @@ func signupHandler(c echo.Context) error {
 			}
 		}
 
-		c.SetCookie(hutils.DeleteCookie(hutils.SignupCookieName))
+		c.SetCookie(hutils.DeleteCookie(hutils.WaitCookieName))
 		return c.Render(http.StatusOK, "flash", FlashResponse{"Your account has been created", "/login", "alert-success"})
 	}
 
@@ -949,7 +949,7 @@ func generateCaptchaCssFrames(captchaSec int64) (frames []string) {
 
 // ForgotPasswordHandler ...
 func ForgotPasswordHandler(c echo.Context) error {
-	return waitPageWrapper(c, forgotPasswordHandler, hutils.SignupCookieName)
+	return waitPageWrapper(c, forgotPasswordHandler, hutils.WaitCookieName)
 }
 
 func forgotPasswordHandler(c echo.Context) error {
@@ -1089,6 +1089,7 @@ func forgotPasswordHandler(c echo.Context) error {
 		database.CreateSecurityLog(user.ID, database.PasswordRecoverySecurityLog)
 
 		partialRecoveryCache.Delete(token)
+		c.SetCookie(hutils.DeleteCookie(hutils.WaitCookieName))
 
 		return c.Render(http.StatusFound, "flash", FlashResponse{Message: "Password reset done", Redirect: "/login"})
 	}
diff --git a/pkg/web/handlers/utils/utils.go b/pkg/web/handlers/utils/utils.go
@@ -15,7 +15,7 @@ import (
 
 const (
 	HBCookieName        = "dkft" // dkf troll
-	SignupCookieName    = "signup-token"
+	WaitCookieName      = "wait-token"
 	AuthCookieName      = "auth-token"
 	AprilFoolCookieName = "april_fool"
 	ByteRoadCookieName  = "challenge_byte_road_session"