Skip to content

Commit 2ab9490

Browse files
committed
Correct misspelled method name for validateExpiry(leeway:), retain old method name as a deprecated method
1 parent 14ddad4 commit 2ab9490

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

Sources/JWT/ClaimSet.swift

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ extension ClaimSet {
104104
try validateAudience(audience)
105105
}
106106

107-
try validateExpiary(leeway: leeway)
107+
try validateExpiry(leeway: leeway)
108108
try validateNotBefore(leeway: leeway)
109109
try validateIssuedAt(leeway: leeway)
110110
}
@@ -132,8 +132,13 @@ extension ClaimSet {
132132
throw InvalidToken.invalidIssuer
133133
}
134134
}
135-
135+
136+
@available(*, deprecated, message: "This method's name is misspelled. Please instead use validateExpiry(leeway:).")
136137
public func validateExpiary(leeway: TimeInterval = 0) throws {
138+
try validateExpiry(leeway: leeway)
139+
}
140+
141+
public func validateExpiry(leeway: TimeInterval = 0) throws {
137142
try validateDate(claims, key: "exp", comparison: .orderedAscending, leeway: (-1 * leeway), failure: .expiredSignature, decodeError: "Expiration time claim (exp) must be an integer")
138143
}
139144

Tests/JWTTests/ClaimSetTests.swift

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ class ValidationTests: XCTestCase {
77
claims.expiration = Date().addingTimeInterval(-1)
88

99
do {
10-
try claims.validateExpiary()
10+
try claims.validateExpiry()
1111
XCTFail("InvalidToken.expiredSignature error should have been thrown.")
1212
} catch InvalidToken.expiredSignature {
1313
// Correct error thrown
@@ -21,7 +21,7 @@ class ValidationTests: XCTestCase {
2121
claims.expiration = Date().addingTimeInterval(-1)
2222

2323
do {
24-
try claims.validateExpiary(leeway: 2)
24+
try claims.validateExpiry(leeway: 2)
2525
} catch {
2626
XCTFail("Unexpected error while validating exp claim that should be valid with leeway.")
2727
}

0 commit comments

Comments
 (0)