Merge pull request #2090 from xamarin/port-maui-15412

Fix failing auth redirect on Android
xamarin · Jun 15, 2023 · f264e71 · f264e71
2 parents 25ceeea + b3acca3
commit f264e71
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 7 deletions.
diff --git a/Xamarin.Essentials/WebAuthenticator/WebAuthenticator.android.cs b/Xamarin.Essentials/WebAuthenticator/WebAuthenticator.android.cs
@@ -14,6 +14,8 @@ public partial class WebAuthenticator
         static TaskCompletionSource<WebAuthenticatorResult> tcsResponse = null;
         static Uri currentRedirectUri = null;
 
+        internal static bool AuthenticatingWithCustomTabs { get; private set; } = false;
+
         internal static bool OnResume(Intent intent)
         {
             // If we aren't waiting on a task, don't handle the url
@@ -71,7 +73,11 @@ static async Task<WebAuthenticatorResult> PlatformAuthenticateAsync(WebAuthentic
             tcsResponse = new TaskCompletionSource<WebAuthenticatorResult>();
             currentRedirectUri = callbackUrl;
 
-            if (!(await StartCustomTabsActivity(url)))
+            // Try to start with custom tabs if the system supports it and we resolve it
+            AuthenticatingWithCustomTabs = await StartCustomTabsActivity(url);
+
+            // Fall back to using the system browser if necessary
+            if (!AuthenticatingWithCustomTabs)
             {
                 // Fall back to opening the system-registered browser if necessary
                 var urlOriginalString = url.OriginalString;

diff --git a/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorCallbackActivity.android.cs b/Xamarin.Essentials/WebAuthenticator/WebAuthenticatorCallbackActivity.android.cs
@@ -10,11 +10,21 @@ protected override void OnCreate(Bundle savedInstanceState)
         {
             base.OnCreate(savedInstanceState);
 
-            // start the intermediate activity again with flags to close the custom tabs
-            var intent = new Intent(this, typeof(WebAuthenticatorIntermediateActivity));
-            intent.SetData(Intent.Data);
-            intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
-            StartActivity(intent);
+            // Check how we launched the flow initially
+            if (WebAuthenticator.AuthenticatingWithCustomTabs)
+            {
+                // start the intermediate activity again with flags to close the custom tabs
+                var intent = new Intent(this, typeof(WebAuthenticatorIntermediateActivity));
+                intent.SetData(Intent.Data);
+                intent.AddFlags(ActivityFlags.ClearTop | ActivityFlags.SingleTop);
+                StartActivity(intent);
+            }
+            else
+            {
+                // No intermediate activity if we returned from a system browser
+                // intent since there's no custom tab instance to clean up
+                WebAuthenticator.OnResume(Intent);
+            }
 
             // finish this activity
             Finish();

diff --git a/azure-pipelines.yml b/azure-pipelines.yml
@@ -8,7 +8,7 @@ pr:
   - develop
 
 variables:
-  BASE_VERSION: 1.7.1
+  BASE_VERSION: 1.8.0
   PREVIEW_LABEL: 'ci'
   BUILD_NUMBER: $[counter(format('{0}_{1}_{2}', variables['BASE_VERSION'], variables['PREVIEW_LABEL'], variables['Build.SourceBranch']), 1)]
   NUGET_VERSION: $[format('{0}-{1}.{2}', variables['BASE_VERSION'], variables['PREVIEW_LABEL'], variables['BUILD_NUMBER'])]