Improve protocol handling in OAuth2 initialization (#19)

dewonderstruck · Nov 11, 2024 · fcf7495 · fcf7495
1 parent cb71826
commit fcf7495
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 16 deletions.
diff --git a/Sources/VaporOAuth/OAuth2.swift b/Sources/VaporOAuth/OAuth2.swift
@@ -48,12 +48,12 @@ public struct OAuth2: LifecycleHandler {
     ///   - oAuthHelper: Helper service for OAuth operations
     ///   - metadataProvider: Service for providing server metadata
     public init(
-        codeManager: CodeManager = EmptyCodeManager(),
-        tokenManager: TokenManager,
-        deviceCodeManager: DeviceCodeManager = EmptyDeviceCodeManager(),
-        clientRetriever: ClientRetriever,
-        authorizeHandler: AuthorizeHandler = EmptyAuthorizationHandler(),
-        userManager: UserManager = EmptyUserManager(),
+        codeManager: any CodeManager = EmptyCodeManager(),
+        tokenManager: any TokenManager,
+        deviceCodeManager: any DeviceCodeManager = EmptyDeviceCodeManager(),
+        clientRetriever: any ClientRetriever,
+        authorizeHandler: any AuthorizeHandler = EmptyAuthorizationHandler(),
+        userManager: any UserManager = EmptyUserManager(),
         validScopes: [String]? = nil,
         resourceServerRetriever: any ResourceServerRetriever = EmptyResourceServerRetriever(),
         oAuthHelper: OAuthHelper,

diff --git a/Tests/VaporOAuthTests/Helpers/TestDataBuilder.swift b/Tests/VaporOAuthTests/Helpers/TestDataBuilder.swift
@@ -37,7 +37,7 @@ class TestDataBuilder {
 
         app.lifecycle.use(
             OAuth2(
-                issuer: issuer, codeManager: codeManager,
+                codeManager: codeManager,
                 tokenManager: tokenManager,
                 deviceCodeManager: deviceCodeManager,
                 clientRetriever: clientRetriever,

diff --git a/Tests/VaporOAuthTests/IntegrationTests/AuthCodeResourceServerTests.swift b/Tests/VaporOAuthTests/IntegrationTests/AuthCodeResourceServerTests.swift
@@ -43,7 +43,7 @@ class AuthCodeResourceServerTests: XCTestCase {
         fakeUserManager.users.append(newUser)
 
         let oauthProvider = OAuth2(
-            issuer: issuer, codeManager: fakeCodeManager,
+            codeManager: fakeCodeManager,
             tokenManager: fakeTokenManager,
             clientRetriever: clientRetriever,
             authorizeHandler: capturingAuthouriseHandler,

diff --git a/Tests/VaporOAuthTests/MetadataTests/MetadataEndpointTests.swift b/Tests/VaporOAuthTests/MetadataTests/MetadataEndpointTests.swift
@@ -19,8 +19,6 @@ class MetadataEndpointTests: XCTestCase {
 
     func testRequiredRFCFields() async throws {
         let oauthProvider = OAuth2(
-            issuer: issuer,
-            jwksEndpoint: jwksEndpoint,
             tokenManager: FakeTokenManager(),
             clientRetriever: StaticClientRetriever(clients: []),
             oAuthHelper: .local(
@@ -53,8 +51,6 @@ class MetadataEndpointTests: XCTestCase {
         let validScopes = ["profile", "email"]
 
         let oauthProvider = OAuth2(
-            issuer: issuer,
-            jwksEndpoint: jwksEndpoint,
             codeManager: FakeCodeManager(),
             tokenManager: FakeTokenManager(),
             deviceCodeManager: FakeDeviceCodeManager(),
@@ -136,8 +132,6 @@ class MetadataEndpointTests: XCTestCase {
         }
 
         let oauthProvider = OAuth2(
-            issuer: issuer,
-            jwksEndpoint: jwksEndpoint,
             tokenManager: FakeTokenManager(),
             clientRetriever: StaticClientRetriever(clients: []),
             oAuthHelper: .local(
@@ -184,8 +178,6 @@ class MetadataEndpointTests: XCTestCase {
     // MARK: - Error Cases
     func testMetadataEndpointRequiredHeaders() async throws {
         let oauthProvider = OAuth2(
-            issuer: issuer,
-            jwksEndpoint: jwksEndpoint,
             tokenManager: FakeTokenManager(),
             clientRetriever: StaticClientRetriever(clients: []),
             oAuthHelper: .local(