dkforest

commit 69bb8eb38e38e5f50b54b0550becbfcb96091cb1
parent c71b7d1ed35740fefc63a1ed487c8a46df76b22f
Author: n0tr1v <n0tr1v@protonmail.com>
Date:   Wed, 25 Jan 2023 14:33:15 -0800

cleanup

Diffstat:
M
pkg/web/handlers/handlers.go
 | 
17
+++++++++++------

1 file changed, 11 insertions(+), 6 deletions(-)
diff --git a/pkg/web/handlers/handlers.go b/pkg/web/handlers/handlers.go
@@ -975,7 +975,12 @@ func ForgotPasswordHandler(c echo.Context) error {
 
 func forgotPasswordHandler(c echo.Context) error {
 	var data forgotPasswordData
-	data.Step = 1
+	const (
+		usernameCaptchaStep = iota + 1
+		gpgCodeSignatureStep
+		resetPasswordStep
+	)
+	data.Step = usernameCaptchaStep
 
 	data.CaptchaSec = 120
 	data.Frames = generateCssFrames(data.CaptchaSec, nil, true)
@@ -992,7 +997,7 @@ func forgotPasswordHandler(c echo.Context) error {
 
 	if formName == "step1" {
 		// Receive and validate Username/Captcha
-		data.Step = 1
+		data.Step = usernameCaptchaStep
 		data.Username = c.Request().PostFormValue("username")
 		captchaID := c.Request().PostFormValue("captcha_id")
 		captchaInput := c.Request().PostFormValue("captcha")
@@ -1032,12 +1037,12 @@ func forgotPasswordHandler(c echo.Context) error {
 		partialRecoveryCache.SetD(token, PartialRecoveryItem{user.ID, RecoveryCaptchaCompleted})
 
 		data.Token = token
-		data.Step = 2
+		data.Step = gpgCodeSignatureStep
 		return c.Render(http.StatusOK, "forgot-password", data)
 
 	} else if formName == "step2" {
 		// Receive and validate GPG code/signature
-		data.Step = 2
+		data.Step = gpgCodeSignatureStep
 
 		// Step2 is guarded by the "token" that must be valid
 		token := c.Request().PostFormValue("token")
@@ -1074,12 +1079,12 @@ func forgotPasswordHandler(c echo.Context) error {
 		partialRecoveryCache.SetD(token, PartialRecoveryItem{userID, RecoveryGpgValidated})
 
 		data.Token = token
-		data.Step = 3
+		data.Step = resetPasswordStep
 		return c.Render(http.StatusOK, "forgot-password", data)
 
 	} else if formName == "step3" {
 		// Receive and validate new password
-		data.Step = 3
+		data.Step = resetPasswordStep
 
 		// Step3 is guarded by the "token" that must be valid
 		token := c.Request().PostFormValue("token")