Fix web authenticator not called on main thread authgear#44

roxk · Jun 2, 2022 · b9f290d · b9f290d
1 parent f384b7f
commit b9f290d
Showing 1 changed file with 14 additions and 11 deletions.
diff --git a/Authgear.Xamarin/AuthgearSdk.cs b/Authgear.Xamarin/AuthgearSdk.cs
@@ -390,19 +390,22 @@ private async Task<string> GetAuthorizeEndpointAsync(OidcAuthenticationRequest r
         /// <returns>Redirect URI with query parameters</returns>
         private async Task<string> OpenAuthorizeUrlAsync(string redirectUrl, string authorizeUrl)
         {
-            // WebAuthenticator abstracts the uri for us but we need the uri in FinishAuthorization.
-            // Substitute the uri for now.
-            var result = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions
+            return await MainThread.InvokeOnMainThreadAsync(async () =>
             {
-                Url = new Uri(authorizeUrl),
-                CallbackUrl = new Uri(redirectUrl),
-                PrefersEphemeralWebBrowserSession = !shareSessionWithSystemBrowser
+                var result = await WebAuthenticator.AuthenticateAsync(new WebAuthenticatorOptions
+                {
+                    Url = new Uri(authorizeUrl),
+                    CallbackUrl = new Uri(redirectUrl),
+                    PrefersEphemeralWebBrowserSession = !shareSessionWithSystemBrowser
+                }).ConfigureAwait(false);
+                // WebAuthenticator abstracts the redirect uri (WebAuthenticatorResult) for us but we need the uri in FinishAuthorization.
+                // Substitute the uri for now.
+                var builder = new UriBuilder(redirectUrl)
+                {
+                    Query = result.Properties.ToQueryParameter()
+                };
+                return builder.ToString();
             }).ConfigureAwait(false);
-            var builder = new UriBuilder(redirectUrl)
-            {
-                Query = result.Properties.ToQueryParameter()
-            };
-            return builder.ToString();
         }
 
         private async Task<(UserInfo userInfo, OidcTokenResponse tokenResponse)> ParseDeepLinkAndGetUserAsync(string deepLink, string codeVerifier)