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

Merge pull request #1948 from umbraco/temp-u4-9908

Browse Source 
U4-9908 - fix scope-related issues
This commit is contained in:
Sebastiaan Janssen
2017-05-20 12:21:40 +02:00
committed by GitHub
parent 70507501bd 02136d3060
commit cec6322a84
2 changed files with 14 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Umbraco.Core/Services/ContentTypeServiceBase.cs
View File

@@ -83,7 +83,7 @@ namespace Umbraco.Core.Services
/// <returns></returns>
public bool HasContainerInPath(string contentPath)
{
using (var uow = UowProvider.GetUnitOfWork())
using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
{
// can use same repo for both content and media
var repository = RepositoryFactory.CreateContentTypeRepository(uow);

27
src/Umbraco.Core/Services/ExternalLoginService.cs
View File

@@ -14,8 +14,7 @@ namespace Umbraco.Core.Services
{
public ExternalLoginService(IDatabaseUnitOfWorkProvider provider, RepositoryFactory repositoryFactory, ILogger logger, IEventMessagesFactory eventMessagesFactory)
: base(provider, repositoryFactory, logger, eventMessagesFactory)
{
}
{ }
/// <summary>
/// Returns all user logins assigned
@@ -23,30 +22,32 @@ namespace Umbraco.Core.Services
/// <param name="userId"></param>
/// <returns></returns>
public IEnumerable<IIdentityUserLogin> GetAll(int userId)
{
using (var uow = UowProvider.GetUnitOfWork())
{
using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
{
// ToList is important here, must evaluate within uow!
var repo = RepositoryFactory.CreateExternalLoginRepository(uow);
var ret = repo.GetByQuery(new Query<IIdentityUserLogin>().Where(x => x.UserId == userId));
uow.Commit();
return ret;
return repo.GetByQuery(new Query<IIdentityUserLogin>()
.Where(x => x.UserId == userId))
.ToList();
}
}
/// <summary>
/// Returns all logins matching the login info - generally there should only be one but in some cases
/// Returns all logins matching the login info - generally there should only be one but in some cases
/// there might be more than one depending on if an adminstrator has been editing/removing members
/// </summary>
/// <param name="login"></param>
/// <returns></returns>
public IEnumerable<IIdentityUserLogin> Find(UserLoginInfo login)
{
using (var uow = UowProvider.GetUnitOfWork())
using (var uow = UowProvider.GetUnitOfWork(readOnly: true))
{
// ToList is important here, must evaluate within uow!
var repo = RepositoryFactory.CreateExternalLoginRepository(uow);
var ret = repo.GetByQuery(new Query<IIdentityUserLogin>().Where(x => x.ProviderKey == login.ProviderKey && x.LoginProvider == login.LoginProvider));
uow.Commit();
return ret;
return repo.GetByQuery(new Query<IIdentityUserLogin>()
.Where(x => x.ProviderKey == login.ProviderKey && x.LoginProvider == login.LoginProvider))
.ToList();
}
}
@@ -78,7 +79,5 @@ namespace Umbraco.Core.Services
uow.Commit();
}
}
}
}