Skip to content
This repository was archived by the owner on Aug 15, 2019. It is now read-only.

Remove deprecated encode/decode, fix warnings, other fixes #1

Merged
merged 10 commits into from
Jul 24, 2018
Merged

Remove deprecated encode/decode, fix warnings, other fixes #1

Changes from 1 commit
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7f42251
Remove CommonCrypto directory as Swift 4.2 no longer requires this
jonblatho Jul 23, 2018
8004906
Correct encoding unit tests to account for unordered Swift dictionaries
jonblatho Jul 23, 2018
398c825
Reindent to match existing style
jonblatho Jul 23, 2018
ec735aa
Fix warning about deallocate(capacity:) deprecation
jonblatho Jul 23, 2018
264a622
Update many unit tests to stop using deprecated decode method
jonblatho Jul 23, 2018
61e4cd7
Fix remaining unit tests
jonblatho Jul 24, 2018
14ddad4
Bump CryptoSwift to 0.10.0
jonblatho Jul 24, 2018
2ab9490
Correct misspelled method name for validateExpiry(leeway:), retain ol…
jonblatho Jul 24, 2018
312dce7
Remove deprecated encode/decode methods
jonblatho Jul 24, 2018
30677df
Undo removal of CommonCrypto; will try to find compatible solution be…
jonblatho Jul 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Correct encoding unit tests to account for unordered Swift dictionaries
  • Loading branch information
@jonblatho
jonblatho committed Jul 23, 2018
commit 800490657dc81ea1c22a46bcd94226d3337214c3
28 changes: 25 additions & 3 deletions Tests/JWTTests/JWTEncodeTests.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,14 +23,36 @@ class JWTEncodeTests: XCTestCase {
let jwt = JWT.encode(algorithm) { builder in
builder.issuer = "fuller.li"
}

XCTAssertEqual(jwt, "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJmdWxsZXIubGkifQ.d7B7PAQcz1E6oNhrlxmHxHXHgg39_k7X7wWeahl8kSQ")

let expected = [
// { "alg": "HS256", "typ": "JWT" }
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJpc3MiOiJmdWxsZXIubGkifQ.d7B7PAQcz1E6oNhrlxmHxHXHgg39_k7X7wWeahl8kSQ",
// { "typ": "JWT", "alg": "HS256" }
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiJ9.eyJpc3MiOiJmdWxsZXIubGkifQ.x5Fdll-kZBImOPtpT1fZH_8hDW01Ax3pbZx_EiljoLk"
]

XCTAssertTrue(expected.contains(jwt))
}

func testEncodingClaimsWithHeaders() {
let algorithm = Algorithm.hs256("secret".data(using: .utf8)!)
let jwt = JWT.encode(claims: ClaimSet(), algorithm: algorithm, headers: ["kid": "x"])

let expected = [
// { "alg": "HS256", "typ": "JWT", "kid": "x" }
"eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IngifQ.e30.ddEotxYYMMdat5HPgYFQnkHRdPXsxPG71ooyhIUoqGA",
// { "alg": "HS256", "kid": "x", "typ": "JWT" }
"eyJhbGciOiJIUzI1NiIsImtpZCI6IngiLCJ0eXAiOiJKV1QifQ.e30.xiT6fWe5dWGeuq8zFb0je_14Maa_9mHbVPSyJhUIJ54",
// { "typ": "JWT", "alg": "HS256", "kid": "x" }
"eyJ0eXAiOiJKV1QiLCJhbGciOiJIUzI1NiIsImtpZCI6IngifQ.e30.5t6a61tpSXFo5QBHYCnKAz2mTHrW9kaQ9n_b7e-jWw0",
// { "typ": "JWT", "kid": "x", "alg": "HS256" }
"eyJ0eXAiOiJKV1QiLCJraWQiOiJ4IiwiYWxnIjoiSFMyNTYifQ.e30.DG5nmV2CVH6mV_iEm0xXZvL0DUJ22ek2xy6fNi_pGLc",
// { "kid": "x", "typ": "JWT", "alg": "HS256" }
"eyJraWQiOiJ4IiwidHlwIjoiSldUIiwiYWxnIjoiSFMyNTYifQ.e30.h5ZvlqECBIvu9uocR5_5uF3wnhga8vTruvXpzaHpRdA",
// { "kid": "x", "alg": "HS256", "typ": "JWT" }
"eyJraWQiOiJ4IiwiYWxnIjoiSFMyNTYiLCJ0eXAiOiJKV1QifQ.e30.5KqN7N5a7Cfbe2eKN41FJIfgMjcdSZ7Nt16xqlyOeMo"
]

XCTAssertEqual(jwt, "eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCIsImtpZCI6IngifQ.e30.ddEotxYYMMdat5HPgYFQnkHRdPXsxPG71ooyhIUoqGA")
XCTAssertTrue(expected.contains(jwt))
}
}