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

Fixes User Id issues with HasIdentity, wraps legacy UserType to the new service, fixes the uninstalling db schema to not throw exceptions and clog up the unit test log.

Browse Source
This commit is contained in:
Shannon
2014-01-23 17:11:58 +11:00
parent 585b42af48
commit 64d1a484bd
8 changed files with 143 additions and 134 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/Umbraco.Core/Models/Membership/User.cs
View File

@@ -80,23 +80,42 @@ namespace Umbraco.Core.Models.Membership
private static readonly PropertyInfo LanguageSelector = ExpressionHelper.GetPropertyInfo<User, string>(x => x.Language);
private static readonly PropertyInfo DefaultPermissionsSelector = ExpressionHelper.GetPropertyInfo<User, IEnumerable<string>>(x => x.DefaultPermissions);
private static readonly PropertyInfo DefaultToLiveEditingSelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.DefaultToLiveEditing);
private static readonly PropertyInfo HasIdentitySelector = ExpressionHelper.GetPropertyInfo<User, bool>(x => x.HasIdentity);
#region Implementation of IEntity
[IgnoreDataMember]
public bool HasIdentity { get { return Id != null || _hasIdentity; } }
[IgnoreDataMember]
int IEntity.Id
public bool HasIdentity
{
get
{
return int.Parse(Id.ToString());
return _hasIdentity;
}
protected set
{
SetPropertyValueAndDetectChanges(o =>
{
_hasIdentity = value;
return _hasIdentity;
}, _hasIdentity, HasIdentitySelector);
}
}
[DataMember]
public int Id
{
get
{
return _id;
}
set
{
Id = value;
_hasIdentity = true;
SetPropertyValueAndDetectChanges(o =>
{
_id = value;
HasIdentity = true; //set the has Identity
return _id;
}, _id, IdSelector);
}
}
@@ -354,20 +373,6 @@ namespace Umbraco.Core.Models.Membership
}
}
[DataMember]
public int Id
{
get { return _id; }
set
{
SetPropertyValueAndDetectChanges(o =>
{
_id = value;
return _id;
}, _id, IdSelector);
}
}
[DataMember]
public string Language
{

5
src/Umbraco.Core/Persistence/Migrations/Initial/DatabaseSchemaCreation.cs
View File

@@ -80,7 +80,10 @@ namespace Umbraco.Core.Persistence.Migrations.Initial
try
{
_database.DropTable(tableName);
if (_database.TableExist(tableName))
{
_database.DropTable(tableName);
}
}
catch (Exception ex)
{

56
src/Umbraco.Core/Services/IUserService.cs
View File

@@ -15,10 +15,45 @@ namespace Umbraco.Core.Services
/// <param name="id">Id of the User to retrieve</param>
/// <returns><see cref="IProfile"/></returns>
IProfile GetProfileById(int id);
/// <summary>
/// Get profile by username
/// </summary>
/// <param name="username"></param>
/// <returns></returns>
IProfile GetProfileByUserName(string username);
/// <summary>
/// Get user by Id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
IUser GetUserById(int id);
/// <summary>
/// This is useful when an entire section is removed from config
/// </summary>
/// <param name="sectionAlias"></param>
void DeleteSectionFromAllUsers(string sectionAlias);
/// <summary>
/// Returns a list of the sections that the user is allowed access to
/// </summary>
/// <returns></returns>
IEnumerable<string> GetUserSections(IUser user);
/// <summary>
/// Get permissions set for user and specified node ids
/// </summary>
/// <param name="user"></param>
/// <param name="nodeIds"></param>
/// <returns></returns>
IEnumerable<EntityPermission> GetPermissions(IUser user, params int[] nodeIds);
#region User types
IEnumerable<IUserType> GetAllUserTypes(params int[] ids);
/// <summary>
/// Gets an IUserType by its Alias
/// </summary>
@@ -26,6 +61,13 @@ namespace Umbraco.Core.Services
/// <returns><see cref="IUserType"/></returns>
IUserType GetUserTypeByAlias(string alias);
/// <summary>
/// Gets an IUserType by its Id
/// </summary>
/// <param name="id"></param>
/// <returns></returns>
IUserType GetUserTypeById(int id);
/// <summary>
/// Gets an IUserType by its Name
/// </summary>
@@ -45,19 +87,7 @@ namespace Umbraco.Core.Services
/// </summary>
/// <param name="userType"></param>
void DeleteUserType(IUserType userType);
/// <summary>
/// This is useful when an entire section is removed from config
/// </summary>
/// <param name="sectionAlias"></param>
void DeleteSectionFromAllUsers(string sectionAlias);
/// <summary>
/// Returns a list of the sections that the user is allowed access to
/// </summary>
/// <returns></returns>
IEnumerable<string> GetUserSections(IUser user);
IEnumerable<EntityPermission> GetPermissions(IUser user, params int[] nodeIds);
#endregion
}
}

19
src/Umbraco.Core/Services/UserService.cs
View File

@@ -351,7 +351,7 @@ namespace Umbraco.Core.Services
var user = GetByUsername(login);
return user.ProfileData;
}
public IUser GetUserById(int id)
{
using (var repository = _repositoryFactory.CreateUserRepository(_uowProvider.GetUnitOfWork()))
@@ -360,6 +360,15 @@ namespace Umbraco.Core.Services
}
}
public IEnumerable<IUserType> GetAllUserTypes(params int[] ids)
{
var uow = _uowProvider.GetUnitOfWork();
using (var repository = _repositoryFactory.CreateUserTypeRepository(uow))
{
return repository.GetAll(ids);
}
}
/// <summary>
/// Gets an IUserType by its Alias
/// </summary>
@@ -375,6 +384,14 @@ namespace Umbraco.Core.Services
}
}
public IUserType GetUserTypeById(int id)
{
using (var repository = _repositoryFactory.CreateUserTypeRepository(_uowProvider.GetUnitOfWork()))
{
return repository.Get(id);
}
}
/// <summary>
/// Gets an IUserType by its Name
/// </summary>