Merge pull request #1219 from MangoPieface/PublicAccessServiceExtension-HasAccessRemoval

U4-8199 - Removal of the internal unused obsolete HasAccess method in PublicAccessServiceExtensions.cs
This commit is contained in:
Shannon Deminick
2016-05-19 11:18:56 +02:00

View File

@@ -53,23 +53,6 @@ namespace Umbraco.Core.Services
&& currentMemberRoles.Contains(x.RuleValue));
}
[Obsolete("this is only used for backward compat")]
internal static bool HasAccess(this IPublicAccessService publicAccessService, int documentId, object providerUserKey, IContentService contentService, MembershipProvider membershipProvider, RoleProvider roleProvider)
{
var content = contentService.GetById(documentId);
if (content == null) return true;
var entry = publicAccessService.GetEntryForContent(content);
if (entry == null) return true;
var member = membershipProvider.GetUser(providerUserKey, false);
if (member == null) return false;
var roles = roleProvider.GetRolesForUser(member.UserName);
return entry.Rules.Any(x => x.RuleType == Constants.Conventions.PublicAccess.MemberRoleRuleType
&& roles.Contains(x.RuleValue));
}
public static bool HasAccess(this IPublicAccessService publicAccessService, string path, MembershipUser member, RoleProvider roleProvider)
{
var entry = publicAccessService.GetEntryForContent(path.EnsureEndsWith(path));