Fix setting public folder for FileMiddleware when using bundles (#3113

)

Fix setting public folder for bundles.

Co-authored-by: Sam Bishop <sambobjr@gmail.com>

Sources/Vapor/Middleware/FileMiddleware.swift

@@ -118,7 +118,7 @@ public final class FileMiddleware: Middleware {
             throw BundleSetupError.publicDirectoryIsNotAFolder
         }
 
-        self.init(publicDirectory: bundleResourceURL.path, defaultFile: defaultFile, directoryAction: directoryAction)
+        self.init(publicDirectory: publicDirectoryURL.path, defaultFile: defaultFile, directoryAction: directoryAction)
     }
 
     /// Possible actions to take when the request doesn't have a trailing slash but matches a directory

Tests/VaporTests/MiddlewareTests.swift

@@ -126,6 +126,21 @@ final class MiddlewareTests: XCTestCase {
         }
     }
 
+    func testFileMiddlewareFromBundleSubfolder() throws {
+        var fileMiddleware: FileMiddleware!
+
+        XCTAssertNoThrow(fileMiddleware = try FileMiddleware(bundle: .module, publicDirectory: "SubUtilities"), "FileMiddleware instantiation from Bundle should not fail")
+
+        let app = Application(.testing)
+        defer { app.shutdown() }
+        app.middleware.use(fileMiddleware)
+
+        try app.testable().test(.GET, "/index.html") { result in
+            XCTAssertEqual(result.status, .ok)
+            XCTAssertEqual(result.body.string, "<h1>Subdirectory Default</h1>\n")
+        }
+    }
+
     func testFileMiddlewareFromBundleInvalidPublicDirectory() {
         XCTAssertThrowsError(try FileMiddleware(bundle: .module, publicDirectory: "/totally-real/folder")) { error in
             guard let error = error as? FileMiddleware.BundleSetupError else {