From ebdb6f5688f48c9eede4d9d1b3bdab1716247263 Mon Sep 17 00:00:00 2001
From: LittleSheep <littlesheep.code@hotmail.com>
Date: Wed, 26 Jun 2024 18:07:07 +0800
Subject: [PATCH] :bug: Authenticate wrong payload hotfix

---
 .idea/workspace.xml                      | 12 ++++++------
 pkg/internal/server/api/auth_api.go      |  6 +++---
 pkg/internal/services/factors.go         |  3 ++-
 web/src/components/auth/Authenticate.vue |  2 +-
 4 files changed, 12 insertions(+), 11 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 2bc673f..26431f1 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -4,11 +4,11 @@
     <option name="autoReloadType" value="ALL" />
   </component>
   <component name="ChangeListManager">
-    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":bug: Fix frontend">
-      <change afterPath="$PROJECT_DIR$/pkg/internal/models/statuses.go" afterDir="false" />
+    <list default="true" id="3fefb2c4-b6f9-466b-a523-53352e8d6f95" name="更改" comment=":card_file_box: Add the status model">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/database/migrator.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/database/migrator.go" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/pkg/internal/models/accounts.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/models/accounts.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/server/api/auth_api.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/server/api/auth_api.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/pkg/internal/services/factors.go" beforeDir="false" afterPath="$PROJECT_DIR$/pkg/internal/services/factors.go" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/web/src/components/auth/Authenticate.vue" beforeDir="false" afterPath="$PROJECT_DIR$/web/src/components/auth/Authenticate.vue" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -146,7 +146,6 @@
     </option>
   </component>
   <component name="VcsManagerConfiguration">
-    <MESSAGE value=":bug: Fix APNs pushes no sound" />
     <MESSAGE value=":bug: Fix APNs pushes no sound (again)" />
     <MESSAGE value=":fire: Remove ws connected does not push notify feature" />
     <MESSAGE value=":sparkles: Able to read current user's realm profile" />
@@ -171,7 +170,8 @@
     <MESSAGE value=":sparkles: Better avatar and banner APIs" />
     <MESSAGE value=":bug: Fix avatar and banner APIs" />
     <MESSAGE value=":bug: Fix frontend" />
-    <option name="LAST_COMMIT_MESSAGE" value=":bug: Fix frontend" />
+    <MESSAGE value=":card_file_box: Add the status model" />
+    <option name="LAST_COMMIT_MESSAGE" value=":card_file_box: Add the status model" />
   </component>
   <component name="VgoProject">
     <settings-migrated>true</settings-migrated>
diff --git a/pkg/internal/server/api/auth_api.go b/pkg/internal/server/api/auth_api.go
index dd6f546..5104dde 100644
--- a/pkg/internal/server/api/auth_api.go
+++ b/pkg/internal/server/api/auth_api.go
@@ -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{
diff --git a/pkg/internal/services/factors.go b/pkg/internal/services/factors.go
index 4a30bf8..8228dab 100644
--- a/pkg/internal/services/factors.go
+++ b/pkg/internal/services/factors.go
@@ -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"),
 		)
diff --git a/web/src/components/auth/Authenticate.vue b/web/src/components/auth/Authenticate.vue
index 22fc05a..6056427 100755
--- a/web/src/components/auth/Authenticate.vue
+++ b/web/src/components/auth/Authenticate.vue
@@ -49,7 +49,7 @@ async function submit() {
   const res = await request("/api/auth", {
     method: "POST",
     headers: { "Content-Type": "application/json" },
-    body: JSON.stringify({ id: probe.value, password: password.value }),
+    body: JSON.stringify({ username: probe.value, password: password.value }),
   })
   if (res.status !== 200) {
     error.value = await res.text()