Handle case w/o html extension

bryphe-coder · bryphe-coder · commit 7a98a483a215 · 2022-02-05T02:21:49.000Z
diff --git a/nextrouter/nextrouter.go b/nextrouter/nextrouter.go
@@ -4,27 +4,17 @@ import (
 	"fmt"
 	"io/fs"
 	"net/http"
+	"path/filepath"
+	"strings"
 
 	"github.com/go-chi/chi/v5"
 )
 
-func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {
-
-	handler := func(w http.ResponseWriter, r *http.Request) {
-		fmt.Println("Requesting file: " + fileName)
-		bytes, err := fs.ReadFile(fileSystem, fileName)
-
-		if err != nil {
-			http.Error(w, http.StatusText(404), 404)
-		}
-		_, err = w.Write(bytes)
-
-		if err != nil {
-			http.Error(w, http.StatusText(404), 404)
-		}
-	}
-
-	router.Get("/"+fileName, handler)
+// Handler returns an HTTP handler for serving a next-based static site
+func Handler(fileSystem fs.FS) (http.Handler, error) {
+	rtr := chi.NewRouter()
+	buildRouter(rtr, fileSystem, "")
+	return rtr, nil
 }
 
 func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
@@ -54,9 +44,35 @@ func buildRouter(rtr chi.Router, fileSystem fs.FS, name string) {
 	}
 }
 
-// Handler returns an HTTP handler for serving a next-based static site
-func Handler(fileSystem fs.FS) (http.Handler, error) {
-	rtr := chi.NewRouter()
-	buildRouter(rtr, fileSystem, "")
-	return rtr, nil
+func serveFile(router chi.Router, fileSystem fs.FS, fileName string) {
+
+	// We only handle .html files for now
+	ext := filepath.Ext(fileName)
+	if ext != ".html" {
+		return
+	}
+
+	fmt.Println("Requesting file: " + fileName)
+	bytes, err := fs.ReadFile(fileSystem, fileName)
+
+	handler := func(w http.ResponseWriter, r *http.Request) {
+
+		if err != nil {
+			http.Error(w, http.StatusText(404), 404)
+		}
+		_, err = w.Write(bytes)
+
+		if err != nil {
+			http.Error(w, http.StatusText(404), 404)
+		}
+	}
+
+	fileNameWithoutExtension := removeFileExtension(fileName)
+
+	router.Get("/"+fileName, handler)
+	router.Get("/"+fileNameWithoutExtension, handler)
+}
+
+func removeFileExtension(fileName string) string {
+	return strings.TrimSuffix(fileName, filepath.Ext(fileName))
 }
diff --git a/nextrouter/nextrouter_test.go b/nextrouter/nextrouter_test.go
@@ -31,7 +31,6 @@ func TestNextRouter(t *testing.T) {
 
 	t.Run("Serves file at root", func(t *testing.T) {
 		t.Parallel()
-
 		rootFS := memfs.New()
 		err := rootFS.WriteFile("test.html", []byte("test123"), 0755)
 		require.NoError(t, err)
@@ -50,6 +49,26 @@ func TestNextRouter(t *testing.T) {
 		require.Equal(t, res.StatusCode, 200)
 	})
 
+	t.Run("Serves html file without extension", func(t *testing.T) {
+		t.Parallel()
+		rootFS := memfs.New()
+		err := rootFS.WriteFile("test.html", []byte("test-no-extension"), 0755)
+		require.NoError(t, err)
+
+		router, err := nextrouter.Handler(rootFS)
+		require.NoError(t, err)
+		server := httptest.NewServer(router)
+
+		res, err := request(server, "/test")
+		require.NoError(t, err)
+		defer res.Body.Close()
+
+		body, err := io.ReadAll(res.Body)
+		require.NoError(t, err)
+		require.Equal(t, string(body), "test-no-extension")
+		require.Equal(t, res.StatusCode, 200)
+	})
+
 	t.Run("Serves nested file", func(t *testing.T) {
 		t.Parallel()
 
