Tuas W06

internal/handler/auth_handler.go

@@ -8,17 +8,18 @@ import (
 	"time"
 
 	"5803025020/w04/internal/auth"
+	"5803025020/w04/internal/httpjson"
 	"5803025020/w04/internal/models"
 	"5803025020/w04/internal/store"
 	"github.com/google/uuid"
 )
 
 type AuthHandler struct {
-	userStore    *store.UserStore
-	sessionStore *store.SessionStore
+	userStore    UserStore
+	sessionStore SessionStore
 }
 
-func NewAuthHandler(userStore *store.UserStore, sessionStore *store.SessionStore) *AuthHandler {
+func NewAuthHandler(userStore UserStore, sessionStore SessionStore) *AuthHandler {
 	return &AuthHandler{
 		userStore:    userStore,
 		sessionStore: sessionStore,
@@ -32,25 +33,25 @@ type authRequest struct {
 
 func (h *AuthHandler) Register(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
-		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
+		httpjson.WriteError(w, http.StatusMethodNotAllowed, "Method Not Allowed")
 		return
 	}
 
 	var req authRequest
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		http.Error(w, "Bad Request", http.StatusBadRequest)
+		httpjson.WriteError(w, http.StatusBadRequest, "Bad Request")
 		return
 	}
 
 	req.Username = strings.TrimSpace(req.Username)
 	if len(req.Username) < 3 || len(req.Username) > 32 || req.Password == "" {
-		http.Error(w, "Invalid username or password", http.StatusBadRequest)
+		httpjson.WriteError(w, http.StatusBadRequest, "Invalid username or password")
 		return
 	}
 
 	hash, err := auth.HashPassword(req.Password)
 	if err != nil {
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		httpjson.WriteError(w, http.StatusInternalServerError, "Internal Server Error")
 		return
 	}
 
@@ -62,10 +63,10 @@ func (h *AuthHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 	if err := h.userStore.Create(r.Context(), user); err != nil {
 		if errors.Is(err, store.ErrUsernameTaken) {
-			http.Error(w, "Username already exists", http.StatusConflict)
+			httpjson.WriteError(w, http.StatusConflict, "Username already exists")
 			return
 		}
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		httpjson.WriteError(w, http.StatusInternalServerError, "Internal Server Error")
 		return
 	}
 
@@ -76,25 +77,25 @@ func (h *AuthHandler) Register(w http.ResponseWriter, r *http.Request) {
 
 func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
-		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
+		httpjson.WriteError(w, http.StatusMethodNotAllowed, "Method Not Allowed")
 		return
 	}
 
 	var req authRequest
 	if err := json.NewDecoder(r.Body).Decode(&req); err != nil {
-		http.Error(w, "Bad Request", http.StatusBadRequest)
+		httpjson.WriteError(w, http.StatusBadRequest, "Bad Request")
 		return
 	}
 
 	user, err := h.userStore.GetByUsername(r.Context(), req.Username)
 	if err != nil || !auth.CheckPassword(req.Password, user.PasswordHash) {
-		http.Error(w, "Invalid credentials", http.StatusUnauthorized)
+		httpjson.WriteError(w, http.StatusUnauthorized, "Invalid credentials")
 		return
 	}
 
 	token, err := auth.GenerateToken()
 	if err != nil {
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		httpjson.WriteError(w, http.StatusInternalServerError, "Internal Server Error")
 		return
 	}
 
@@ -105,7 +106,7 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
 	}
 
 	if err := h.sessionStore.Create(r.Context(), session); err != nil {
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		httpjson.WriteError(w, http.StatusInternalServerError, "Internal Server Error")
 		return
 	}
 
@@ -116,28 +117,32 @@ func (h *AuthHandler) Login(w http.ResponseWriter, r *http.Request) {
 
 func (h *AuthHandler) Logout(w http.ResponseWriter, r *http.Request) {
 	if r.Method != http.MethodPost {
-		http.Error(w, "Method Not Allowed", http.StatusMethodNotAllowed)
+		httpjson.WriteError(w, http.StatusMethodNotAllowed, "Method Not Allowed")
 		return
 	}
 
 	authHeader := r.Header.Get("Authorization")
 	if authHeader == "" {
-		http.Error(w, "Unauthorized", http.StatusUnauthorized)
+		httpjson.WriteError(w, http.StatusUnauthorized, "Unauthorized")
 		return
 	}
 
 	token := authHeader
 	if strings.HasPrefix(strings.ToLower(authHeader), "bearer ") {
-		token = authHeader[7:]
+		token = authHeader[len("Bearer "):]
 	}
 	token = strings.TrimSpace(token)
 	if token == "" {
-		http.Error(w, "Unauthorized", http.StatusUnauthorized)
+		httpjson.WriteError(w, http.StatusUnauthorized, "Unauthorized")
 		return
 	}
 
 	if err := h.sessionStore.Delete(r.Context(), token); err != nil {
-		http.Error(w, "Internal Server Error", http.StatusInternalServerError)
+		if errors.Is(err, store.ErrSessionNotFound) {
+			httpjson.WriteError(w, http.StatusUnauthorized, "Unauthorized")
+			return
+		}
+		httpjson.WriteError(w, http.StatusInternalServerError, "Internal Server Error")
 		return
 	}