Injecting Umbraco Context Accessor and not saving the url on the class

This commit is contained in:
Bjarke Berg
2019-01-23 14:16:42 +01:00
parent fedf0c78de
commit f8b52a57c3
24 changed files with 194 additions and 100 deletions

View File

@@ -16,13 +16,16 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
private readonly IAppCache _requestCache;
private readonly XmlStore _xmlStore;
private readonly PublishedContentTypeCache _contentTypeCache;
private readonly IUmbracoContextAccessor _umbracoContextAccessor;
public PublishedMemberCache(XmlStore xmlStore, IAppCache requestCache, IMemberService memberService, PublishedContentTypeCache contentTypeCache)
public PublishedMemberCache(XmlStore xmlStore, IAppCache requestCache, IMemberService memberService,
PublishedContentTypeCache contentTypeCache, IUmbracoContextAccessor umbracoContextAccessor)
{
_requestCache = requestCache;
_memberService = memberService;
_xmlStore = xmlStore;
_contentTypeCache = contentTypeCache;
_umbracoContextAccessor = umbracoContextAccessor;
}
public IPublishedContent GetByProviderKey(object key)
@@ -39,7 +42,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var result = _memberService.GetByProviderKey(key);
if (result == null) return null;
var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
return new PublishedMember(result, type).CreateModel();
return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
});
}
@@ -57,7 +60,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var result = _memberService.GetById(memberId);
if (result == null) return null;
var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
return new PublishedMember(result, type).CreateModel();
return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
});
}
@@ -75,7 +78,7 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var result = _memberService.GetByUsername(username);
if (result == null) return null;
var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
return new PublishedMember(result, type).CreateModel();
return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
});
}
@@ -93,14 +96,14 @@ namespace Umbraco.Web.PublishedCache.XmlPublishedCache
var result = _memberService.GetByEmail(email);
if (result == null) return null;
var type = _contentTypeCache.Get(PublishedItemType.Member, result.ContentTypeId);
return new PublishedMember(result, type).CreateModel();
return new PublishedMember(result, type, _umbracoContextAccessor).CreateModel();
});
}
public IPublishedContent GetByMember(IMember member)
{
var type = _contentTypeCache.Get(PublishedItemType.Member, member.ContentTypeId);
return new PublishedMember(member, type).CreateModel();
return new PublishedMember(member, type, _umbracoContextAccessor).CreateModel();
}
public XPathNavigator CreateNavigator()