Migrate to Swift 2.0

Author: kylef

.travis.yml

@@ -1,4 +1,5 @@
 language: objective-c
+osx_image: xcode7
 before_install:
 - gem install cocoapods --no-document
 - gem install xcpretty --no-document

JSONWebToken.podspec

@@ -11,7 +11,7 @@ Pod::Spec.new do |spec|
   spec.ios.deployment_target = '8.0'
   spec.osx.deployment_target = '10.9'
   spec.requires_arc = true
-  spec.dependency 'CryptoSwift', '0.0.10'
+  spec.dependency 'CryptoSwift', '0.0.14'
   spec.module_name = 'JWT'
 end
 

JWT.xcodeproj/project.pbxproj

@@ -171,7 +171,6 @@
 				279D63981AD07FFF0024E2BC /* Frameworks */,
 				279D63991AD07FFF0024E2BC /* Headers */,
 				279D639A1AD07FFF0024E2BC /* Resources */,
-				842FB8EA008161B653B5AD81 /* Embed Pods Frameworks */,
 				6D3D4069FD3A7DC06168A6A2 /* Copy Pods Resources */,
 			);
 			buildRules = (
@@ -210,6 +209,8 @@
 		279D63931AD07FFF0024E2BC /* Project object */ = {
 			isa = PBXProject;
 			attributes = {
+				LastSwiftMigration = 0700;
+				LastSwiftUpdateCheck = 0700;
 				LastUpgradeCheck = 0620;
 				ORGANIZATIONNAME = Cocode;
 				TargetAttributes = {
@@ -302,21 +303,6 @@
 			shellScript = "diff \"${PODS_ROOT}/../Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [[ $? != 0 ]] ; then\n    cat << EOM\nerror: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\nEOM\n    exit 1\nfi\n";
 			showEnvVarsInLog = 0;
 		};
-		842FB8EA008161B653B5AD81 /* Embed Pods Frameworks */ = {
-			isa = PBXShellScriptBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			inputPaths = (
-			);
-			name = "Embed Pods Frameworks";
-			outputPaths = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-JWT/Pods-JWT-frameworks.sh\"\n";
-			showEnvVarsInLog = 0;
-		};
 		E68E26141F4DF11E3638A2F0 /* Embed Pods Frameworks */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;

JWT/Base64.swift

@@ -3,26 +3,26 @@ import Foundation
 
 /// URI Safe base64 encode
 func base64encode(input:NSData) -> String {
-  let data = input.base64EncodedDataWithOptions(NSDataBase64EncodingOptions(0))
+  let data = input.base64EncodedDataWithOptions(NSDataBase64EncodingOptions(rawValue: 0))
   let string = NSString(data: data, encoding: NSUTF8StringEncoding) as! String
   return string
-    .stringByReplacingOccurrencesOfString("+", withString: "-", options: NSStringCompareOptions(0), range: nil)
-    .stringByReplacingOccurrencesOfString("/", withString: "_", options: NSStringCompareOptions(0), range: nil)
-    .stringByReplacingOccurrencesOfString("=", withString: "", options: NSStringCompareOptions(0), range: nil)
+    .stringByReplacingOccurrencesOfString("+", withString: "-", options: NSStringCompareOptions(rawValue: 0), range: nil)
+    .stringByReplacingOccurrencesOfString("/", withString: "_", options: NSStringCompareOptions(rawValue: 0), range: nil)
+    .stringByReplacingOccurrencesOfString("=", withString: "", options: NSStringCompareOptions(rawValue: 0), range: nil)
 }
 
 /// URI Safe base64 decode
 func base64decode(input:String) -> NSData? {
-  let rem = count(input) % 4
+  let rem = input.characters.count % 4
 
   var ending = ""
   if rem > 0 {
     let amount = 4 - rem
     ending = String(count: amount, repeatedValue: Character("="))
   }
 
-  let base64 = input.stringByReplacingOccurrencesOfString("-", withString: "+", options: NSStringCompareOptions(0), range: nil)
-    .stringByReplacingOccurrencesOfString("_", withString: "/", options: NSStringCompareOptions(0), range: nil) + ending
+  let base64 = input.stringByReplacingOccurrencesOfString("-", withString: "+", options: NSStringCompareOptions(rawValue: 0), range: nil)
+    .stringByReplacingOccurrencesOfString("_", withString: "/", options: NSStringCompareOptions(rawValue: 0), range: nil) + ending
 
-  return NSData(base64EncodedString: base64, options: NSDataBase64DecodingOptions(0))
+  return NSData(base64EncodedString: base64, options: NSDataBase64DecodingOptions(rawValue: 0))
 }

JWT/Claims.swift

@@ -1,16 +1,16 @@
 import Foundation
 
 func validateClaims(payload:Payload, audience:String?, issuer:String?) -> InvalidToken? {
-  return validateIssuer(payload, issuer) ?? validateAudience(payload, audience) ??
-    validateDate(payload, "exp", .OrderedAscending, .ExpiredSignature, "Expiration time claim (exp) must be an integer") ??
-    validateDate(payload, "nbf", .OrderedDescending, .ImmatureSignature, "Not before claim (nbf) must be an integer") ??
-    validateDate(payload, "iat", .OrderedDescending, .InvalidIssuedAt, "Issued at claim (iat) must be an integer")
+  return validateIssuer(payload, issuer: issuer) ?? validateAudience(payload, audience: audience) ??
+    validateDate(payload, key: "exp", comparison: .OrderedAscending, failure: .ExpiredSignature, decodeError: "Expiration time claim (exp) must be an integer") ??
+    validateDate(payload, key: "nbf", comparison: .OrderedDescending, failure: .ImmatureSignature, decodeError: "Not before claim (nbf) must be an integer") ??
+    validateDate(payload, key: "iat", comparison: .OrderedDescending, failure: .InvalidIssuedAt, decodeError: "Issued at claim (iat) must be an integer")
 }
 
 func validateAudience(payload:Payload, audience:String?) -> InvalidToken? {
   if let audience = audience {
     if let aud = payload["aud"] as? [String] {
-      if !contains(aud, audience) {
+      if !aud.contains(audience) {
         return .InvalidAudience
       }
     } else if let aud = payload["aud"] as? String {
@@ -45,7 +45,7 @@ func validateDate(payload:Payload, key:String, comparison:NSComparisonResult, fa
     if date.compare(NSDate()) == comparison {
       return failure
     }
-  } else if let timestamp:AnyObject = payload[key] {
+  } else if payload[key] != nil {
     return .DecodeError(decodeError)
   }
 

JWT/Decode.swift

@@ -2,7 +2,7 @@ import Foundation
 
 
 /// Failure reasons from decoding a JWT
-public enum InvalidToken : Printable {
+public enum InvalidToken : CustomStringConvertible {
   /// Decoding the JWT itself failed
   case DecodeError(String)
 
@@ -60,7 +60,7 @@ public func decode(jwt:String, algorithms:[Algorithm], verify:Bool = true, audie
   switch load(jwt) {
   case let .Success(header, payload, signature, signatureInput):
     if verify {
-      if let failure = validateClaims(payload, audience, issuer) ?? verifySignature(algorithms, header, signatureInput, signature) {
+      if let failure = validateClaims(payload, audience: audience, issuer: issuer) ?? verifySignature(algorithms, header: header, signingInput: signatureInput, signature: signature) {
         return .Failure(failure)
       }
     }
@@ -73,7 +73,7 @@ public func decode(jwt:String, algorithms:[Algorithm], verify:Bool = true, audie
 
 /// Decode a JWT
 public func decode(jwt:String, algorithm:Algorithm, verify:Bool = true, audience:String? = nil, issuer:String? = nil) -> DecodeResult {
-  return decode(jwt, [algorithm], verify: verify, audience: audience, issuer: issuer)
+  return decode(jwt, algorithms: [algorithm], verify: verify, audience: audience, issuer: issuer)
 }
 
 // MARK: Parsing a JWT
@@ -99,7 +99,7 @@ func load(jwt:String) -> LoadResult {
     return .Failure(.DecodeError("Header is not correctly encoded as base64"))
   }
 
-  let header = NSJSONSerialization.JSONObjectWithData(headerData!, options: NSJSONReadingOptions(0), error: nil) as? Payload
+  let header = (try? NSJSONSerialization.JSONObjectWithData(headerData!, options: NSJSONReadingOptions(rawValue: 0))) as? Payload
   if header == nil {
     return .Failure(.DecodeError("Invalid header"))
   }
@@ -109,7 +109,7 @@ func load(jwt:String) -> LoadResult {
     return .Failure(.DecodeError("Payload is not correctly encoded as base64"))
   }
 
-  let payload = NSJSONSerialization.JSONObjectWithData(payloadData!, options: NSJSONReadingOptions(0), error: nil) as? Payload
+  let payload = (try? NSJSONSerialization.JSONObjectWithData(payloadData!, options: NSJSONReadingOptions(rawValue: 0))) as? Payload
   if payload == nil {
     return .Failure(.DecodeError("Invalid payload"))
   }
@@ -126,9 +126,9 @@ func load(jwt:String) -> LoadResult {
 
 func verifySignature(algorithms:[Algorithm], header:Payload, signingInput:String, signature:NSData) -> InvalidToken? {
   if let alg = header["alg"] as? String {
-    let matchingAlgorithms = filter(algorithms) { algorithm in  algorithm.description == alg }
-    let results = map(matchingAlgorithms) { algorithm in algorithm.verify(signingInput, signature: signature) }
-    let successes = filter(results) { $0 }
+    let matchingAlgorithms = algorithms.filter { algorithm in  algorithm.description == alg }
+    let results = matchingAlgorithms.map { algorithm in algorithm.verify(signingInput, signature: signature) }
+    let successes = results.filter { $0 }
     if successes.count > 0 {
       return nil
     }

JWT/JWT.swift

@@ -4,7 +4,7 @@ import CryptoSwift
 public typealias Payload = [String:AnyObject]
 
 /// The supported Algorithms
-public enum Algorithm : Printable {
+public enum Algorithm : CustomStringConvertible {
   /// No Algorithm, i-e, insecure
   case None
 
@@ -19,7 +19,7 @@ public enum Algorithm : Printable {
 
   static func algorithm(name:String, key:String?) -> Algorithm? {
     if name == "none" {
-      if let key = key {
+      if key != nil {
         return nil  // We don't allow nil when we configured a key
       }
       return Algorithm.None
@@ -40,11 +40,11 @@ public enum Algorithm : Printable {
     switch self {
     case .None:
       return "none"
-    case .HS256(let key):
+    case .HS256:
       return "HS256"
-    case .HS384(let key):
+    case .HS384:
       return "HS384"
-    case .HS512(let key):
+    case .HS512:
       return "HS512"
     }
   }
@@ -64,13 +64,13 @@ public enum Algorithm : Printable {
       return ""
 
     case .HS256(let key):
-      return signHS(key, .sha256)
+      return signHS(key, variant: .sha256)
 
     case .HS384(let key):
-      return signHS(key, .sha384)
+      return signHS(key, variant: .sha384)
 
     case .HS512(let key):
-      return signHS(key, .sha512)
+      return signHS(key, variant: .sha512)
     }
   }
 
@@ -83,13 +83,13 @@ public enum Algorithm : Printable {
 // MARK: Encoding
 
 /*** Encode a payload
-  :param: payload The payload to sign
-  :param: algorithm The algorithm to sign the payload with
-  :returns: The JSON web token as a String
+  - parameter payload: The payload to sign
+  - parameter algorithm: The algorithm to sign the payload with
+  - returns: The JSON web token as a String
 */
 public func encode(payload:Payload, algorithm:Algorithm) -> String {
   func encodeJSON(payload:Payload) -> String? {
-    if let data = NSJSONSerialization.dataWithJSONObject(payload, options: NSJSONWritingOptions(0), error: nil) {
+    if let data = try? NSJSONSerialization.dataWithJSONObject(payload, options: NSJSONWritingOptions(rawValue: 0)) {
       return base64encode(data)
     }
 
@@ -176,5 +176,5 @@ public class PayloadBuilder {
 public func encode(algorithm:Algorithm, closure:(PayloadBuilder -> ())) -> String {
   let builder = PayloadBuilder()
   closure(builder)
-  return encode(builder.payload, algorithm)
+  return encode(builder.payload, algorithm: algorithm)
 }