Update audience verification based on jwt-kit update (#118)

vapor · Mar 17, 2020 · a37a151 · a37a151
1 parent cc68651
commit a37a151
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/Sources/JWT/JWT+Apple.swift b/Sources/JWT/JWT+Apple.swift
@@ -28,12 +28,7 @@ extension Request.JWT {
             ).flatMapThrowing { signers in
                 let token = try signers.verify(message, as: AppleIdentityToken.self)
                 if let applicationIdentifier = applicationIdentifier ?? self.request.application.jwt.apple.applicationIdentifier {
-                    guard token.audience.value == applicationIdentifier else {
-                        throw JWTError.claimVerificationFailure(
-                            name: "audience",
-                            reason: "Audience claim does not match application identifier"
-                        )
-                    }
+                    try token.audience.verifyIntendedAudience(includes: applicationIdentifier)
                 }
                 return token
             }

diff --git a/Sources/JWT/JWT+Google.swift b/Sources/JWT/JWT+Google.swift
@@ -47,14 +47,9 @@ extension Request.JWT {
             ).flatMapThrowing { signers in
                 let token = try signers.verify(message, as: GoogleIdentityToken.self)
                 if let applicationIdentifier = applicationIdentifier ?? self.request.application.jwt.google.applicationIdentifier {
-                    guard token.audience.value == applicationIdentifier else {
-                        throw JWTError.claimVerificationFailure(
-                            name: "audience",
-                            reason: "Audience claim does not match application identifier"
-                        )
-                    }
-
+                    try token.audience.verifyIntendedAudience(includes: applicationIdentifier)
                 }
+
                 if let gSuiteDomainName = gSuiteDomainName ?? self.request.application.jwt.google.gSuiteDomainName {
                     guard let hd = token.hostedDomain, hd.value == gSuiteDomainName else {
                         throw JWTError.claimVerificationFailure(