fix external js runner close issue in Boilerplate (#10316)

src/Templates/Boilerplate/Bit.Boilerplate/settings.VisualStudio.json

@@ -1,6 +1,7 @@
 /* Visual Studio Settings File */
 {
-    "debugging.general.disableJITOptimization": true,
-    "environment.documents.saveWithSpecificEncoding": true,
-    "environment.documents.saveEncoding": "utf-8;65001"
+  "languages.defaults.general.lineNumbers": true,
+  "debugging.general.disableJITOptimization": true,
+  "environment.documents.saveWithSpecificEncoding": true,
+  "environment.documents.saveEncoding": "utf-8;65001"
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignIn/SignInPage.razor.cs

@@ -152,7 +152,7 @@ private async Task HandleOnSocialSignIn(string provider)
     {
         try
         {
-            var port = localHttpServer.ShouldUseForSocialSignIn() ? localHttpServer.EnsureStarted() : -1;
+            var port = localHttpServer.EnsureStarted();
 
             var redirectUrl = await identityController.GetSocialSignInUri(provider, ReturnUrlQueryString, port is -1 ? null : port, CurrentCancellationToken);
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Components/Pages/Identity/SignUp/SignUpPage.razor.cs

@@ -75,7 +75,7 @@ private async Task SocialSignUp(string provider)
     {
         try
         {
-            var port = localHttpServer.ShouldUseForSocialSignIn() ? localHttpServer.EnsureStarted() : -1;
+            var port = localHttpServer.EnsureStarted();
 
             var redirectUrl = await identityController.GetSocialSignInUri(provider, ReturnUrlQueryString, port is -1 ? null : port, CurrentCancellationToken);
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Scripts/ExternalJsRunner.ts

@@ -1,4 +1,4 @@
-// Checkout external-js-runner.html
+// Checkout external-js-runner.html
 class ExternalJsRunner {
     public static async run() {
         const host = window.origin.replace('http://', '');
@@ -12,11 +12,10 @@ class ExternalJsRunner {
                 } else if (request.type == 'createCredential') {
                     result = await WebAuthn.createCredential(request.options);
                 } else if (request.type == 'close') {
-                    result = {};
                     localWebSocket.close();
-                    setTimeout(() => {
-                        window.close();
-                    }, 100);
+                    window.close();
+                    window.location.assign('/close-browser');
+                    return;
                 }
                 localWebSocket.send(JSON.stringify({ body: result }));
             }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/Contracts/ILocalHttpServer.cs

@@ -7,16 +7,4 @@ public interface ILocalHttpServer : IAsyncDisposable
     int Port { get; }
 
     string? Origin { get; }
-
-    /// <summary>
-    /// Social sign-in on the web version of the app uses simple redirects. However, for Android, iOS, Windows, and macOS, social sign-in requires an in-app or external browser.
-    /// 
-    /// # Navigating Back to the App After Social Sign-In
-    /// 1. **Universal Deep Links**: Allow the app to directly handle specific web links (for iOS and Android apps).
-    /// 2. **Local HTTP Server**: Works similarly to how `git.exe` manages sign-ins with services like GitHub (supported on iOS, Android, Windows, and macOS).
-    ///
-    /// - **iOS, Windows, and macOS**: Use local HTTP server implementations in MAUI and Windows projects.
-    /// - **Android**: Use universal links.
-    /// </summary>
-    bool ShouldUseForSocialSignIn();
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/HttpMessageHandlers/RequestHeadersDelegatingHandler.cs

@@ -12,7 +12,7 @@ protected override async Task<HttpResponseMessage> SendAsync(HttpRequestMessage
         request.SetBrowserRequestCredentials(BrowserRequestCredentials.Omit);
         request.SetBrowserResponseStreamingEnabled(true);
 
-        request.Version = HttpVersion.Version30;
+        request.Version = HttpVersion.Version20;
         request.VersionPolicy = HttpVersionPolicy.RequestVersionOrLower;
 
         if (request.Headers.UserAgent.Any() is false)

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/Services/NoopLocalHttpServer.cs

@@ -8,10 +8,5 @@ public partial class NoOpLocalHttpServer : ILocalHttpServer
 
     public int Port => -1;
 
-    /// <summary>
-    /// <inheritdoc cref="ILocalHttpServer.ShouldUseForSocialSignIn"/>
-    /// </summary>
-    public bool ShouldUseForSocialSignIn() => false;
-
     public ValueTask DisposeAsync() => ValueTask.CompletedTask;
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiLocalHttpServer.cs

@@ -33,23 +33,7 @@ public int EnsureStarted()
             {
                 try
                 {
-                    // Redirect to SocialSignedInPage.razor that will close the browser window.
-                    var url = new Uri(absoluteServerAddress, $"/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}").ToString();
-                    ctx.Redirect(url);
-
-                    if (AppPlatform.IsIOS)
-                    {
-                        // SocialSignedInPage.razor's `window.close()` does NOT work on iOS's in app browser.
-                        await MainThread.InvokeOnMainThreadAsync(() =>
-                        {
-#if iOS
-                            if (UIKit.UIApplication.SharedApplication.KeyWindow?.RootViewController?.PresentedViewController is SafariServices.SFSafariViewController controller)
-                            {
-                                controller.DismissViewController(animated: true, completionHandler: null);
-                            }
-#endif
-                        });
-                    }
+                    ctx.Redirect("/close-browser");
 
                     _ = Task.Delay(1)
                     .ContinueWith(async _ =>
@@ -65,10 +49,42 @@ await MainThread.InvokeOnMainThreadAsync(async () =>
                     exceptionHandler.Handle(exp);
                 }
             }))
+            .WithModule(new ActionModule("/close-browser", HttpVerbs.Get, async ctx =>
+            {
+                // Redirect to CloseBrowserPage.razor that will close the browser window.
+                var url = new Uri(absoluteServerAddress, $"/api/Identity/CloseBrowserPage?culture={CultureInfo.CurrentUICulture.Name}").ToString();
+                ctx.Redirect(url);
+
+                if (AppPlatform.IsIOS)
+                {
+                    // CloseBrowserPage.razor's `window.close()` does NOT work on iOS's in app browser.
+                    await MainThread.InvokeOnMainThreadAsync(() =>
+                    {
+#if iOS
+                        if (UIKit.UIApplication.SharedApplication.KeyWindow?.RootViewController?.PresentedViewController is SafariServices.SFSafariViewController controller)
+                        {
+                            controller.DismissViewController(animated: true, completionHandler: null);
+                        }
+#endif
+                    });
+                }
+                else if (AppPlatform.IsAndroid)
+                {
+#if Android
+                    await MainThread.InvokeOnMainThreadAsync(() =>
+                    {
+                        var intent = new Android.Content.Intent(Platform.AppContext, typeof(Platforms.Android.MainActivity));
+                        intent.SetFlags(Android.Content.ActivityFlags.NewTask | Android.Content.ActivityFlags.ClearTop);
+                        Platform.AppContext.StartActivity(intent);
+                    });
+#endif
+                }
+            }))
             .WithModule(new ActionModule("/external-js-runner.html", HttpVerbs.Get, async ctx =>
             {
                 try
                 {
+                    ctx.Response.ContentType = "text/html";
                     await using var file = Assembly.Load("Boilerplate.Client.Maui").GetManifestResourceStream("Boilerplate.Client.Maui.wwwroot.external-js-runner.html")!;
                     await file.CopyToAsync(ctx.Response.OutputStream, ctx.CancellationToken);
                 }
@@ -81,6 +97,7 @@ await MainThread.InvokeOnMainThreadAsync(async () =>
             {
                 try
                 {
+                    ctx.Response.ContentType = "application/javascript";
                     await using var file = Assembly.Load("Boilerplate.Client.Maui").GetManifestResourceStream("Boilerplate.Client.Maui.wwwroot.scripts.app.js")!;
                     await file.CopyToAsync(ctx.Response.OutputStream, ctx.CancellationToken);
                 }
@@ -126,11 +143,4 @@ public async ValueTask DisposeAsync()
         localHttpServer?.Dispose();
     }
 
-    /// <summary>
-    /// <inheritdoc cref="ILocalHttpServer.ShouldUseForSocialSignIn"/>
-    /// </summary>
-    public bool ShouldUseForSocialSignIn()
-    {
-        return AppPlatform.IsAndroid is false;
-    }
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/Services/MauiWebAuthnService.cs

@@ -26,21 +26,7 @@ public override async ValueTask<AuthenticatorAssertionRawResponse> GetWebAuthnCr
 
     private static async Task CloseExternalBrowser()
     {
-        await MauiExternalJsRunner.RequestToBeSent!.Invoke(JsonSerializer.SerializeToDocument(new { Type = "close" }, JsonSerializerOptions.Web));
-
-        if (AppPlatform.IsIOS)
-        {
-            // SocialSignedInPage.razor's `window.close()` does NOT work on iOS's in app browser.
-            await MainThread.InvokeOnMainThreadAsync(() =>
-            {
-#if iOS
-                if (UIKit.UIApplication.SharedApplication.KeyWindow?.RootViewController?.PresentedViewController is SafariServices.SFSafariViewController controller)
-                {
-                    controller.DismissViewController(animated: true, completionHandler: null);
-                }
-#endif
-            });
-        }
+        _ = MauiExternalJsRunner.RequestToBeSent!.Invoke(JsonSerializer.SerializeToDocument(new { Type = "close" }, JsonSerializerOptions.Web));
     }
 
     public override async ValueTask<AuthenticatorAttestationRawResponse> CreateWebAuthnCredential(CredentialCreateOptions options)

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/wwwroot/external-js-runner.html

@@ -1,36 +1,40 @@
-<html>
+<html>
 <head>
     <base href="/" />
-    <title>&#128274; Passwordless login</title>
-    <link rel="icon" href="data:;base64,iVBORw0KGgo=">
+    <title>Boilerplate</title>
+    <link rel="icon" href="data:image/png;base64,iVBORw0KGgo=">
     <style>
-        body {
-            background-color: #FFFFFF;
+
+        html, body, main {
+            margin: 0;
+            padding: 0;
+            height: 100%;
+            font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif;
+            background: #FFFFFF;
         }
 
-        .fluent {
-            color: #010409;
+        .fluent-button {
             border: none;
-            padding: 12px 24px;
-            border-radius: 2px;
             cursor: pointer;
-            font-size: 18px;
+            font-size: 50px;
+            border-radius: 2px;
+            background: #FFFFFF;
         }
 
         .container {
             display: flex;
-            justify-content: center;
-            align-items: center;
             height: 100vh;
+            align-items: center;
+            justify-content: center;
         }
 
         @media (prefers-color-scheme: dark) {
             body {
-                background-color: #010409;
+                background: #010409;
             }
 
-            .fluent {
-                color: #FFFFFF;
+            .fluent-button {
+                background: #010409;
             }
         }
     </style>
@@ -41,7 +45,7 @@
     -->
 
     <div class="container">
-        <button class="primary" onclick="window.close()">&#x1F519;</button>
+        <button class="fluent-button" onclick="window.close();">&#x1F519;</button>
     </div>
 
     <script src="app.js"></script>

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsLocalHttpServer.cs

@@ -35,17 +35,11 @@ public int EnsureStarted()
             {
                 try
                 {
-                    var url = new Uri(absoluteServerAddress, $"/api/Identity/SocialSignedIn?culture={CultureInfo.CurrentUICulture.Name}").ToString();
-
-                    ctx.Redirect(url);
+                    ctx.Redirect("/close-browser");
 
                     _ = Task.Delay(1)
                         .ContinueWith(async _ =>
                         {
-                            Application.OpenForms[0]!.Invoke(() =>
-                            {
-                                Application.OpenForms[0]!.Activate();
-                            });
                             await Routes.OpenUniversalLink(ctx.Request.Url.PathAndQuery, replace: true);
                         });
                 }
@@ -54,10 +48,22 @@ public int EnsureStarted()
                     exceptionHandler.Handle(exp);
                 }
             }))
+            .WithModule(new ActionModule("/close-browser", HttpVerbs.Get, async ctx =>
+            {
+                // Redirect to CloseBrowserPage.razor that will close the browser window.
+                var url = new Uri(absoluteServerAddress, $"/api/Identity/CloseBrowserPage?culture={CultureInfo.CurrentUICulture.Name}").ToString();
+                ctx.Redirect(url);
+
+                Application.OpenForms[0]!.Invoke(() =>
+                {
+                    Application.OpenForms[0]!.Activate();
+                });
+            }))
             .WithModule(new ActionModule("/external-js-runner.html", HttpVerbs.Get, async ctx =>
             {
                 try
                 {
+                    ctx.Response.ContentType = "text/html";
                     await using var fileStream = File.OpenRead("wwwroot/external-js-runner.html");
                     await fileStream.CopyToAsync(ctx.Response.OutputStream, ctx.CancellationToken);
                 }
@@ -70,6 +76,7 @@ public int EnsureStarted()
             {
                 try
                 {
+                    ctx.Response.ContentType = "application/javascript";
                     var filePath = Path.Combine(AppContext.BaseDirectory, @"wwwroot\_content\Boilerplate.Client.Core\scripts\app.js");
                     if (File.Exists(filePath) is false)
                     {
@@ -106,12 +113,6 @@ public int EnsureStarted()
         return port;
     }
 
-    /// <summary>
-    /// <inheritdoc cref="ILocalHttpServer.ShouldUseForSocialSignIn"/>
-    /// </summary>
-
-    public bool ShouldUseForSocialSignIn() => true;
-
     public async ValueTask DisposeAsync()
     {
         localHttpServer?.Dispose();

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/Services/WindowsWebAuthnService.cs

@@ -26,12 +26,7 @@ public override async ValueTask<AuthenticatorAssertionRawResponse> GetWebAuthnCr
 
     private static async Task CloseExternalBrowser()
     {
-        await WindowsExternalJsRunner.RequestToBeSent!.Invoke(JsonSerializer.SerializeToDocument(new { Type = "close" }, JsonSerializerOptions.Web));
-
-        Application.OpenForms[0]!.Invoke(() =>
-        {
-            Application.OpenForms[0]!.Activate();
-        });
+        _ = WindowsExternalJsRunner.RequestToBeSent!.Invoke(JsonSerializer.SerializeToDocument(new { Type = "close" }, JsonSerializerOptions.Web));
     }
 
     public override async ValueTask<AuthenticatorAttestationRawResponse> CreateWebAuthnCredential(CredentialCreateOptions options)