swift 4 support

.gitignore

@@ -4,4 +4,5 @@
 /*.xcodeproj
 Package.pins
 DerivedData/
+Package.resolved
 

Package@swift-4.swift

@@ -0,0 +1,19 @@
+// swift-tools-version:4.0
+import PackageDescription
+
+let package = Package(
+    name: "Auth",
+    products: [
+        .library(name: "Authentication", targets: ["Authentication"]),
+        .library(name: "Authorization", targets: ["Authorization"]),
+    ],
+    dependencies: [
+        // Swift models, relationships, and querying for NoSQL and SQL databases.
+        .package(url: "https://github.com/vapor/fluent.git", .upToNextMajor(from: "2.0.0"))
+    ],
+    targets: [
+    	.target(name: "Authentication", dependencies: ["Fluent"]),
+    	.testTarget(name: "AuthenticationTests", dependencies: ["Authentication"]),
+    	.target(name: "Authorization", dependencies: ["Authentication"]),
+    ]
+)

Sources/Authentication/Authenticatable/TokenAuthenticatable.swift

@@ -34,7 +34,7 @@ extension TokenAuthenticatable where Self: Entity, Self.TokenType: Entity {
     }
 }
 
-extension TokenAuthenticatable where Self: Entity, Self.TokenType: Entity, Self.TokenType == Self {
+extension TokenAuthenticatable where Self: Entity, Self.TokenType == Self {
     public static func authenticate(_ token: Token) throws -> Self {
         guard let user = try Self.makeQuery()
             .filter(tokenKey, token.string)

Sources/Authorization/Authorizable.swift

@@ -67,7 +67,7 @@ extension PivotProtocol where Self.Right: Permission {
 extension Authorizable {
     public func isAuthorized<
         PermissionType: Permission,
-        MiddleType: Entity,
+        MiddleType,
         PivotType: PivotProtocol & Entity
     >(
         to permission: PermissionType,
@@ -89,7 +89,7 @@ extension Authorizable {
 
     public func assertAuthorization<
         PermissionType: Permission,
-        MiddleType: Entity,
+        MiddleType,
         PivotType: PivotProtocol & Entity
     >(
         to permission: PermissionType,