Add multiple conferences feature

1 files changed, 30 insertions, 8 deletions

diff --git a/api/middleware/auth.go b/api/middleware/auth.go
index eb362b0..438a8a1 100644
--- a/api/middleware/auth.go
+++ b/api/middleware/auth.go
@@ -3,7 +3,9 @@ package middleware
 import (
 	"context"
 	"errors"
+	"fmt"
 	"net/http"
+	"strings"
 
 	"github.com/LMBishop/confplanner/api/dto"
 	"github.com/LMBishop/confplanner/pkg/session"
@@ -13,15 +15,17 @@ import (
 func MustAuthenticate(service user.Service, store session.Service) func(http.HandlerFunc) http.HandlerFunc {
 	return func(next http.HandlerFunc) http.HandlerFunc {
 		return func(w http.ResponseWriter, r *http.Request) {
-			var sessionToken string
-			for _, cookie := range r.Cookies() {
-				if cookie.Name == "confplanner_session" {
-					sessionToken = cookie.Value
-					break
-				}
+			authHeader := r.Header.Get("Authorization")
+			token, err := extractBearerToken(authHeader)
+			if err != nil {
+				dto.WriteDto(w, r, &dto.ErrorResponse{
+					Code:    http.StatusUnauthorized,
+					Message: "Unauthorized",
+				})
+				return
 			}
 
-			s := store.GetByToken(sessionToken)
+			s := store.GetByToken(token)
 			if s == nil {
 				dto.WriteDto(w, r, &dto.ErrorResponse{
 					Code:    http.StatusUnauthorized,
@@ -30,7 +34,7 @@ func MustAuthenticate(service user.Service, store session.Service) func(http.Han
 				return
 			}
 
-			_, err := service.GetUserByID(s.UserID)
+			u, err := service.GetUserByID(s.UserID)
 			if err != nil {
 				if errors.Is(err, user.ErrUserNotFound) {
 					store.Destroy(s.SessionID)
@@ -44,9 +48,27 @@ func MustAuthenticate(service user.Service, store session.Service) func(http.Han
 				return
 			}
 
+			s.Username = u.Username
+			s.Admin = u.Admin
+
 			ctx := context.WithValue(r.Context(), "session", s)
 
 			next(w, r.WithContext(ctx))
 		}
 	}
 }
+
+func extractBearerToken(header string) (string, error) {
+	const prefix = "Bearer "
+	if header == "" {
+		return "", fmt.Errorf("authorization header missing")
+	}
+	if !strings.HasPrefix(header, prefix) {
+		return "", fmt.Errorf("invalid authorization scheme")
+	}
+	token := strings.TrimSpace(header[len(prefix):])
+	if token == "" {
+		return "", fmt.Errorf("token is empty")
+	}
+	return token, nil
+}