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

Merge remote-tracking branch 'origin/netcore/dev' into netcore/feature/core-cannot-use-system-web

Browse Source 
# Conflicts:
#	src/Umbraco.Core/Runtime/CoreInitialComposer.cs
#	src/Umbraco.Core/StringExtensions.cs
#	src/Umbraco.Tests/Membership/MembershipProviderBaseTests.cs
#	src/Umbraco.Tests/Membership/UmbracoServiceMembershipProviderTests.cs
#	src/Umbraco.Tests/Services/MemberServiceTests.cs
#	src/Umbraco.Web/Security/AppBuilderExtensions.cs
#	src/Umbraco.Web/Security/BackOfficeUserManager.cs
#	src/Umbraco.Web/Security/MembershipProviderBase.cs
#	src/Umbraco.Web/Security/MembershipProviderExtensions.cs
#	src/Umbraco.Web/Security/Providers/UsersMembershipProvider.cs
#	src/Umbraco.Web/Security/UmbracoMembershipProviderBase.cs
#	src/Umbraco.Web/UmbracoDefaultOwinStartup.cs
This commit is contained in:
Bjarke Berg
2019-11-26 11:51:50 +01:00
parent 969832310e d58787e965
commit 2fc50c5730
135 changed files with 1500 additions and 4035 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/Umbraco.Web/PublishedCache/NuCache/MemberCache.cs
View File

@@ -10,6 +10,7 @@ using Umbraco.Core.Security;
using Umbraco.Core.Services;
using Umbraco.Core.Xml.XPath;
using Umbraco.Web.PublishedCache.NuCache.Navigable;
using Umbraco.Web.Security;
namespace Umbraco.Web.PublishedCache.NuCache
{
@@ -45,13 +46,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
: cache.GetCacheItem<T>(cacheKey, getCacheItem);
}
private static void EnsureProvider()
{
var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
if (provider.IsUmbracoMembershipProvider() == false)
throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
}
public IPublishedContent GetById(bool preview, int memberId)
{
return GetById(memberId);
@@ -61,7 +55,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
return GetCacheItem(CacheKeys.MemberCacheMember("ById", _previewDefault, memberId), () =>
{
EnsureProvider();
var member = _memberService.GetById(memberId);
return member == null
? null
@@ -79,7 +72,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
return GetCacheItem(CacheKeys.MemberCacheMember("ByProviderKey", _previewDefault, key), () =>
{
EnsureProvider();
var member = _memberService.GetByProviderKey(key);
return member == null ? null : GetById(member, _previewDefault);
});
@@ -89,7 +81,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
return GetCacheItem(CacheKeys.MemberCacheMember("ByUsername", _previewDefault, username), () =>
{
EnsureProvider();
var member = _memberService.GetByUsername(username);
return member == null ? null : GetById(member, _previewDefault);
});
@@ -99,7 +90,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
{
return GetCacheItem(CacheKeys.MemberCacheMember("ByEmail", _previewDefault, email), () =>
{
EnsureProvider();
var member = _memberService.GetByEmail(email);
return member == null ? null : GetById(member, _previewDefault);
});
@@ -132,12 +122,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
public XPathNavigator CreateNodeNavigator(int id, bool preview)
{
var provider = Core.Security.MembershipProviderExtensions.GetMembersMembershipProvider();
if (provider.IsUmbracoMembershipProvider() == false)
{
throw new NotSupportedException("Cannot access this method unless the Umbraco membership provider is active");
}
var result = _memberService.GetById(id);
if (result == null) return null;

21
src/Umbraco.Web/PublishedCache/NuCache/PublishedMember.cs
View File

@@ -74,16 +74,15 @@ namespace Umbraco.Web.PublishedCache.NuCache
.ToDictionary(x => x.Alias, x => new[] { new PropertyData { Value = x.GetValue(), Culture = string.Empty, Segment = string.Empty } }, StringComparer.OrdinalIgnoreCase);
// see also PublishedContentType
AddIf(contentType, properties, "Email", member.Email);
AddIf(contentType, properties, "Username", member.Username);
AddIf(contentType, properties, "PasswordQuestion", member.PasswordQuestion);
AddIf(contentType, properties, "Comments", member.Comments);
AddIf(contentType, properties, "IsApproved", member.IsApproved);
AddIf(contentType, properties, "IsLockedOut", member.IsLockedOut);
AddIf(contentType, properties, "LastLockoutDate", member.LastLockoutDate);
AddIf(contentType, properties, "CreateDate", member.CreateDate);
AddIf(contentType, properties, "LastLoginDate", member.LastLoginDate);
AddIf(contentType, properties, "LastPasswordChangeDate", member.LastPasswordChangeDate);
AddIf(contentType, properties, nameof(IMember.Email), member.Email);
AddIf(contentType, properties, nameof(IMember.Username), member.Username);
AddIf(contentType, properties, nameof(IMember.Comments), member.Comments);
AddIf(contentType, properties, nameof(IMember.IsApproved), member.IsApproved);
AddIf(contentType, properties, nameof(IMember.IsLockedOut), member.IsLockedOut);
AddIf(contentType, properties, nameof(IMember.LastLockoutDate), member.LastLockoutDate);
AddIf(contentType, properties, nameof(IMember.CreateDate), member.CreateDate);
AddIf(contentType, properties, nameof(IMember.LastLoginDate), member.LastLoginDate);
AddIf(contentType, properties, nameof(IMember.LastPasswordChangeDate), member.LastPasswordChangeDate);
return properties;
}
@@ -103,8 +102,6 @@ namespace Umbraco.Web.PublishedCache.NuCache
public string UserName => _member.Username;
public string PasswordQuestion => _member.PasswordQuestion;
public string Comments => _member.Comments;
public bool IsApproved => _member.IsApproved;