From 4f16cd2d012c12a8ce802921c96db0f11e3fc0bd Mon Sep 17 00:00:00 2001
From: sbwalker <shaun.walker@siliqon.com>
Date: Mon, 21 Apr 2025 15:14:39 -0400
Subject: [PATCH] url mapping improvements

---
 .../Modules/Admin/UrlMappings/Add.razor       | 77 +++++++++++--------
 .../Modules/Admin/UrlMappings/Edit.razor      |  2 +-
 .../Modules/Admin/UrlMappings/Add.resx        |  9 ++-
 .../Modules/Admin/UrlMappings/Edit.resx       |  2 +-
 Oqtane.Client/UI/SiteRouter.razor             |  2 +-
 Oqtane.Server/Components/App.razor            |  2 +-
 6 files changed, 57 insertions(+), 37 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
index a0a7ac9f..8f43985d 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
@@ -8,9 +8,12 @@
 <form @ref="form" class="@(validated ? "was-validated" : "needs-validation")" novalidate>
     <div class="container">
         <div class="row mb-1 align-items-center">
-            <Label Class="col-sm-3" For="url" HelpText="The fully qualified Url for this site" ResourceKey="Url">Url:</Label>
+            <Label Class="col-sm-3" For="url" HelpText="An absolute Url for this site" ResourceKey="Url">Url:</Label>
             <div class="col-sm-9">
-                <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                <div class="input-group">
+                    <input id="url" class="form-control" @bind="@_url" maxlength="500" required />
+                    <button type="button" class="btn btn-primary" @onclick="GenerateUrl">@Localizer["Generate"]</button>
+                </div>
             </div>
         </div>
         <div class="row mb-1 align-items-center">
@@ -49,43 +52,57 @@
                 _url = (!_url.StartsWith("http")) ? url + _url : _url;
 
                 _mappedurl = _mappedurl.Replace(url, "");
-                _mappedurl = (_mappedurl.StartsWith("/")) ? _mappedurl.Substring(1) : _mappedurl;
+                _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
 
                 if (_url.StartsWith(url))
-				{
-					var urlmapping = new UrlMapping();
-					urlmapping.SiteId = PageState.Site.SiteId;
+                {
+                    var urlmapping = new UrlMapping();
+                    urlmapping.SiteId = PageState.Site.SiteId;
                     urlmapping.Url = new Route(_url, PageState.Alias.Path).PagePath;
-					urlmapping.MappedUrl = _mappedurl;
-					urlmapping.Requests = 0;
-					urlmapping.CreatedOn = DateTime.UtcNow;
-					urlmapping.RequestedOn = DateTime.UtcNow;
+                    urlmapping.MappedUrl = _mappedurl;
+                    urlmapping.Requests = 0;
+                    urlmapping.CreatedOn = DateTime.UtcNow;
+                    urlmapping.RequestedOn = DateTime.UtcNow;
 
-					try
-					{
-						urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
-						await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
-						NavigationManager.NavigateTo(NavigateUrl());
-					}
-					catch (Exception ex)
-					{
-						await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
-						AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
-					}
-				}
-				else
-				{
-					AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
-				}
-			}
-			else
-			{
+                    try
+                    {
+                        urlmapping = await UrlMappingService.AddUrlMappingAsync(urlmapping);
+                        await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
+                        NavigationManager.NavigateTo(NavigateUrl());
+                    }
+                    catch (Exception ex)
+                    {
+                        await logger.LogError(ex, "Error Saving UrlMapping {UrlMapping} {Error}", urlmapping, ex.Message);
+                        AddModuleMessage(Localizer["Error.SaveUrlMapping"], MessageType.Error);
+                    }
+                }
+                else
+                {
+                    AddModuleMessage(Localizer["Message.SaveUrlMapping"], MessageType.Warning);
+                }
+            }
+            else
+            {
                 AddModuleMessage(Localizer["Message.DuplicateUrlMapping"], MessageType.Warning);
-			}
+            }
         }
         else
         {
             AddModuleMessage(SharedLocalizer["Message.InfoRequired"], MessageType.Warning);
         }
     }
+
+    private void GenerateUrl()
+    {
+        var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
+        url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
+
+        var chars = "abcdefghijklmnopqrstuvwxyz";
+        Random rnd = new Random();
+        for (int i = 0; i < 5; i++)
+        {
+            url += chars.Substring(rnd.Next(0, chars.Length - 1), 1);
+        }
+        _url = url;
+    }
 }
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
index 073f851d..78a062f9 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
@@ -68,7 +68,7 @@
 					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
                     _mappedurl = _mappedurl.Replace(url, "");
-                    _mappedurl = (_mappedurl.StartsWith("/")) ? _mappedurl.Substring(1) : _mappedurl;
+                    _mappedurl = (_mappedurl.StartsWith("/") && _mappedurl != "/") ? _mappedurl.Substring(1) : _mappedurl;
 
 					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
 					urlmapping.MappedUrl = _mappedurl;
diff --git a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
index e1185498..a8de1c59 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Add.resx
@@ -1,4 +1,4 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <root>
   <!-- 
     Microsoft ResX Schema 
@@ -121,10 +121,10 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A relative or absolute Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected. Use "/" for site root path.</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
-    <value>An absolute Url identifying a path to a specific page in the site</value>
+    <value>An absolute Url for this site</value>
   </data>
   <data name="Url.Text" xml:space="preserve">
     <value>Url:</value>
@@ -141,4 +141,7 @@
   <data name="Message.SaveUrlMapping" xml:space="preserve">
     <value>The Url must belong to the current site</value>
   </data>
+  <data name="Generate" xml:space="preserve">
+    <value>Generate</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
index 2312ef83..0b5d799a 100644
--- a/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
+++ b/Oqtane.Client/Resources/Modules/Admin/UrlMappings/Edit.resx
@@ -121,7 +121,7 @@
     <value>Redirect To:</value>
   </data>
   <data name="MappedUrl.HelpText" xml:space="preserve">
-    <value>A relative or absolute Url where the user will be redirected</value>
+    <value>A relative or absolute Url where the user will be redirected. Use "/" for site root path.</value>
   </data>
   <data name="Url.HelpText" xml:space="preserve">
     <value>A relative Url identifying a path to a specific page in the site</value>
diff --git a/Oqtane.Client/UI/SiteRouter.razor b/Oqtane.Client/UI/SiteRouter.razor
index 048df3d7..3c3c81fe 100644
--- a/Oqtane.Client/UI/SiteRouter.razor
+++ b/Oqtane.Client/UI/SiteRouter.razor
@@ -343,7 +343,7 @@
                     var urlMapping = await UrlMappingService.GetUrlMappingAsync(site.SiteId, route.PagePath);
                     if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
                     {
-                        var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl + route.Query;
+                        var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + (!urlMapping.MappedUrl.StartsWith("/") ? "/" : "") + urlMapping.MappedUrl + ((!urlMapping.MappedUrl.Contains("?")) ? route.Query : "");
                         NavigationManager.NavigateTo(url, false);
                         return;
                     }
diff --git a/Oqtane.Server/Components/App.razor b/Oqtane.Server/Components/App.razor
index ae7d1632..570e4426 100644
--- a/Oqtane.Server/Components/App.razor
+++ b/Oqtane.Server/Components/App.razor
@@ -297,7 +297,7 @@
         if (urlMapping != null && !string.IsNullOrEmpty(urlMapping.MappedUrl))
         {
             // redirect to mapped url
-            var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + "/" + urlMapping.MappedUrl;
+            var url = (urlMapping.MappedUrl.StartsWith("http")) ? urlMapping.MappedUrl : route.SiteUrl + (!urlMapping.MappedUrl.StartsWith("/") ? "/" : "") + urlMapping.MappedUrl + ((!urlMapping.MappedUrl.Contains("?")) ? route.Query : "");
             NavigationManager.NavigateTo(url, true);
         }
         else // no url mapping exists