yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix formatting after merge and fix nullability

Browse Source
This commit is contained in:
Bjarke Berg
2022-06-27 08:25:54 +02:00
committed by Zeegaan
parent 20f9cfe2ac
commit b232ff98a0
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
src/Umbraco.Web.Website/Routing/PublicAccessRequestHandler.cs
View File

@@ -84,15 +84,25 @@ public class PublicAccessRequestHandler : IPublicAccessRequestHandler
switch (publicAccessStatus)
{
case PublicAccessStatus.NotLoggedIn:
_logger.LogDebug("EnsurePublishedContentAccess: Not logged in, redirect to login page");
routeValues = await SetPublishedContentAsOtherPageAsync(
httpContext, routeValues.PublishedRequest, publicAccessAttempt.Result!.LoginNodeId);
// redirect if this is not the login page
if (publicAccessAttempt.Result!.LoginNodeId != publishedContent.Id)
{
_logger.LogDebug("EnsurePublishedContentAccess: Not logged in, redirect to login page");
routeValues = await SetPublishedContentAsOtherPageAsync(
httpContext, routeValues.PublishedRequest, publicAccessAttempt.Result!.LoginNodeId);
}
break;
case PublicAccessStatus.AccessDenied:
_logger.LogDebug(
"EnsurePublishedContentAccess: Current member has not access, redirect to error page");
routeValues = await SetPublishedContentAsOtherPageAsync(
httpContext, routeValues.PublishedRequest, publicAccessAttempt.Result!.NoAccessNodeId);
// Redirect if this is not the access denied page
if (publicAccessAttempt.Result!.NoAccessNodeId != publishedContent.Id)
{
_logger.LogDebug(
"EnsurePublishedContentAccess: Current member has not access, redirect to error page");
routeValues = await SetPublishedContentAsOtherPageAsync(
httpContext, routeValues.PublishedRequest, publicAccessAttempt.Result!.NoAccessNodeId);
}
break;
case PublicAccessStatus.LockedOut:
_logger.LogDebug("Current member is locked out, redirect to error page");