Try Base64-decoding state with each of the three possible amounts o…

…f padding (#48)

* Try Base64-decoding `state` with each of the three possible amounts of padding

* Bump the version number from "2.0.0" to "2.0.1"

Project.toml

@@ -1,7 +1,7 @@
 name = "SMARTAppLaunch"
 uuid = "d2818e16-7729-416e-a683-becc19f3d01b"
 authors = ["Dilum Aluthge", "contributors"]
-version = "2.0.0"
+version = "2.0.1"
 
 [deps]
 Base64 = "2a0f44e3-6c83-55bd-87e4-b1978d98bd5f"

src/provider/ehr_launch.jl

@@ -190,6 +190,24 @@ function provider_ehr_launch_part_two(
     return location_queryparams
 end
 
+@static if Base.VERSION >= v"1.9-"
+    const my_base64decode = Base64.base64decode
+else
+    # padding is needed for `base64decode` to work on older versions of Julia
+    # https://github.com/JuliaLang/julia/pull/44503
+    function my_base64decode(str::AbstractString)
+        try
+            Base64.base64decode(str)
+        catch
+            try
+                Base64.base64decode(str * "=")
+            catch
+                Base64.base64decode(str * "==")
+            end
+        end
+    end
+end
+
 """
     provider_ehr_launch_part_three(
         config::ProviderEHRLaunchConfig,
@@ -210,14 +228,7 @@ function provider_ehr_launch_part_three(
     end
     authorization_code = location_queryparams["code"]::String
     state = location_queryparams["state"]::String
-    @static if Base.VERSION < v"1.9-"
-        # padding is needed for `base64decode` to work on older versions of Julia
-        # https://github.com/JuliaLang/julia/pull/44503
-        if !endswith(state, "==")
-            state = state * "=="
-        end
-    end
-    state_json = Base64.base64decode(state)
+    state_json = my_base64decode(state)
     state_dict = JSON3.read(state_json)
     token_endpoint_original = state_dict[:token_endpoint]::String
     token_endpoint_stripped = strip(token_endpoint_original)