Change all classes to structs

vapor-community · Dec 4, 2024 · 70f39d0 · 70f39d0
1 parent e36ae31
commit 70f39d0
Show file tree

Hide file tree

Showing 29 changed files with 57 additions and 57 deletions.
diff --git a/Sources/ImperialAuth0/Auth0.swift b/Sources/ImperialAuth0/Auth0.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Auth0: FederatedService {
+public struct Auth0: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialAuth0/Auth0Router.swift b/Sources/ImperialAuth0/Auth0Router.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Vapor
 
-final public class Auth0Router: FederatedServiceRouter {
+public struct Auth0Router: FederatedServiceRouter {
     public let baseURL: String
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
@@ -15,7 +15,7 @@ final public class Auth0Router: FederatedServiceRouter {
         return self.baseURL.finished(with: "/") + path
     }
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         let auth = try Auth0Auth()

diff --git a/Sources/ImperialCore/FederatedService.swift b/Sources/ImperialCore/FederatedService.swift
@@ -8,12 +8,12 @@ import Vapor
 /// import ImperialCore
 /// import Vapor
 ///
-/// public class Service: FederatedService {
+/// public struct Service: FederatedService {
 ///     public var tokens: any FederatedServiceTokens
 ///     public var router: any FederatedServiceRouter
 ///
 ///     @discardableResult
-///     public required init(
+///     public init(
 ///         routes: some RoutesBuilder,
 ///         authenticate: String,
 ///         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialCore/FederatedServiceRouter.swift b/Sources/ImperialCore/FederatedServiceRouter.swift
@@ -4,7 +4,7 @@ import Vapor
 /// Defines a type that implements the routing to get an access token from an OAuth provider.
 /// See implementations in the `Services/(Google|GitHub)/$0Router.swift` files
 public protocol FederatedServiceRouter: Sendable {
-    /// A class that gets the client ID and secret from environment variables.
+    /// An object that gets the client ID and secret from environment variables.
     var tokens: any FederatedServiceTokens { get }
 
     /// The callback that is fired after the access token is fetched from the OAuth provider.

diff --git a/Sources/ImperialDeviantArt/DeviantArt.swift b/Sources/ImperialDeviantArt/DeviantArt.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class DeviantArt: FederatedService {
+public struct DeviantArt: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialDeviantArt/DeviantArtRouter.swift b/Sources/ImperialDeviantArt/DeviantArtRouter.swift
@@ -1,14 +1,14 @@
 import Foundation
 import Vapor
 
-final public class DeviantArtRouter: FederatedServiceRouter {
+public struct DeviantArtRouter: FederatedServiceRouter {
     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 = "https://www.deviantart.com/oauth2/token"
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try DeviantArtAuth()

diff --git a/Sources/ImperialDiscord/Discord.swift b/Sources/ImperialDiscord/Discord.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Discord: FederatedService {
+public struct Discord: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialDiscord/DiscordRouter.swift b/Sources/ImperialDiscord/DiscordRouter.swift
@@ -1,15 +1,15 @@
 import Foundation
 import Vapor
 
-final public class DiscordRouter: FederatedServiceRouter {
+public struct DiscordRouter: FederatedServiceRouter {
     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 = "https://discord.com/api/oauth2/token"
     public let callbackHeaders = HTTPHeaders([("Content-Type", "application/x-www-form-urlencoded")])
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try DiscordAuth()

diff --git a/Sources/ImperialDropbox/Dropbox.swift b/Sources/ImperialDropbox/Dropbox.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Dropbox: FederatedService {
+public struct Dropbox: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialDropbox/DropboxRouter.swift b/Sources/ImperialDropbox/DropboxRouter.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Vapor
 
-final public class DropboxRouter: FederatedServiceRouter {
+public struct DropboxRouter: FederatedServiceRouter {
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
@@ -15,7 +15,7 @@ final public class DropboxRouter: FederatedServiceRouter {
         return headers
     }
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try DropboxAuth()

diff --git a/Sources/ImperialFacebook/Facebook.swift b/Sources/ImperialFacebook/Facebook.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Facebook: FederatedService {
+public struct Facebook: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialFacebook/FacebookRouter.swift b/Sources/ImperialFacebook/FacebookRouter.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Vapor
 
-final public class FacebookRouter: FederatedServiceRouter {
+public struct FacebookRouter: FederatedServiceRouter {
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
@@ -27,7 +27,7 @@ final public class FacebookRouter: FederatedServiceRouter {
         return url.absoluteString
     }
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try FacebookAuth()

diff --git a/Sources/ImperialGitHub/GitHub.swift b/Sources/ImperialGitHub/GitHub.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class GitHub: FederatedService {
+public struct GitHub: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialGitHub/GitHubRouter.swift b/Sources/ImperialGitHub/GitHubRouter.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Vapor
 
-final public class GitHubRouter: FederatedServiceRouter {
+public struct GitHubRouter: FederatedServiceRouter {
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
@@ -13,7 +13,7 @@ final public class GitHubRouter: FederatedServiceRouter {
         return headers
     }()
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try GitHubAuth()
@@ -23,7 +23,6 @@ final public class GitHubRouter: FederatedServiceRouter {
     }
 
     public func authURL(_ request: Request) throws -> String {
-
         var components = URLComponents()
         components.scheme = "https"
         components.host = "github.com"
@@ -44,7 +43,8 @@ final public class GitHubRouter: FederatedServiceRouter {
         GitHubCallbackBody(
             clientId: tokens.clientID,
             clientSecret: tokens.clientSecret,
-            code: code)
+            code: code
+        )
     }
 
 }
diff --git a/Sources/ImperialGitlab/Gitlab.swift b/Sources/ImperialGitlab/Gitlab.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Gitlab: FederatedService {
+public struct Gitlab: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialGitlab/GitlabRouter.swift b/Sources/ImperialGitlab/GitlabRouter.swift
@@ -1,14 +1,14 @@
 import Foundation
 import Vapor
 
-final public class GitlabRouter: FederatedServiceRouter {
+public struct GitlabRouter: FederatedServiceRouter {
     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 = "https://gitlab.com/oauth/token"
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try GitlabAuth()

diff --git a/Sources/ImperialGoogle/JWT/GoogleJWTRouter.swift b/Sources/ImperialGoogle/JWT/GoogleJWTRouter.swift
@@ -3,7 +3,7 @@ import Foundation
 import JWTKit
 import Vapor
 
-public final class GoogleJWTRouter: FederatedServiceRouter {
+public struct GoogleJWTRouter: FederatedServiceRouter {
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]

diff --git a/Sources/ImperialGoogle/Standard/Google.swift b/Sources/ImperialGoogle/Standard/Google.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Google: FederatedService {
+public struct Google: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialGoogle/Standard/GoogleRouter.swift b/Sources/ImperialGoogle/Standard/GoogleRouter.swift
@@ -1,7 +1,7 @@
 import Foundation
 import Vapor
 
-final public class GoogleRouter: FederatedServiceRouter {
+public struct GoogleRouter: FederatedServiceRouter {
     public let tokens: any FederatedServiceTokens
     public let callbackCompletion: @Sendable (Request, String) async throws -> any AsyncResponseEncodable
     public let scope: [String]
@@ -13,7 +13,7 @@ final public class GoogleRouter: FederatedServiceRouter {
         return headers
     }()
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try GoogleAuth()

diff --git a/Sources/ImperialImgur/Imgur.swift b/Sources/ImperialImgur/Imgur.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Imgur: FederatedService {
+public struct Imgur: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialImgur/ImgurRouter.swift b/Sources/ImperialImgur/ImgurRouter.swift
@@ -1,14 +1,14 @@
 import Foundation
 import Vapor
 
-final public class ImgurRouter: FederatedServiceRouter {
+public struct ImgurRouter: FederatedServiceRouter {
     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 = "https://api.imgur.com/oauth2/token"
 
-    public required init(
+    public init(
         callback: String,
         scope: [String],
         completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable

diff --git a/Sources/ImperialKeycloak/Keycloak.swift b/Sources/ImperialKeycloak/Keycloak.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Keycloak: FederatedService {
+public struct Keycloak: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,

diff --git a/Sources/ImperialKeycloak/KeycloakRouter.swift b/Sources/ImperialKeycloak/KeycloakRouter.swift
@@ -1,15 +1,15 @@
 import Foundation
 import Vapor
 
-final public class KeycloakRouter: FederatedServiceRouter {
+public struct KeycloakRouter: FederatedServiceRouter {
     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
     let authURL: String  // This is an additional property of `tokens` that is not in the protocol
 
-    public required init(
+    public init(
         callback: String, scope: [String], completion: @escaping @Sendable (Request, String) async throws -> some AsyncResponseEncodable
     ) throws {
         self.tokens = try KeycloakAuth()

diff --git a/Sources/ImperialMicrosoft/Microsoft.swift b/Sources/ImperialMicrosoft/Microsoft.swift
@@ -1,12 +1,12 @@
 @_exported import ImperialCore
 import Vapor
 
-final public class Microsoft: FederatedService {
+public struct Microsoft: FederatedService {
     public let tokens: any FederatedServiceTokens
     public let router: any FederatedServiceRouter
 
     @discardableResult
-    public required init(
+    public init(
         routes: some RoutesBuilder,
         authenticate: String,
         authenticateCallback: (@Sendable (Request) async throws -> Void)?,