fix

src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json

@@ -308,7 +308,7 @@
             "replaces": "use-your-server-url-here.com"
         },
         "webAppUrl": {
-            "displayName": "Server url",
+            "displayName": "web app url",
             "type": "parameter",
             "datatype": "string",
             "defaultValue": "use-your-web-app-url-here.com",

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/ClientMauiSettings.cs

@@ -6,7 +6,8 @@ namespace Boilerplate.Client.Maui;
 public class ClientMauiSettings : ClientCoreSettings
 {
     /// <summary>
-    /// Specify the web app url in if API server and web app are hosted separately for proper link/url generation (e.g., email confirmation, social sign-in).
+    /// When the maui app sends a request to the API server, and the API server and web app are hosted on different URLs,
+    /// the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.
     /// </summary>
     public string? WebAppUrl { get; set; }
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Maui/appsettings.json

@@ -1,5 +1,5 @@
 {
     "WebAppUrl": "use-your-web-app-url-here.com",
-    "WebAppUrl_Comment": "Specify the origin in Blazor Hybrid (MAUI/Windows) if API and web are hosted separately for proper navigation (e.g., email confirmation, social sign-in).",
+    "WebAppUrl_Comment": "When the maui app sends a request to the API server, and the API server and web app are hosted on different URLs, the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.",
     "$schema": "https://json.schemastore.org/appsettings.json"
 }

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/ClientWindowsSettings.cs

@@ -6,7 +6,8 @@ namespace Boilerplate.Client.Windows;
 public class ClientWindowsSettings : ClientCoreSettings
 {
     /// <summary>
-    /// Specify the web app url in if API server and web app are hosted separately for proper link/url generation (e.g., email confirmation, social sign-in).
+    /// When the Windows app sends a request to the API server, and the API server and web app are hosted on different URLs,
+    /// the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.
     /// </summary>
     public string? WebAppUrl { get; set; }
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Windows/appsettings.json

@@ -1,6 +1,6 @@
 {
     "WebAppUrl": "use-your-web-app-url-here.com",
-    "WebAppUrl_Comment": "Specify the origin in Blazor Hybrid (MAUI/Windows) if API and web are hosted separately for proper navigation (e.g., email confirmation, social sign-in).",
+    "WebAppUrl_Comment": "When the Windows app sends a request to the API server, and the API server and web app are hosted on different URLs, the origin of the generated links (e.g., email confirmation links) will depend on `WebAppUrl` value.",
     "WindowsUpdate": {
         "FilesUrl": null,
         "AutoReload": true

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ElevatedAccessTokenTemplate.razor

@@ -48,12 +48,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetClientUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetClientUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/EmailTokenTemplate.razor

@@ -52,12 +52,12 @@
         <table style="width:100%;text-align:center;margin-top:30px;">
             <tr>
                 <td style="padding-bottom:10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetClientUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="font-size:12px" href="@HttpContext.Request.GetClientUrl()">
+                    <a style="font-size:12px" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/OtpTemplate.razor

@@ -58,12 +58,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetClientUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetClientUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/ResetPasswordTokenTemplate.razor

@@ -58,12 +58,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetClientUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetClientUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Components/TwoFactorTokenTemplate.razor

@@ -48,12 +48,12 @@
                style="padding:20px; text-align:center;">
             <tr>
                 <td style="padding-bottom: 10px;">
-                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetClientUrl(), "images/icon.png"))" width="30" height="20" />
+                    <img alt="Company Logo" src="@(new Uri(HttpContext.Request.GetWebAppUrl(), "images/icon.png"))" width="30" height="20" />
                 </td>
             </tr>
             <tr>
                 <td>
-                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetClientUrl()">
+                    <a style="text-decoration:none; color:#0065EF; font-weight:400; font-size:12px; line-height:150%;" href="@HttpContext.Request.GetWebAppUrl()">
                         @EmailLocalizer[nameof(EmailStrings.AppName)]
                     </a>
                 </td>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.EmailConfirmation.cs

@@ -78,7 +78,7 @@ private async Task SendConfirmEmailToken(User user, string? returnUrl, Cancellat
 
         var email = user.Email!;
         var token = await userManager.GenerateUserTokenAsync(user, TokenOptions.DefaultPhoneProvider, FormattableString.Invariant($"VerifyEmail:{email},{user.EmailTokenRequestedOn?.ToUniversalTime()}"));
-        var link = new Uri(HttpContext.Request.GetClientUrl(), $"{Urls.ConfirmPage}?email={Uri.EscapeDataString(email)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}&return-url={returnUrl}");
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), $"{Urls.ConfirmPage}?email={Uri.EscapeDataString(email)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}&return-url={returnUrl}");
 
         await emailService.SendEmailToken(user, email, token, link, cancellationToken);
     }

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.ResetPassword.cs

@@ -36,7 +36,7 @@ public async Task SendResetPasswordToken(SendResetPasswordTokenRequestDto reques
         var isEmail = string.IsNullOrEmpty(request.Email) is false;
         var qs = $"{(isEmail ? "email" : "phoneNumber")}={Uri.EscapeDataString(isEmail ? request.Email! : request.PhoneNumber!)}";
         var url = $"{Urls.ResetPasswordPage}?token={Uri.EscapeDataString(token)}&{qs}&culture={CultureInfo.CurrentUICulture.Name}";
-        var link = new Uri(HttpContext.Request.GetClientUrl(), url);
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), url);
 
         List<Task> sendMessagesTasks = [];
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.SocialSignIn.cs

@@ -95,7 +95,7 @@ public async Task<ActionResult> SocialSignInCallback(string? returnUrl = null, i
         }
 
         if (localHttpPort is not null) return Redirect(new Uri(new Uri($"http://localhost:{localHttpPort}"), url).ToString());
-        return Redirect(new Uri(Request.HttpContext.Request.GetClientUrl(), url).ToString());
+        return Redirect(new Uri(Request.HttpContext.Request.GetWebAppUrl(), url).ToString());
     }
 
     [LoggerMessage(Level = LogLevel.Error, Message = "Failed to perform {loginProvider} social sign in for {principal}")]

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/IdentityController.cs

@@ -297,7 +297,7 @@ public async Task SendOtp(IdentityRequestDto request, string? returnUrl = null,
 
         var (magicLinkToken, url) = await GenerateAutomaticSignInLink(user, returnUrl, originalAuthenticationMethod: "Email");
 
-        var link = new Uri(HttpContext.Request.GetClientUrl(), url);
+        var link = new Uri(HttpContext.Request.GetWebAppUrl(), url);
 
         List<Task> sendMessagesTasks = [];
 

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Controllers/Identity/UserController.cs

@@ -170,7 +170,7 @@ public async Task SendChangeEmailToken(SendEmailTokenRequestDto request, Cancell
             FormattableString.Invariant($"ChangeEmail:{request.Email},{user.EmailTokenRequestedOn?.ToUniversalTime()}"));
 
         var link = new Uri(
-            HttpContext.Request.GetClientUrl(),
+            HttpContext.Request.GetWebAppUrl(),
             $"{Urls.SettingsPage}/{Urls.SettingsSections.Account}?email={Uri.EscapeDataString(request.Email!)}&emailToken={Uri.EscapeDataString(token)}&culture={CultureInfo.CurrentUICulture.Name}");
 
         await emailService.SendEmailToken(user, request.Email!, token, link, cancellationToken);

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/Extensions/HttpRequestExtensions.cs

@@ -4,7 +4,7 @@ namespace Microsoft.AspNetCore.Http;
 
 public static partial class HttpRequestExtensions
 {
-    internal static Uri GetClientUrl(this HttpRequest req)
+    internal static Uri GetWebAppUrl(this HttpRequest req)
     {
         var settings = req.HttpContext.RequestServices.GetRequiredService<ServerApiSettings>();
 
@@ -14,7 +14,7 @@ internal static Uri GetClientUrl(this HttpRequest req)
             return new Uri(validOrigin);
         }
 
-        return req.GetBaseUrl();
+        return req.GetBaseUrl(); // API server and web app are hosted on the same location.
     }
 
     /// <summary>

src/Templates/Boilerplate/Bit.Boilerplate/src/Server/Boilerplate.Server.Api/ServerApiSettings.cs

@@ -1,8 +1,8 @@
 //+:cnd:noEmit
 //#if (notification == true)
-using System.Text.RegularExpressions;
 using AdsPush.Abstraction.Settings;
 //#endif
+using System.Text.RegularExpressions;
 
 namespace Boilerplate.Server.Api;