🐛 Authenticate wrong payload hotfix

This commit is contained in:
2024-06-26 18:07:07 +08:00
parent ab5130de2a
commit ebdb6f5688
4 changed files with 12 additions and 11 deletions

View File

@ -12,7 +12,7 @@ import (
func doAuthenticate(c *fiber.Ctx) error {
var data struct {
Username string `json:"username"`
Username string `json:"username" validate:"required"`
Password string `json:"password" validate:"required"`
}
@ -34,7 +34,7 @@ func doAuthenticate(c *fiber.Ctx) error {
ticket, err = services.ActiveTicketWithPassword(ticket, data.Password)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("invalid password: %v", err.Error()))
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to authenticate: %v", err.Error()))
}
return c.JSON(fiber.Map{
@ -66,7 +66,7 @@ func doMultiFactorAuthenticate(c *fiber.Ctx) error {
ticket, err = services.ActiveTicketWithMFA(ticket, factor, data.Code)
if err != nil {
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("invalid code: %v", err.Error()))
return fiber.NewError(fiber.StatusBadRequest, fmt.Sprintf("failed to authenticate: %v", err.Error()))
}
return c.JSON(fiber.Map{

View File

@ -3,6 +3,7 @@ package services
import (
"fmt"
"github.com/samber/lo"
"strings"
"git.solsynth.dev/hydrogen/passport/pkg/internal/database"
"git.solsynth.dev/hydrogen/passport/pkg/internal/models"
@ -99,7 +100,7 @@ func CheckFactor(factor models.AuthFactor, code string) error {
)
case models.EmailPasswordFactor:
return lo.Ternary(
code == factor.Secret,
strings.ToUpper(code) == strings.ToUpper(factor.Secret),
nil,
fmt.Errorf("invalid verification code"),
)