Improve base 64 URI decoder

kylef · kylef · commit b689dc035839 · 2015-04-04T23:48:26.000+01:00
diff --git a/JWT/JWT.swift b/JWT/JWT.swift
@@ -46,7 +46,10 @@ func base64decode(input:String) -> NSData? {
     ending = String(count: amount, repeatedValue: Character("="))
   }
 
-  return NSData(base64EncodedString: input + ending, options: NSDataBase64DecodingOptions(0))
+  let base64 = input.stringByReplacingOccurrencesOfString("-", withString: "+", options: NSStringCompareOptions(0), range: nil)
+    .stringByReplacingOccurrencesOfString("_", withString: "/", options: NSStringCompareOptions(0), range: nil) + ending
+
+  return NSData(base64EncodedString: base64, options: NSDataBase64DecodingOptions(0))
 }
 
 func load(jwt:String) -> LoadResult {

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,10 @@ func base64decode(input:String) -> NSData? {`
`46`	`46`	`ending = String(count: amount, repeatedValue: Character("="))`
`47`	`47`	`}`
`48`	`48`
`49`		`- return NSData(base64EncodedString: input + ending, options: NSDataBase64DecodingOptions(0))`
	`49`	`+ let base64 = input.stringByReplacingOccurrencesOfString("-", withString: "+", options: NSStringCompareOptions(0), range: nil)`
	`50`	`+ .stringByReplacingOccurrencesOfString("_", withString: "/", options: NSStringCompareOptions(0), range: nil) + ending`
	`51`	`+`
	`52`	`+ return NSData(base64EncodedString: base64, options: NSDataBase64DecodingOptions(0))`
`50`	`53`	`}`
`51`	`54`
`52`	`55`	`func load(jwt:String) -> LoadResult {`