Merge pull request #9 from skelpo/develop

Added Model Conformance to JWTAuthenticatable Protocol
skelpo · May 9, 2018 · 0f51326 · 0f51326
2 parents e88d78b + 455b2d6
commit 0f51326
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 9 deletions.
diff --git a/Package.resolved b/Package.resolved
@@ -6,8 +6,8 @@
         "repositoryURL": "https://github.com/vapor/auth.git",
         "state": {
           "branch": null,
-          "revision": "c88227ea542c2a2b699d8f5b9f44531248902584",
-          "version": "2.0.0-rc.3.1"
+          "revision": "c8594a4026924483d3906e7cebf5084ae83efcbf",
+          "version": "2.0.0-rc.4"
         }
       },
       {
@@ -168,8 +168,8 @@
         "repositoryURL": "https://github.com/vapor/url-encoded-form.git",
         "state": {
           "branch": null,
-          "revision": "8448fa943057c01220f6a940d3b1b8e9fd92a96e",
-          "version": "1.0.2"
+          "revision": "57cf7fb9c1a1014c50bc05123684a9139ad44127",
+          "version": "1.0.3"
         }
       },
       {
@@ -186,8 +186,8 @@
         "repositoryURL": "https://github.com/vapor/vapor.git",
         "state": {
           "branch": null,
-          "revision": "821184be792dfa144a82fe379784e04eb9dad1eb",
-          "version": "3.0.1"
+          "revision": "8c73eebf7c41c7d8bf83ff87f550e0f97d6aadc4",
+          "version": "3.0.2"
         }
       },
       {
@@ -204,8 +204,8 @@
         "repositoryURL": "https://github.com/vapor/websocket.git",
         "state": {
           "branch": null,
-          "revision": "23acd21aa37a200faa2f5d5525c974efa6b5676c",
-          "version": "1.0.0"
+          "revision": "141cb4d3814dc8062cb0b2f43e72801b5dfcf272",
+          "version": "1.0.1"
         }
       }
     ]

diff --git a/Sources/JWTAuthenticatable/JWTAuthenticatable.swift b/Sources/JWTAuthenticatable/JWTAuthenticatable.swift
@@ -17,7 +17,7 @@ public protocol IdentifiableJWTPayload: JWTPayload {
 
 /// A type that can be authenticated with some type and authorized with a JWT payload.
 /// The `Payload.ID` type must be equal to the model's `ID` type.
-public protocol JWTAuthenticatable: Authenticatable, Content where Payload.ID == Self.ID {
+public protocol JWTAuthenticatable: Model, Authenticatable, Content where Payload.ID == Self.ID {
 
     /// The type that the model can
     /// be authenticated with.