kocoded/oqtane.framework
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #83 from sbwalker/master

Browse Source 
Refactor AbsoluteUri references
This commit is contained in:
Shaun Walker 2019-09-16 09:15:25 +02:00 committed by GitHub
commit a8e2ca228e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
19 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/HtmlText/Services/HtmlTextService.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Modules.HtmlText.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "HtmlText"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "HtmlText"); }
} }
public async Task<HtmlTextInfo> GetHtmlTextAsync(int ModuleId) public async Task<HtmlTextInfo> GetHtmlTextAsync(int ModuleId)

2
Oqtane.Client/Providers/IdentityAuthenticationStateProvider.cs
View File

@ -25,7 +25,7 @@ namespace Oqtane.Providers
{ {
// hack: create a new HttpClient rather than relying on the registered service as the AuthenticationStateProvider is initialized prior to NavigationManager ( https://github.com/aspnet/AspNetCore/issues/11867 ) // hack: create a new HttpClient rather than relying on the registered service as the AuthenticationStateProvider is initialized prior to NavigationManager ( https://github.com/aspnet/AspNetCore/issues/11867 )
HttpClient http = new HttpClient(); HttpClient http = new HttpClient();
string apiurl = ServiceBase.CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "User") + "/authenticate"; string apiurl = ServiceBase.CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User") + "/authenticate";
User user = await http.GetJsonAsync<User>(apiurl); User user = await http.GetJsonAsync<User>(apiurl);
ClaimsIdentity identity = new ClaimsIdentity(); ClaimsIdentity identity = new ClaimsIdentity();

2
Oqtane.Client/Services/AliasService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Alias"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Alias"); }
} }
public async Task<List<Alias>> GetAliasesAsync() public async Task<List<Alias>> GetAliasesAsync()

2
Oqtane.Client/Services/FileService.cs
View File

@ -20,7 +20,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "File"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "File"); }
} }
public async Task UploadFilesAsync(string Folder) public async Task UploadFilesAsync(string Folder)

2
Oqtane.Client/Services/Interfaces/InstallationService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Installation"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Installation"); }
} }
public async Task<GenericResponse> IsInstalled() public async Task<GenericResponse> IsInstalled()

2
Oqtane.Client/Services/ModuleDefinitionService.cs
View File

@ -25,7 +25,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "ModuleDefinition"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "ModuleDefinition"); }
} }
public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync() public async Task<List<ModuleDefinition>> GetModuleDefinitionsAsync()

2
Oqtane.Client/Services/ModuleService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Module"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Module"); }
} }
public async Task<List<Module>> GetModulesAsync(int PageId) public async Task<List<Module>> GetModulesAsync(int PageId)

2
Oqtane.Client/Services/PageModuleService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "PageModule"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "PageModule"); }
} }
public async Task<List<PageModule>> GetPageModulesAsync() public async Task<List<PageModule>> GetPageModulesAsync()

2
Oqtane.Client/Services/PageService.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Page"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Page"); }
} }
public async Task<List<Page>> GetPagesAsync(int SiteId) public async Task<List<Page>> GetPagesAsync(int SiteId)

2
Oqtane.Client/Services/ProfileService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Profile"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Profile"); }
} }
public async Task<List<Profile>> GetProfilesAsync() public async Task<List<Profile>> GetProfilesAsync()

2
Oqtane.Client/Services/RoleService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Role"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Role"); }
} }
public async Task<List<Role>> GetRolesAsync() public async Task<List<Role>> GetRolesAsync()

2
Oqtane.Client/Services/SettingService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Setting"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Setting"); }
} }
public async Task<Dictionary<string, string>> GetHostSettingsAsync() public async Task<Dictionary<string, string>> GetHostSettingsAsync()

2
Oqtane.Client/Services/SiteService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Site"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Site"); }
} }
public async Task<List<Site>> GetSitesAsync() public async Task<List<Site>> GetSitesAsync()

2
Oqtane.Client/Services/TenantService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Tenant"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Tenant"); }
} }
public async Task<List<Tenant>> GetTenantsAsync() public async Task<List<Tenant>> GetTenantsAsync()

2
Oqtane.Client/Services/ThemeService.cs
View File

@ -25,7 +25,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "Theme"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "Theme"); }
} }
public async Task<List<Theme>> GetThemesAsync() public async Task<List<Theme>> GetThemesAsync()

2
Oqtane.Client/Services/UserRoleService.cs
View File

@ -23,7 +23,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "UserRole"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "UserRole"); }
} }
public async Task<List<UserRole>> GetUserRolesAsync() public async Task<List<UserRole>> GetUserRolesAsync()

2
Oqtane.Client/Services/UserService.cs
View File

@ -24,7 +24,7 @@ namespace Oqtane.Services
private string apiurl private string apiurl
{ {
get { return CreateApiUrl(sitestate.Alias, NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri, "User"); } get { return CreateApiUrl(sitestate.Alias, NavigationManager.Uri, "User"); }
} }
public async Task<List<User>> GetUsersAsync(int SiteId) public async Task<List<User>> GetUsersAsync(int SiteId)

2
Oqtane.Client/Shared/SiteRouter.razor
View File

@ -41,7 +41,7 @@
protected override void OnInitialized() protected override void OnInitialized()
{ {
_absoluteUri = NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri; _absoluteUri = NavigationManager.Uri;
NavigationManager.LocationChanged += LocationChanged; NavigationManager.LocationChanged += LocationChanged;
DynamicComponent = builder => DynamicComponent = builder =>

2
Oqtane.Server/Startup.cs
View File

@ -64,7 +64,7 @@ namespace Oqtane.Server
{ {
client.DefaultRequestHeaders.Add("Cookie", ".AspNetCore.Identity.Application=" + authToken); client.DefaultRequestHeaders.Add("Cookie", ".AspNetCore.Identity.Application=" + authToken);
} }
client.BaseAddress = new Uri(NavigationManager.ToAbsoluteUri(NavigationManager.Uri).AbsoluteUri); client.BaseAddress = new Uri(NavigationManager.Uri);
return client; return client;
}); });
} }