Merge pull request #5 from siemensikkema/feature/update-to-jwt3

Update to JWT3 and simplify

Author: MihaelIsaev

Package.swift

@@ -11,7 +11,7 @@ let package = Package(
     dependencies: [
         // 💧 A server-side Swift web framework.
         .package(url: "https://github.com/vapor/vapor.git", from: "3.0.0"),
-        .package(url: "https://github.com/vapor/jwt.git", from: "3.0.0-rc.2.1.2"),
+        .package(url: "https://github.com/vapor/jwt.git", from: "3.0.0"),
     ],
     targets: [
         .target(name: "FCM", dependencies: ["Vapor", "JWT"]),

Sources/FCM/GAuthPayload.swift

@@ -14,7 +14,7 @@ class GAuthPayload: JWTPayload {
     static var expirationClaim: ExpirationClaim {
         return ExpirationClaim(value: Date().addingTimeInterval(3600))
     }
-    
+
     init(iss: String, sub: String, scope: String, aud: String) {
         self.exp = GAuthPayload.expirationClaim
         self.iat = IssuedAtClaim(value: Date())
@@ -23,26 +23,20 @@ class GAuthPayload: JWTPayload {
         self.scope = scope
         self.aud = AudienceClaim(value: aud)
     }
-    
-    func verify() throws {
-        try exp.verify()
+
+    func verify(using signer: JWTSigner) throws {
+        // not used
     }
-    
-    var isValid: Bool {
+
+    var hasExpired: Bool {
         do {
-            try verify()
-            return true
-        } catch {
+            try exp.verifyNotExpired()
             return false
+        } catch {
+            return true
         }
     }
-    
-    func updateIfNeeded() {
-        if !isValid {
-            update()
-        }
-    }
-    
+
     func update() {
         self.exp = GAuthPayload.expirationClaim
         self.iat = IssuedAtClaim(value: Date())

Sources/FCM/Helpers/FCM+AccessToken.swift

@@ -3,7 +3,7 @@ import Vapor
 
 extension FCM {
     func getAccessToken(_ client: Client) throws -> Future<String> {
-        if gAuthPayload.isValid, let token = accessToken {
+        if !gAuthPayload.hasExpired, let token = accessToken {
             return client.container.eventLoop.newSucceededFuture(result: token)
         }
         var payload: [String: String] = [:]

Sources/FCM/Helpers/FCM+JWT.swift

@@ -4,16 +4,15 @@ import JWT
 
 extension FCM {
     func generateJWT() throws -> String {
-        gAuthPayload.updateIfNeeded()
         let pk = try RSAKey.private(pem: key)
         let signer = JWTSigner.rs256(key: pk)
-        var jwt = JWT<GAuthPayload>(payload: gAuthPayload)
+        let jwt = JWT<GAuthPayload>(payload: gAuthPayload)
         let jwtData = try jwt.sign(using: signer)
         return String(data: jwtData, encoding: .utf8)!
     }
 
     func getJWT() throws -> String {
-        if gAuthPayload.isValid {
+        if !gAuthPayload.hasExpired {
             return _jwt
         }
         _jwt = try generateJWT()