use gorilla mux for routing in server and kms

shared/http/middleware.go

@@ -1,29 +1,59 @@
 package http
 
-import "net/http"
+import (
+	"context"
+	"errors"
+	"net/http"
+)
 
-func CorsMiddleware(next http.Handler, origin string) http.Handler {
+func CorsMiddleware(origin string) func(http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return func(next http.Handler) http.Handler {
-		w.Header().Set("Access-Control-Allow-Credentials", "true")
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		w.Header().Set("Access-Control-Allow-Methods", "POST,GET")
+			w.Header().Set("Access-Control-Allow-Credentials", "true")
-		w.Header().Set("Access-Control-Allow-Origin", origin)
+			w.Header().Set("Access-Control-Allow-Methods", "POST,GET")
-		next.ServeHTTP(w, r)
+			w.Header().Set("Access-Control-Allow-Origin", origin)
-	})
+			next.ServeHTTP(w, r)
+		})
+	}
 }
 
-func ContentTypeMiddleware(next http.Handler, contentType string) http.Handler {
+func ContentTypeMiddleware(contentType string) func(http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return func(next http.Handler) http.Handler {
-		w.Header().Add("Content-Type", contentType)
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		next.ServeHTTP(w, r)
+			w.Header().Add("Content-Type", contentType)
-	})
+			next.ServeHTTP(w, r)
+		})
+	}
 }
 
-func OptoutMiddleware(next http.Handler) http.Handler {
+func OptoutMiddleware(cookieName string) func(http.Handler) http.Handler {
-	return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	return func(next http.Handler) http.Handler {
-		if _, err := r.Cookie("optout"); err == nil {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-			w.WriteHeader(http.StatusNoContent)
+			if _, err := r.Cookie(cookieName); err == nil {
-			return
+				w.WriteHeader(http.StatusNoContent)
-		}
+				return
-		next.ServeHTTP(w, r)
+			}
-	})
+			next.ServeHTTP(w, r)
+		})
+	}
+}
+
+func UserCookieMiddleware(cookieKey string, contextKey interface{}) func(http.Handler) http.Handler {
+	return func(next http.Handler) http.Handler {
+		return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+			c, err := r.Cookie(cookieKey)
+			if err != nil {
+				RespondWithJSONError(w, err, http.StatusBadRequest)
+				return
+			}
+			if c.Value == "" {
+				RespondWithJSONError(w, errors.New("received blank user identifier"), http.StatusBadRequest)
+				return
+			}
+			r = r.WithContext(
+				context.WithValue(r.Context(), contextKey, c.Value),
+			)
+			next.ServeHTTP(w, r)
+		})
+	}
 }

shared/http/middleware_test.go

@@ -8,9 +8,9 @@ import (
 
 func TestCorsMiddleware(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
-		wrapped := CorsMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		wrapped := CorsMiddleware("https://www.example.net")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.Write([]byte("OK"))
-		}), "https://www.example.net")
+		}))
 		w := httptest.NewRecorder()
 		r := httptest.NewRequest(http.MethodGet, "/", nil)
 		wrapped.ServeHTTP(w, r)
@@ -22,9 +22,9 @@ func TestCorsMiddleware(t *testing.T) {
 
 func TestContentTypeMiddleware(t *testing.T) {
 	t.Run("default", func(t *testing.T) {
-		wrapped := ContentTypeMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+		wrapped := ContentTypeMiddleware("application/json")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 			w.Write([]byte("OK"))
-		}), "application/json")
+		}))
 		w := httptest.NewRecorder()
 		r := httptest.NewRequest(http.MethodGet, "/", nil)
 		wrapped.ServeHTTP(w, r)
@@ -35,7 +35,7 @@ func TestContentTypeMiddleware(t *testing.T) {
 }
 
 func TestOptoutMiddleware(t *testing.T) {
-	wrapped := OptoutMiddleware(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
+	wrapped := OptoutMiddleware("optout")(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 		w.Write([]byte("hey there"))
 	}))
 	t.Run("with header", func(t *testing.T) {