Fix searchForIndexHtml returns wrong content-type in HBFileMiddleware (…

…#299) * Fix searchForIndexHtml returns wrong content-type * Follow with the existing tests.
hummingbird-project · Dec 3, 2023 · 14b5a51 · 14b5a51
1 parent 49b1ad7
commit 14b5a51
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/Sources/HummingbirdFoundation/Files/FileMiddleware.swift b/Sources/HummingbirdFoundation/Files/FileMiddleware.swift
@@ -127,12 +127,8 @@ public struct HBFileMiddleware: HBMiddleware {
                 headers.add(name: "eTag", value: eTag)
 
                 // content-type
-                if let extPointIndex = path.lastIndex(of: ".") {
-                    let extIndex = path.index(after: extPointIndex)
-                    let ext = String(path.suffix(from: extIndex))
-                    if let contentType = HBMediaType.getMediaType(forExtension: ext) {
-                        headers.add(name: "content-type", value: contentType.description)
-                    }
+                if let contentType = HBMediaType.getMediaType(forExtension: fullPath.pathExtension) {
+                    headers.add(name: "content-type", value: contentType.description)
                 }
 
                 headers.replaceOrAdd(name: "accept-ranges", value: "bytes")

diff --git a/Tests/HummingbirdFoundationTests/FilesTests.swift b/Tests/HummingbirdFoundationTests/FilesTests.swift
@@ -295,9 +295,16 @@ class HummingbirdFilesTests: XCTestCase {
         try app.XCTStart()
         defer { app.XCTStop() }
 
+        try app.XCTExecute(uri: "/index.html", method: .GET) { response in
+            var body = try XCTUnwrap(response.body)
+            XCTAssertEqual(body.readString(length: body.readableBytes), text)
+            XCTAssertEqual(response.headers.first(name: "content-type"), "text/html")
+        }
+
         try app.XCTExecute(uri: "/", method: .GET) { response in
             var body = try XCTUnwrap(response.body)
             XCTAssertEqual(body.readString(length: body.readableBytes), text)
+            XCTAssertEqual(response.headers.first(name: "content-type"), "text/html")
         }
     }