Assignment 4: add unit, integration, and e2e tests; refactor for testability

internal/middleware/require_auth.go

@@ -2,10 +2,11 @@ package middleware
 
 import (
 	"context"
+	"encoding/json"
 	"net/http"
 	"strings"
 
-	"5803025015/w04/internal/store"
+	"5803025015/w04/internal/models"
 )
 
 type contextKey string
@@ -19,35 +20,46 @@ func GetUserID(ctx context.Context) string {
 	return ""
 }
 
-type AuthMiddleware struct {
-	sessionStore *store.SessionStore
+type SessionStore interface {
+	Get(ctx context.Context, token string) (*models.Session, error)
 }
 
-func NewAuthMiddleware(sessionStore *store.SessionStore) *AuthMiddleware {
+type AuthMiddleware struct {
+	sessionStore SessionStore
+}
+
+func NewAuthMiddleware(sessionStore SessionStore) *AuthMiddleware {
 	return &AuthMiddleware{sessionStore: sessionStore}
 }
 
+func writeJSONError(w http.ResponseWriter, status int, msg string) {
+	w.Header().Set("Content-Type", "application/json")
+	w.WriteHeader(status)
+	_ = json.NewEncoder(w).Encode(map[string]string{"error": msg})
+}
+
 func (m *AuthMiddleware) RequireAuth(next http.Handler) http.Handler {
 	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		authHeader := r.Header.Get("Authorization")
 		if authHeader == "" {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			writeJSONError(w, http.StatusUnauthorized, "unauthorized")
 			return
 		}
 
-		token := authHeader
-		if strings.HasPrefix(strings.ToLower(authHeader), "bearer ") {
-			token = authHeader[7:]
+		const bearerPrefix = "bearer "
+		if !strings.HasPrefix(strings.ToLower(authHeader), bearerPrefix) {
+			writeJSONError(w, http.StatusUnauthorized, "unauthorized")
+			return
 		}
-		token = strings.TrimSpace(token)
+		token := strings.TrimSpace(authHeader[len(bearerPrefix):])
 		if token == "" {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			writeJSONError(w, http.StatusUnauthorized, "unauthorized")
 			return
 		}
 
 		session, err := m.sessionStore.Get(r.Context(), token)
 		if err != nil || session == nil {
-			http.Error(w, "Unauthorized", http.StatusUnauthorized)
+			writeJSONError(w, http.StatusUnauthorized, "unauthorized")
 			return
 		}
 
@@ -62,6 +74,6 @@ func (m *AuthMiddleware) RequireAuthFunc(next http.HandlerFunc) http.HandlerFunc
 	}
 }
 
-func RequireAuth(sessionStore *store.SessionStore) func(http.Handler) http.Handler {
+func RequireAuth(sessionStore SessionStore) func(http.Handler) http.Handler {
 	return NewAuthMiddleware(sessionStore).RequireAuth
 }