From cc9802a0d8447c56c7e9f67576802ba69a57baee Mon Sep 17 00:00:00 2001
From: Shaun Walker <shaun.walker@siliqon.com>
Date: Sat, 15 Jan 2022 12:58:47 -0500
Subject: [PATCH] use PageState.Uri rather than creating a new Uri object

---
 Oqtane.Client/Modules/Admin/Sites/Add.razor        | 3 +--
 Oqtane.Client/Modules/Admin/Sites/Index.razor      | 8 ++------
 Oqtane.Client/Modules/Admin/UrlMappings/Add.razor  | 3 +--
 Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor | 3 +--
 4 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/Oqtane.Client/Modules/Admin/Sites/Add.razor b/Oqtane.Client/Modules/Admin/Sites/Add.razor
index 7f807deb..14cbc5f0 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Add.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Add.razor
@@ -372,8 +372,7 @@ else
                         if (installation.Success)
                         {
                             var aliasname = config.Aliases.Split(new char[] { ',' }, StringSplitOptions.RemoveEmptyEntries)[0];
-                            var uri = new Uri(NavigationManager.Uri);
-                            NavigationManager.NavigateTo(uri.Scheme + "://" + aliasname, true);
+                            NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + aliasname, true);
                         }
                         else
                         {
diff --git a/Oqtane.Client/Modules/Admin/Sites/Index.razor b/Oqtane.Client/Modules/Admin/Sites/Index.razor
index 69b891b7..4ece6608 100644
--- a/Oqtane.Client/Modules/Admin/Sites/Index.razor
+++ b/Oqtane.Client/Modules/Admin/Sites/Index.razor
@@ -30,15 +30,11 @@ else
 
 @code {
     private List<Alias> _sites;
-    private string _scheme;
 
     public override SecurityAccessLevel SecurityAccessLevel => SecurityAccessLevel.Host;
 
     protected override async Task OnParametersSetAsync()
     {
-        var uri = new Uri(NavigationManager.Uri);
-        _scheme = uri.Scheme + "://";
-
         var aliases = await AliasService.GetAliasesAsync();
         _sites = new List<Alias>();
         foreach (Alias alias in aliases)
@@ -52,11 +48,11 @@ else
 
     private void Edit(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name + "/admin/site", true);
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name + "/admin/site", true);
     }
 
     private void Browse(string name)
     {
-        NavigationManager.NavigateTo(_scheme + name, true);
+        NavigationManager.NavigateTo(PageState.Uri.Scheme + "://" + name, true);
     }
 }
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
index a6f82e06..e57ad13e 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Add.razor
@@ -42,8 +42,7 @@
 		{
 			if (_url != _mappedurl)
 			{
-				Uri uri = new Uri(NavigationManager.Uri);
-				var url = uri.Scheme + "://" + uri.Authority + "/";
+				var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
 				url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
 				_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
diff --git a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
index 71f08e63..10c9a57f 100644
--- a/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
+++ b/Oqtane.Client/Modules/Admin/UrlMappings/Edit.razor
@@ -64,8 +64,7 @@
 			{
 				try
 				{
-					Uri uri = new Uri(NavigationManager.Uri);
-					var url = uri.Scheme + "://" + uri.Authority + "/";
+					var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
 					url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
 
 					var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);