improve validation in Url Mapping

This commit is contained in:
sbwalker
2025-04-21 14:13:49 -04:00
parent 53de1ddb36
commit e0044658f9
2 changed files with 27 additions and 22 deletions

View File

@ -48,13 +48,15 @@
_url = (_url.StartsWith("/")) ? _url.Substring(1) : _url; _url = (_url.StartsWith("/")) ? _url.Substring(1) : _url;
_url = (!_url.StartsWith("http")) ? url + _url : _url; _url = (!_url.StartsWith("http")) ? url + _url : _url;
_mappedurl = _mappedurl.Replace(url, "");
_mappedurl = (_mappedurl.StartsWith("/")) ? _mappedurl.Substring(1) : _mappedurl;
if (_url.StartsWith(url)) if (_url.StartsWith(url))
{ {
var urlmapping = new UrlMapping(); var urlmapping = new UrlMapping();
urlmapping.SiteId = PageState.Site.SiteId; urlmapping.SiteId = PageState.Site.SiteId;
var route = new Route(_url, PageState.Alias.Path); urlmapping.Url = new Route(_url, PageState.Alias.Path).PagePath;
urlmapping.Url = route.PagePath; urlmapping.MappedUrl = _mappedurl;
urlmapping.MappedUrl = _mappedurl.Replace(url, "");
urlmapping.Requests = 0; urlmapping.Requests = 0;
urlmapping.CreatedOn = DateTime.UtcNow; urlmapping.CreatedOn = DateTime.UtcNow;
urlmapping.RequestedOn = DateTime.UtcNow; urlmapping.RequestedOn = DateTime.UtcNow;

View File

@ -67,8 +67,11 @@
var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/"; var url = PageState.Uri.Scheme + "://" + PageState.Uri.Authority + "/";
url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : ""); url = url + (!string.IsNullOrEmpty(PageState.Alias.Path) ? PageState.Alias.Path + "/" : "");
_mappedurl = _mappedurl.Replace(url, "");
_mappedurl = (_mappedurl.StartsWith("/")) ? _mappedurl.Substring(1) : _mappedurl;
var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid); var urlmapping = await UrlMappingService.GetUrlMappingAsync(_urlmappingid);
urlmapping.MappedUrl = _mappedurl.Replace(url, ""); urlmapping.MappedUrl = _mappedurl;
urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping); urlmapping = await UrlMappingService.UpdateUrlMappingAsync(urlmapping);
await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping); await logger.LogInformation("UrlMapping Saved {UrlMapping}", urlmapping);
NavigationManager.NavigateTo(NavigateUrl()); NavigationManager.NavigateTo(NavigateUrl());