feat: Removes old tests, fixes authentication middleware not working, view routes updated to not have delete routes and uses api routes for delete methods.
This commit is contained in:
@@ -48,6 +48,11 @@ public func configure(
|
||||
|
||||
app.middleware.use(DependenciesMiddleware(database: databaseClient))
|
||||
|
||||
// Redirect the index path to purchase order route.
|
||||
app.get { req in
|
||||
req.redirect(to: ViewRoute.router.path(for: .purchaseOrder(.index)))
|
||||
}
|
||||
|
||||
app.mount(
|
||||
SiteRoute.router,
|
||||
middleware: {
|
||||
@@ -79,7 +84,6 @@ extension SiteRoute {
|
||||
case .health:
|
||||
return nil
|
||||
case let .view(route):
|
||||
// return nil
|
||||
return route.middleware
|
||||
}
|
||||
}
|
||||
@@ -90,62 +94,13 @@ func siteHandler(
|
||||
request: Request,
|
||||
route: SiteRoute
|
||||
) async throws -> any AsyncResponseEncodable {
|
||||
@Dependency(\.viewController) var viewController
|
||||
switch route {
|
||||
case let .api(route):
|
||||
return try await route.handle(request: request)
|
||||
return try await route.respond(request: request)
|
||||
case .health:
|
||||
return HTTPStatus.ok
|
||||
case let .view(route):
|
||||
return try await route.respond(request: request)
|
||||
// return try await route.handle(request: request)
|
||||
}
|
||||
}
|
||||
|
||||
extension ViewRoute {
|
||||
func respond(request: Request) async throws -> any AsyncResponseEncodable {
|
||||
if self == .index {
|
||||
return request.redirect(to: ViewRoute.router.path(for: .purchaseOrder(.index)))
|
||||
} else {
|
||||
let html = try await view(isHtmxRequest: request.isHtmxRequest, authenticate: { request.auth.login($0) })
|
||||
// Delete routes return nil, but are valid routes.
|
||||
guard let html else {
|
||||
return HTTPStatus.ok
|
||||
}
|
||||
return AnyHTMLResponse(value: html)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
struct AnyHTMLResponse: AsyncResponseEncodable {
|
||||
|
||||
public var chunkSize: Int
|
||||
public var headers: HTTPHeaders = ["Content-Type": "text/html; charset=utf-8"]
|
||||
var value: _SendableAnyHTMLBox
|
||||
|
||||
init(chunkSize: Int = 1024, additionalHeaders: HTTPHeaders = [:], value: any HTML & Sendable) {
|
||||
self.chunkSize = chunkSize
|
||||
if additionalHeaders.contains(name: .contentType) {
|
||||
self.headers = additionalHeaders
|
||||
} else {
|
||||
headers.add(contentsOf: additionalHeaders)
|
||||
}
|
||||
self.value = .init(value)
|
||||
}
|
||||
|
||||
func encodeResponse(for request: Request) async throws -> Response {
|
||||
Response(
|
||||
status: .ok,
|
||||
headers: headers,
|
||||
body: .init(asyncStream: { [value, chunkSize] writer in
|
||||
guard let html = value.tryTake() else {
|
||||
assertionFailure("Non-sendable HTML value consumed more than once")
|
||||
request.logger.error("Non-sendable HTML value consumed more than once")
|
||||
throw Abort(.internalServerError)
|
||||
}
|
||||
try await writer.writeHTML(html, chunkSize: chunkSize)
|
||||
try await writer.write(.end)
|
||||
|
||||
})
|
||||
)
|
||||
return try await viewController.respond(route: route, request: request)
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user