Remove baseURL where unnecessary

vapor-community · Nov 22, 2024 · 7d1550f · 7d1550f
1 parent 87c761b
commit 7d1550f
Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/Sources/ImperialCore/Routing/FederatedServiceRouter.swift b/Sources/ImperialCore/Routing/FederatedServiceRouter.swift
@@ -54,10 +54,13 @@ public protocol FederatedServiceRouter: Sendable {
     /// - Parameters:
     ///   - authURL: The URL for the route that will redirect the user to the OAuth provider.
     ///   - authenticateCallback: Execute custom code within the authenticate closure before redirection.
+    ///   - router: The router to configure the routes on.
     /// - Throws: N/A
     func configureRoutes(
-        withAuthURL authURL: String, authenticateCallback: (@Sendable (Request) async throws -> Void)?, on router: some RoutesBuilder)
-        throws
+        withAuthURL authURL: String,
+        authenticateCallback: (@Sendable (Request) async throws -> Void)?,
+        on router: some RoutesBuilder
+    ) throws
 
     /// Gets an access token from an OAuth provider.
     /// This method is the main body of the `callback` handler.

diff --git a/Sources/ImperialDiscord/DiscordRouter.swift b/Sources/ImperialDiscord/DiscordRouter.swift
@@ -2,12 +2,11 @@ import Foundation
 import Vapor
 
 final public class DiscordRouter: FederatedServiceRouter {
-    public static let baseURL: String = "https://discord.com/"
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
     public let callbackURL: String
-    public let accessTokenURL: String = "\(DiscordRouter.baseURL.finished(with: "/"))api/oauth2/token"
+    public let accessTokenURL: String = "https://discord.com/api/oauth2/token"
     public let service: OAuthService = .discord
     public let callbackHeaders = HTTPHeaders([("Content-Type", "application/x-www-form-urlencoded")])
 

diff --git a/Sources/ImperialGitHub/GitHubRouter.swift b/Sources/ImperialGitHub/GitHubRouter.swift
@@ -2,12 +2,11 @@ import Foundation
 import Vapor
 
 final public class GitHubRouter: FederatedServiceRouter {
-    public static let baseURL: String = "https://github.com/"
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
     public let callbackURL: String
-    public let accessTokenURL: String = "\(GitHubRouter.baseURL.finished(with: "/"))login/oauth/access_token"
+    public let accessTokenURL: String = "https://github.com/login/oauth/access_token"
     public let service: OAuthService = .github
     public let callbackHeaders: HTTPHeaders = {
         var headers = HTTPHeaders()

diff --git a/Sources/ImperialGitlab/GitlabRouter.swift b/Sources/ImperialGitlab/GitlabRouter.swift
@@ -2,12 +2,11 @@ import Foundation
 import Vapor
 
 final public class GitlabRouter: FederatedServiceRouter {
-    public static let baseURL: String = "https://gitlab.com/"
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
     public let callbackURL: String
-    public let accessTokenURL: String = "\(GitlabRouter.baseURL.finished(with: "/"))oauth/token"
+    public let accessTokenURL: String = "https://gitlab.com/oauth/token"
     public let service: OAuthService = .gitlab
 
     public required init(
@@ -44,6 +43,7 @@ final public class GitlabRouter: FederatedServiceRouter {
             clientSecret: tokens.clientSecret,
             code: code,
             grantType: "authorization_code",
-            redirectUri: self.callbackURL)
+            redirectUri: self.callbackURL
+        )
     }
 }