Correct misspelled method name for validateExpiry(leeway:), retain ol…

…d method name as a deprecated method
jonblatho · Jul 24, 2018 · 2ab9490 · 2ab9490
1 parent 14ddad4
commit 2ab9490
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 4 deletions.
diff --git a/Sources/JWT/ClaimSet.swift b/Sources/JWT/ClaimSet.swift
@@ -104,7 +104,7 @@ extension ClaimSet {
       try validateAudience(audience)
     }
 
-    try validateExpiary(leeway: leeway)
+    try validateExpiry(leeway: leeway)
     try validateNotBefore(leeway: leeway)
     try validateIssuedAt(leeway: leeway)
   }
@@ -132,8 +132,13 @@ extension ClaimSet {
       throw InvalidToken.invalidIssuer
     }
   }
-
+
+  @available(*, deprecated, message: "This method's name is misspelled. Please instead use validateExpiry(leeway:).")
   public func validateExpiary(leeway: TimeInterval = 0) throws {
+    try validateExpiry(leeway: leeway)
+  }
+
+  public func validateExpiry(leeway: TimeInterval = 0) throws {
     try validateDate(claims, key: "exp", comparison: .orderedAscending, leeway: (-1 * leeway), failure: .expiredSignature, decodeError: "Expiration time claim (exp) must be an integer")
   }
 

diff --git a/Tests/JWTTests/ClaimSetTests.swift b/Tests/JWTTests/ClaimSetTests.swift
@@ -7,7 +7,7 @@ class ValidationTests: XCTestCase {
     claims.expiration = Date().addingTimeInterval(-1)
 
     do {
-      try claims.validateExpiary()
+      try claims.validateExpiry()
       XCTFail("InvalidToken.expiredSignature error should have been thrown.")
     } catch InvalidToken.expiredSignature {
       // Correct error thrown
@@ -21,7 +21,7 @@ class ValidationTests: XCTestCase {
     claims.expiration = Date().addingTimeInterval(-1)
 
     do {
-      try claims.validateExpiary(leeway: 2)
+      try claims.validateExpiry(leeway: 2)
     } catch {
       XCTFail("Unexpected error while validating exp claim that should be valid with leeway.")
     }