Merge pull request #26 from vapor/crypt-alpha

crypto alpha

Package.swift

@@ -3,8 +3,8 @@ import PackageDescription
 let package = Package(
     name: "JWT",
     dependencies: [
-        .Package(url: "https://github.com/vapor/crypto.git", majorVersion: 1),
-        .Package(url: "https://github.com/vapor/json.git", majorVersion: 1),
+        .Package(url: "https://github.com/vapor/crypto.git", Version(2,0,0, prereleaseIdentifiers: ["alpha"])),
+        .Package(url: "https://github.com/vapor/json.git", Version(2,0,0, prereleaseIdentifiers: ["alpha"]))
     ],
     exclude: [
         "Playground"

Sources/JWT/Encodings/Base64Encoding.swift

@@ -9,6 +9,6 @@ public struct Base64Encoding: Encoding {
     }
 
     public func decode(_ base64Encoded: String) throws -> Bytes {
-        return base64Encoded.bytes.base64Decoded
+        return base64Encoded.makeBytes().base64Decoded
     }
 }

Sources/JWT/Encodings/Base64URLEncoding.swift

@@ -25,7 +25,7 @@ public struct Base64URLEncoding: Encoding {
             let data = Data(base64Encoded: base64Encoded) else {
                 throw JWTError.decoding
         }
-        return try data.makeBytes()
+        return data.makeBytes()
     }
 }
 

Sources/JWT/JWT.swift

@@ -35,7 +35,7 @@ public struct JWT {
 
         let encoded = try [headers, payload].map(encoding.encode)
         let message = encoded.joined(separator: JWT.separator)
-        let bytes = try signer.sign(message: message.bytes)
+        let bytes = try signer.sign(message: message.makeBytes())
         signature = try encoding.encode(bytes)
     }
 
@@ -115,7 +115,7 @@ extension JWT: SignatureVerifiable {
         return try [headers, payload]
             .map(encoding.encode)
             .joined(separator: JWT.separator)
-            .bytes
+            .makeBytes()
     }
 
     public func createSignature() throws -> Bytes {

Tests/JWTTests/JWTTests.swift

@@ -22,7 +22,7 @@ struct TildeSigner: Signer {
 
 struct PeriodToCommaEncoding: Encoding {
     func decode(_ string: String) throws -> Bytes {
-        return string.bytes.map {
+        return string.makeBytes().map {
             switch $0 {
             case 44: return 46
             default: return $0

Tests/JWTTests/SignerTests.swift

@@ -8,15 +8,15 @@ final class SignerTests: XCTestCase {
     func testUnsigned() throws {
         let signer = Unsigned()
         XCTAssertEqual(signer.name, "none")
-        XCTAssertEqual(try signer.sign(message: "a".bytes), [])
-        try signer.verify(signature: "a".bytes, message: "b".bytes)
+        XCTAssertEqual(try signer.sign(message: "a".makeBytes()), [])
+        try signer.verify(signature: "a".makeBytes(), message: "b".makeBytes())
     }
 
     func checkHMACSigner(
         createSigner: (Bytes) -> HMACSigner,
         name: String,
-        message: Bytes = "message".bytes,
-        key: Bytes = "secret".bytes,
+        message: Bytes = "message".makeBytes(),
+        key: Bytes = "secret".makeBytes(),
         signed: String,
         file: StaticString = #file,
         line: UInt = #line
@@ -62,13 +62,14 @@ final class SignerTests: XCTestCase {
         publicKey: String,
         file: StaticString = #file,
         line: UInt = #line
+
     ) throws {
         let signer = try createSigner(try encoder.decode(privateKey))
         let verifier = try createSigner(try encoder.decode(publicKey))
         XCTAssertEqual(signer.name, name, file: file, line: line)
 
-        let signature = try signer.sign(message: message.bytes)
-        try verifier.verify(signature: signature, message: message.bytes)
+        let signature = try signer.sign(message: message.makeBytes())
+        try verifier.verify(signature: signature, message: message.makeBytes())
     }
 
     func testES256() throws {