Merge pull request #193 from ibm-cloud-security/b64-refactor

B64 refactor

.travis.yml

@@ -1,7 +1,7 @@
 language: objective-c
 matrix:
   include:
-    - osx_image: xcode10.2
+    - osx_image: xcode12.3
 install:
   - gem install jazzy
   - gem install slather -v 2.4.5

IBMCloudAppID.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
     s.name         = "IBMCloudAppID"
-    s.version      = '6.0.2'
+    s.version      = '6.0.3'
     s.summary      = "AppID Swift SDK"
     s.homepage     = "https://github.com/ibm-cloud-security/appid-clientsdk-swift"
     s.license      = 'Apache License, Version 2.0'

Source/IBMCloudAppID/internal/Utils.swift

@@ -15,7 +15,16 @@ import BMSCore
 
 
 public class Utils {
-
+
+    public static func base64urlToBase64(base64url: String) -> String {
+        var base64 = base64url
+            .replacingOccurrences(of: "-", with: "+")
+            .replacingOccurrences(of: "_", with: "/")
+        if base64.count % 4 != 0 {
+            base64.append(String(repeating: "=", count: 4 - base64.count % 4))
+        }
+        return base64
+    }
 
     public static func JSONStringify(_ value: AnyObject, prettyPrinted:Bool = false) throws -> String{
 

Source/IBMCloudAppID/internal/tokens/AbstractToken.swift

@@ -45,8 +45,8 @@ internal class AbstractToken: Token {
         self.signature = tokenComponents[2]
 
         guard
-            let headerDecodedData = Utils.decodeBase64WithString(headerComponent, isSafeUrl: true),
-            let payloadDecodedData = Utils.decodeBase64WithString(payloadComponent, isSafeUrl: true)
+            let headerDecodedData = Data(base64Encoded: Utils.base64urlToBase64(base64url: headerComponent)),
+            let payloadDecodedData = Data(base64Encoded: Utils.base64urlToBase64(base64url: payloadComponent))
             else {
                 return nil
         }