Diplomarbeit-Absolventenverein/oqtane.framework
10
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #3982 from sbwalker/dev

Browse Source 
improve caching for sites with many registered users
This commit is contained in:
Shaun Walker 2024-03-12 10:27:55 -04:00 committed by GitHub
commit 09ad56056e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 31 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
Oqtane.Server/Extensions/ClaimsPrincipalExtensions.cs
View File

@ -1,5 +1,6 @@
using System.Linq;
using System.Security.Claims;
using Oqtane.Shared;
namespace Oqtane.Extensions
{
@ -70,5 +71,17 @@ namespace Oqtane.Extensions
}
return -1;
}
public static bool IsOnlyInRole(this ClaimsPrincipal claimsPrincipal, string role)
{
var identity = claimsPrincipal.Identities.FirstOrDefault(item => item.AuthenticationType == Constants.AuthenticationScheme);
if (identity != null)
{
// check if user has role claim specified and no other role claims
return identity.Claims.Any(item => item.Type == ClaimTypes.Role && item.Value == role) &&
!identity.Claims.Any(item => item.Type == ClaimTypes.Role && item.Value != role);
}
return false;
}
}
}

23
Oqtane.Server/Services/SiteService.cs
View File

@ -64,19 +64,32 @@ namespace Oqtane.Services
{
if (!_accessor.HttpContext.User.Identity.IsAuthenticated)
{
// unauthenticated
return await _cache.GetOrCreateAsync($"site:{_accessor.HttpContext.GetAlias().SiteKey}", async entry =>
{
entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return await GetSite(siteId);
}, true);
}
else // authenticated - cached per user
else // authenticated
{
return await _cache.GetOrCreateAsync($"site:{_accessor.HttpContext.GetAlias().SiteKey}:{_accessor.HttpContext.User.UserId}", async entry =>
// is only in registered users role - cache by role
if (_accessor.HttpContext.User.IsOnlyInRole(RoleNames.Registered))
{
entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return await GetSite(siteId);
}, true);
return await _cache.GetOrCreateAsync($"site:{_accessor.HttpContext.GetAlias().SiteKey}:{RoleNames.Registered}", async entry =>
{
entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return await GetSite(siteId);
}, true);
}
else // cache by user
{
return await _cache.GetOrCreateAsync($"site:{_accessor.HttpContext.GetAlias().SiteKey}:{_accessor.HttpContext.User.UserId}", async entry =>
{
entry.SlidingExpiration = TimeSpan.FromMinutes(30);
return await GetSite(siteId);
}, true);
}
}
}