From bbcf948dd66b92c449af6e8461c742f0ff381aaa Mon Sep 17 00:00:00 2001
From: Anthony Accioly <1591739+aaccioly@users.noreply.github.com>
Date: Tue, 5 Nov 2024 17:56:56 +0000
Subject: [PATCH] fix(blossom): forward requests to base relay

---
 blossom/server.go | 12 +++---------
 1 file changed, 3 insertions(+), 9 deletions(-)

diff --git a/blossom/server.go b/blossom/server.go
index e5d5435..5b9fcff 100644
--- a/blossom/server.go
+++ b/blossom/server.go
@@ -31,8 +31,6 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
 
 	base := rl.Router()
 
-	combinedMux := http.NewServeMux()
-
 	blossomApi := http.NewServeMux()
 	blossomApi.HandleFunc("PUT /upload", bs.handleUpload)
 	blossomApi.HandleFunc("HEAD /upload", bs.handleUploadCheck)
@@ -40,6 +38,7 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
 	blossomApi.HandleFunc("HEAD /{sha256}", bs.handleHasBlob)
 	blossomApi.HandleFunc("GET /{sha256}", bs.handleGetBlob)
 	blossomApi.HandleFunc("DELETE /{sha256}", bs.handleDelete)
+	blossomApi.Handle("/", base) // forwards to relay
 
 	bud01CorsMux := cors.New(cors.Options{
 		AllowedOrigins: []string{"*"},
@@ -50,13 +49,8 @@ func New(rl *khatru.Relay, serviceURL string) *BlossomServer {
 
 	wrappedBlossomApi := bud01CorsMux.Handler(blossomApi)
 
-	combinedMux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
-		if _, pattern := blossomApi.Handler(r); pattern != "" {
-			wrappedBlossomApi.ServeHTTP(w, r)
-		} else {
-			base.ServeHTTP(w, r)
-		}
-	})
+	combinedMux := http.NewServeMux()
+	combinedMux.Handle("/", wrappedBlossomApi)
 
 	rl.SetRouter(combinedMux)