Diplomarbeit-Absolventenverein/oqtane.framework-not-mirrored
Archived
9
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #38 from sbwalker/master

Browse Source 
Reload after login/logout
This commit is contained in:
Shaun Walker 2019-07-08 14:58:32 -04:00 committed by GitHub
commit 95bab58569
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Oqtane.Client/Modules/Admin/Login/Index.razor
View File

@ -50,7 +50,7 @@
if (user != null)
{
AuthStateProvider.NotifyAuthenticationChanged();
UriHelper.NavigateTo(NavigateUrl(""));
UriHelper.NavigateTo(NavigateUrl("", true));
}
else
{

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

@ -107,20 +107,6 @@ private async Task Refresh()
}
if (site != null || reload == true)
{
user = null;
if (PageState == null || reload == true)
{
var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
if (authState.User.Identity.IsAuthenticated)
{
user = await UserService.GetCurrentUserAsync();
}
}
else
{
user = PageState.User;
}
string path = new Uri(_absoluteUri).PathAndQuery.Substring(1);
if (path.EndsWith("/")) { path = path.Substring(0, path.Length - 1); }
if (alias.Path != "")
@ -135,6 +121,20 @@ private async Task Refresh()
reload = true;
}
user = null;
if (PageState == null || reload == true)
{
var authState = await AuthenticationStateProvider.GetAuthenticationStateAsync();
if (authState.User.Identity.IsAuthenticated)
{
user = await UserService.GetCurrentUserAsync();
}
}
else
{
user = PageState.User;
}
if (PageState == null || reload == true)
{
pages = await PageService.GetPagesAsync(site.SiteId);

2
Oqtane.Client/Themes/Controls/Login.razor
View File

@ -29,6 +29,6 @@
{
await UserService.LogoutUserAsync();
AuthStateProvider.NotifyAuthenticationChanged();
UriHelper.NavigateTo(NavigateUrl(""));
UriHelper.NavigateTo(NavigateUrl("", true));
}
}