Project updates from Template (#1)

This PR contains the latest updates from the generic Website template, which have been added while working on #loud-amsterdam.

Reviewed-on: #1
Co-authored-by: Javier Cicchelli <javier@rock-n-code.com>

Services/Website/Sources/App/Extensions/App+Build.swift

@@ -16,7 +16,8 @@ import WebsiteLibrary
 /// band (so a shared database is never migrated on boot).
 /// - Parameter reader: the configuration reader the values are read from.
 /// - Returns: the configured application, ready to run as a service.
-/// - Throws: an error when the persistence service cannot be built (e.g. its TLS context fails to build).
+/// - Throws: a ``ConfigError`` when a `database.*` key holds an unrecognized token, or an error when the persistence service cannot be built
+///   (e.g. its TLS context fails to build).
 func application(
     reader: ConfigReader
 ) async throws -> some ApplicationProtocol {
@@ -34,8 +35,9 @@ func application(
         logger.warning("String Catalog is \(isCatalogMissing ? "missing" : "undecodable"); pages will serve raw localization keys")
     }
 
+    let driver = try reader.driver
     let persistence = try Service(
-        driver: reader.driver,
+        driver: driver,
         logger: logger
     )
     let fluent = persistence()
@@ -52,8 +54,12 @@ func application(
             analytics: reader.analytics,
             cacheControl: reader.cacheControl,
             compressionMinResponseSize: reader.compressionMinResponseSize,
+            httpsRedirect: reader.httpsRedirect,
             rateLimit: reader.rateLimit,
             securityHeaders: reader.securityHeaders,
+            // An unset origin leaves the pages without canonical URLs and language alternates, rather than
+            // building both against an empty host.
+            siteOrigin: reader.siteOrigin.isEmpty ? nil : reader.siteOrigin,
             logLevel: reader.logLevel,
             probe: Probe(fluent: fluent)
         ),
@@ -67,7 +73,7 @@ func application(
 
     // The in-memory backend is recreated on every launch, so it is migrated on startup. The PostgreSQL backend is
     // left untouched here: a shared database is migrated out of band to avoid multi-instance races.
-    if case .inMemory = reader.driver {
+    if case .inMemory = driver {
         app.beforeServerStarts {
             try await fluent.migrate()
         }
@@ -90,7 +96,7 @@ func migration(
         logLevel: reader.logLevel
     )
     let service = try Service(
-        driver: reader.driver,
+        driver: try reader.driver,
         logger: logger
     )
 
@@ -135,22 +141,28 @@ private func logger(
 /// Builds the application's router.
 ///
 /// Registers the request-logging middleware, the security-headers middleware that stamps the given `securityHeaders` onto every response, the
-/// vary middleware that marks every response as varying on `Accept-Encoding`, the response-compression middleware that compresses responses
+/// HTTPS-redirect middleware that bounces requests forwarded over plain HTTP to the canonical origin, the trailing-slash redirect middleware that
+/// collapses each path onto its canonical form, the vary middleware that marks every response as varying on `Accept-Encoding`, the response-compression middleware that compresses responses
 /// larger than `minimumResponseSizeToCompress` when the client advertises support, the localization middleware that negotiates the request's
-/// language from its `Accept-Language` header, the not-found middleware that serves the error page, and the static file middleware that serves the
+/// language from its `Accept-Language` header (honouring the `lang` query override and the language a leading path segment names), the
+/// not-found middleware that serves the not-found page, and the static file middleware that serves the
 /// contents of `staticFilesPath` (tagging responses with the given `cacheControl` directives), then adds the `RootController` routes that
-/// render the landing page, and the `HealthController` routes that serve the health check.
+/// render the landing page — one per language the String Catalog serves — and the `HealthController` routes that serve the health check.
 ///
 /// The security-headers middleware sits just inside request logging so it covers every response that reaches a client — the landing page, the compressed
-/// responses, the rendered error page, and the served static files.
+/// responses, the rendered not-found page, and the served static files. The HTTPS redirect sits directly beneath it, so a redirect carries the security
+/// headers but skips the negotiation, compression, and file lookup it would otherwise pay for. The trailing-slash redirect follows it, ahead of the
+/// routes and `FileMiddleware` that would otherwise answer both spellings of every path.
 /// - Parameters:
 ///   - staticFilesPath: the folder, relative to the working directory, the static files are served from.
 ///   - assetVersion: the version token the pages append to their asset URLs, or `nil` to leave them unversioned.
 ///   - analytics: the analytics tracker both pages embed, or `nil` to omit it.
 ///   - cacheControl: the cache-control directives applied to the served static files.
 ///   - compressionMinResponseSize: the minimum response body size, in bytes, before compression is applied.
-///   - rateLimit: the rate limit applied to the rate-limited routes.
+///   - httpsRedirect: the origin plain-HTTP requests are redirected to, and whether the forwarded-protocol header is trusted.
+///   - rateLimit: the rate limit configuration, currently applied to no route.
 ///   - securityHeaders: the security headers applied to every response.
+///   - siteOrigin: the public origin the pages derive their canonical URLs and language alternates from, or `nil` to omit them.
 ///   - logLevel: the level the request-logging middleware logs at.
 ///   - probe: the probe consulted by the `HealthController` readiness route.
 /// - Returns: the configured router.
@@ -160,8 +172,10 @@ private func router(
     analytics: Analytics?,
     cacheControl: CacheControl,
     compressionMinResponseSize: Int,
+    httpsRedirect: HTTPSRedirectMiddleware<AppRequestContext>.Configuration,
     rateLimit: RateLimitMiddleware<AppRequestContext>.Configuration,
     securityHeaders: SecurityHeadersMiddleware<AppRequestContext>.Configuration,
+    siteOrigin: String?,
     logLevel: Logger.Level,
     probe: Probe
 ) -> Router<AppRequestContext> {
@@ -177,6 +191,10 @@ private func router(
         SecurityHeadersMiddleware(
             configuration: securityHeaders
         )
+        HTTPSRedirectMiddleware(
+            configuration: httpsRedirect
+        )
+        TrailingSlashRedirectMiddleware()
         VaryMiddleware()
         ResponseCompressionMiddleware(
             minimumResponseSizeToCompress: compressionMinResponseSize
@@ -195,6 +213,7 @@ private func router(
     router.addController {
         RootController<AppRequestContext>(
             assetVersion: assetVersion,
+            siteOrigin: siteOrigin,
             analytics: analytics
         )
         HealthController<AppRequestContext>(