Merge pull request #8 from marius-se/vapor-4

Migrate to Vapor 4

Author: 0xTim

.gitignore

@@ -1,17 +1,9 @@
-
-# Created by https://www.gitignore.io/api/vapor
-
-### Vapor ###
-Config/secrets
-
-### Vapor Patch ###
 Packages
 .build
 xcuserdata
 *.xcodeproj
 DerivedData/
 .DS_Store
-Package.pins
-Package.resolved
+db.sqlite
+.swiftpm
 
-# End of https://www.gitignore.io/api/vapor

Package.resolved

@@ -1,9 +1,28 @@
+// swift-tools-version:5.6
 import PackageDescription
 
 let package = Package(
-    name: "VaporOAuth",
+    name: "vapor-oauth",
+    platforms: [
+        .macOS(.v12)
+    ],
+    products: [
+        .library(
+            name: "OAuth",
+            targets: ["VaporOAuth"]
+        )
+    ],
     dependencies: [
-    	.Package(url: "https://github.com/vapor/vapor.git", majorVersion: 2),
-    	.Package(url: "https://github.com/vapor/auth-provider.git", majorVersion: 1),
+        .package(url: "https://github.com/vapor/vapor.git", from: "4.0.0")
+    ],
+    targets: [
+        .target(
+            name: "VaporOAuth",
+            dependencies: [.product(name: "Vapor", package: "vapor")]
+        ),
+        .testTarget(name: "VaporOAuthTests", dependencies: [
+            .target(name: "VaporOAuth"),
+            .product(name: "XCTVapor", package: "vapor")
+        ])
     ]
 )

Package.swift

@@ -1,16 +1,16 @@
-import HTTP
-import URI
+import Vapor
 
 public struct EmptyAuthorizationHandler: AuthorizeHandler {
-
     public init() {}
 
-    public func handleAuthorizationError(_ errorType: AuthorizationError) throws -> ResponseRepresentable {
-        return ""
+    public func handleAuthorizationRequest(
+        _ request: Request,
+        authorizationRequestObject: AuthorizationRequestObject
+    ) async throws -> Response {
+        Response(body: "")
     }
 
-    public func handleAuthorizationRequest(_ request: Request,
-                                           authorizationRequestObject: AuthorizationRequestObject) throws -> ResponseRepresentable {
-        return ""
+    public func handleAuthorizationError(_ errorType: AuthorizationError) async throws -> Response {
+        Response(body: "")
     }
 }

Package@swift-4.swift

@@ -1,13 +1,16 @@
-import Node
-
 public struct EmptyCodeManager: CodeManager {
     public init() {}
 
     public func getCode(_ code: String) -> OAuthCode? {
         return nil
     }
 
-    public func generateCode(userID: Identifier, clientID: String, redirectURI: String, scopes: [String]?) throws -> String {
+    public func generateCode(
+        userID: String,
+        clientID: String,
+        redirectURI: String,
+        scopes: [String]?
+    ) throws -> String {
         return ""
     }
 

Sources/VaporOAuth/DefaultImplementations/EmptyAuthorizationHandler.swift

@@ -1,14 +1,12 @@
-import Node
-
 public struct EmptyUserManager: UserManager {
 
     public init() {}
 
-    public func getUser(userID: Identifier) -> OAuthUser? {
+    public func getUser(userID: String) -> OAuthUser? {
         return nil
     }
 
-    public func authenticateUser(username: String, password: String) -> Identifier? {
+    public func authenticateUser(username: String, password: String) -> String? {
         return nil
     }
 }