Use RouterController

auth-cognito/Package.swift

@@ -1,4 +1,4 @@
-// swift-tools-version:5.10
+// swift-tools-version:6.0
 import PackageDescription
 
 let package = Package(
@@ -7,9 +7,9 @@ let package = Package(
         .macOS(.v14),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.2.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-rc.1"),
-        .package(url: "https://github.com/adam-fowler/soto-cognito-authentication-kit.git", from: "5.0.0-rc.3"),
+        .package(url: "https://github.com/adam-fowler/soto-cognito-authentication-kit.git", from: "5.0.0-rc.4"),
         .package(url: "https://github.com/apple/swift-argument-parser.git", from: "1.4.0"),
     ],
     targets: [

auth-cognito/Sources/App/Application+build.swift

@@ -42,7 +42,7 @@ func buildApplication(
         UserController(
             cognitoAuthenticatable: authenticatable,
             cognitoIdentityProvider: cognitoIdentityProvider
-        ).endpoints
+        )
     }
 
     var app = Application(router: router)

auth-cognito/Sources/App/Controllers/UserController.swift

@@ -5,17 +5,17 @@ import HummingbirdRouter
 import SotoCognitoAuthenticationKit
 import SotoCognitoAuthenticationSRP
 
-extension CognitoAccessToken: ResponseEncodable {}
-extension CognitoAuthenticateResponse: ResponseEncodable {}
-extension CognitoCreateUserResponse: ResponseEncodable {}
+extension CognitoAccessToken: @retroactive ResponseEncodable {}
+extension CognitoAuthenticateResponse: @retroactive ResponseEncodable {}
+extension CognitoCreateUserResponse: @retroactive ResponseEncodable {}
 
-struct UserController {
+struct UserController: RouterController {
     typealias Context = AuthCognitoRequestContext
 
     let cognitoAuthenticatable: CognitoAuthenticatable
     let cognitoIdentityProvider: CognitoIdentityProvider
 
-    var endpoints: some RouterMiddleware<Context> {
+    var body: some RouterMiddleware<Context> {
         RouteGroup("user") {
             Put(handler: self.create)
             Patch(handler: self.resend)

auth-cognito/Sources/App/Middleware/CognitoAuthenticators.swift

@@ -2,8 +2,8 @@ import Hummingbird
 import HummingbirdAuth
 import SotoCognitoAuthenticationKit
 
-extension CognitoAuthenticateResponse: Authenticatable {}
-extension CognitoAccessToken: Authenticatable {}
+extension CognitoAuthenticateResponse: @retroactive Authenticatable {}
+extension CognitoAccessToken: @retroactive Authenticatable {}
 
 /// Authenticator for Cognito username and password
 struct CognitoBasicAuthenticator: AuthenticatorMiddleware {

webauthn/Package.swift

@@ -10,7 +10,7 @@ let package = Package(
         .executable(name: "App", targets: ["App"]),
     ],
     dependencies: [
-        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.0.0"),
+        .package(url: "https://github.com/hummingbird-project/hummingbird.git", from: "2.2.0"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-auth.git", from: "2.0.0-rc.2"),
         .package(url: "https://github.com/hummingbird-project/hummingbird-fluent.git", from: "2.0.0-beta.2"),
         .package(url: "https://github.com/hummingbird-project/swift-mustache.git", from: "2.0.0-beta.1"),

webauthn/Sources/App/Application+build.swift

@@ -76,7 +76,7 @@ func buildApplication(_ arguments: AppArguments) async throws -> some Applicatio
             mustacheLibrary: library,
             fluent: fluent,
             webAuthnSessionAuthenticator: webAuthnSessionAuthenticator
-        ).endpoints
+        )
         RouteGroup("api") {
             HBWebAuthnController(
                 webauthn: .init(
@@ -88,7 +88,7 @@ func buildApplication(_ arguments: AppArguments) async throws -> some Applicatio
                 ),
                 fluent: fluent,
                 webAuthnSessionAuthenticator: webAuthnSessionAuthenticator
-            ).endpoints
+            )
         }
     }
 

webauthn/Sources/App/Controllers/HTMLController.swift

@@ -33,7 +33,7 @@ struct RedirectMiddleware<Context: AuthRequestContext>: RouterMiddleware {
 }
 
 /// Serves HTML pages
-struct HTMLController {
+struct HTMLController: RouterController {
     typealias Context = WebAuthnRequestContext
 
     let homeTemplate: MustacheTemplate
@@ -56,7 +56,7 @@ struct HTMLController {
     }
 
     // return Route for home page
-    var endpoints: some RouterMiddleware<Context> {
+    var body: some RouterMiddleware<Context> {
         Get("/") {
             self.webAuthnSessionAuthenticator
             RedirectMiddleware(to: "/login.html")

webauthn/Sources/App/Controllers/WebAuthnController.swift

@@ -20,15 +20,15 @@ import HummingbirdFluent
 import HummingbirdRouter
 import WebAuthn
 
-struct HBWebAuthnController {
+struct HBWebAuthnController: RouterController {
     typealias Context = WebAuthnRequestContext
 
     let webauthn: WebAuthnManager
     let fluent: Fluent
     let webAuthnSessionAuthenticator: SessionAuthenticator<Context, UserRepository>
 
     // return RouteGroup with user login endpoints
-    var endpoints: some RouterMiddleware<Context> {
+    var body: some RouterMiddleware<Context> {
         /// Authenticator storing the WebAuthn session state
         let webAuthnSessionStateAuthenticator = SessionAuthenticator(
             sessionStorage: self.webAuthnSessionAuthenticator.sessionStorage,
@@ -168,5 +168,10 @@ struct HBWebAuthnController {
     }
 }
 
+#if compiler(>=6.0)
+extension PublicKeyCredentialCreationOptions: @retroactive ResponseEncodable {}
+extension PublicKeyCredentialRequestOptions: @retroactive ResponseEncodable {}
+#else
 extension PublicKeyCredentialCreationOptions: ResponseEncodable {}
 extension PublicKeyCredentialRequestOptions: ResponseEncodable {}
+#endif

webauthn/Sources/App/Extensions/Fluent+Mustache.swift

@@ -5,7 +5,7 @@ import Mustache
 /// to access the wrappedValue. In the mustache template you would access this with
 /// `{{wrappedValue(_myProperty)}}`. Note the `_` prefix on the property name. This is
 /// required as this is how property wrappers appear in the Mirror reflection data.
-extension FieldProperty: MustacheTransformable {
+extension FieldProperty {
     public func transform(_ name: String) -> Any? {
         switch name {
         case "wrappedValue":
@@ -20,7 +20,7 @@ extension FieldProperty: MustacheTransformable {
 /// to access the wrappedValue. In the mustache template you would access this with
 /// `{{wrappedValue(_myID)}}`. Note the `_` prefix on the property name. This is
 /// required as this is how property wrappers appear in the Mirror reflection data.
-extension IDProperty: MustacheTransformable {
+extension IDProperty {
     public func transform(_ name: String) -> Any? {
         switch name {
         case "wrappedValue":
@@ -30,3 +30,11 @@ extension IDProperty: MustacheTransformable {
         }
     }
 }
+
+#if compiler(>=6.0)
+extension FieldProperty: @retroactive MustacheTransformable {}
+extension IDProperty: @retroactive MustacheTransformable {}
+#else
+extension FieldProperty: MustacheTransformable {}
+extension IDProperty: MustacheTransformable {}
+#endif