updated

wpcodevo · wpcodevo · commit 0a33b66c8e3e · 2022-08-21T11:37:05.000Z
diff --git a/controllers/auth.controller.go b/controllers/auth.controller.go
@@ -235,19 +235,17 @@ func (ac *AuthController) ResetPassword(ctx *gin.Context) {
 	passwordResetToken := utils.Encode(resetToken)
 
 	var updatedUser models.User
-	result := ac.DB.First(&updatedUser, "password_reset_token = ?", passwordResetToken)
+	result := ac.DB.First(&updatedUser, "password_reset_token = ? AND password_reset_at > ?", passwordResetToken, time.Now())
 	if result.Error != nil {
-		ctx.JSON(http.StatusBadRequest, gin.H{"status": "fail", "message": "Invalid verification code or user doesn't exists"})
+		ctx.JSON(http.StatusBadRequest, gin.H{"status": "fail", "message": "The reset token is invalid or has expired"})
 		return
 	}
 
 	updatedUser.Password = hashedPassword
 	updatedUser.PasswordResetToken = ""
 	ac.DB.Save(&updatedUser)
 
-	ctx.SetCookie("access_token", "", -1, "/", "localhost", false, true)
-	ctx.SetCookie("refresh_token", "", -1, "/", "localhost", false, true)
-	ctx.SetCookie("logged_in", "", -1, "/", "localhost", false, true)
+	ctx.SetCookie("token", "", -1, "/", "localhost", false, true)
 
 	ctx.JSON(http.StatusOK, gin.H{"status": "success", "message": "Password data updated successfully"})
 }
