From 8d3f41224ee98522d32218fc9e49de248785e889 Mon Sep 17 00:00:00 2001 From: Brock Allen Date: Sat, 10 Aug 2013 09:52:46 -0400 Subject: [PATCH] backout recent additions to v2.2.1 --- .../Accounts/UserAccountService.cs | 1 - .../BrockAllen.MembershipReboot.csproj | 3 --- .../Models/Role.cs | 23 ------------------- .../Models/UserAccount.cs | 2 -- .../EF/DbContextRoleRepository`1.cs | 22 ------------------ .../EF/DefaultMembershipRebootDatabase.cs | 20 ---------------- .../Repository/IRoleRepository.cs | 11 --------- 7 files changed, 82 deletions(-) delete mode 100644 src/BrockAllen.MembershipReboot/Models/Role.cs delete mode 100644 src/BrockAllen.MembershipReboot/Repository/EF/DbContextRoleRepository`1.cs delete mode 100644 src/BrockAllen.MembershipReboot/Repository/IRoleRepository.cs diff --git a/src/BrockAllen.MembershipReboot/Accounts/UserAccountService.cs b/src/BrockAllen.MembershipReboot/Accounts/UserAccountService.cs index 3b104453..ca0c53fc 100644 --- a/src/BrockAllen.MembershipReboot/Accounts/UserAccountService.cs +++ b/src/BrockAllen.MembershipReboot/Accounts/UserAccountService.cs @@ -131,7 +131,6 @@ public void Dispose() public virtual void Update(UserAccount account) { - account.LastUpdated = account.UtcNow; this.userRepository.Update(account); } diff --git a/src/BrockAllen.MembershipReboot/BrockAllen.MembershipReboot.csproj b/src/BrockAllen.MembershipReboot/BrockAllen.MembershipReboot.csproj index dbc7ad21..5afdf7b4 100644 --- a/src/BrockAllen.MembershipReboot/BrockAllen.MembershipReboot.csproj +++ b/src/BrockAllen.MembershipReboot/BrockAllen.MembershipReboot.csproj @@ -55,9 +55,6 @@ - - - diff --git a/src/BrockAllen.MembershipReboot/Models/Role.cs b/src/BrockAllen.MembershipReboot/Models/Role.cs deleted file mode 100644 index 3347e291..00000000 --- a/src/BrockAllen.MembershipReboot/Models/Role.cs +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Copyright (c) Brock Allen. All rights reserved. - * see license.txt - */ - -using System; -using System.ComponentModel.DataAnnotations; - -namespace BrockAllen.MembershipReboot -{ - public class Role - { - [Key] - public virtual Guid ID { get; internal set; } - - [StringLength(50)] - [Required] - public virtual string Tenant { get; internal set; } - [StringLength(100)] - [Required] - public virtual string Name { get; internal set; } - } -} diff --git a/src/BrockAllen.MembershipReboot/Models/UserAccount.cs b/src/BrockAllen.MembershipReboot/Models/UserAccount.cs index 32023da6..e37c436b 100644 --- a/src/BrockAllen.MembershipReboot/Models/UserAccount.cs +++ b/src/BrockAllen.MembershipReboot/Models/UserAccount.cs @@ -38,7 +38,6 @@ internal protected UserAccount() public virtual string Email { get; internal set; } public virtual DateTime Created { get; internal set; } - public virtual DateTime LastUpdated { get; internal set; } public virtual DateTime PasswordChanged { get; internal set; } public virtual bool RequiresPasswordReset { get; set; } @@ -97,7 +96,6 @@ internal protected virtual void Init(string tenant, string username, string pass this.Username = username; this.Email = email; this.Created = this.UtcNow; - this.LastUpdated = this.Created; this.HashedPassword = HashPassword(password); this.PasswordChanged = this.Created; this.IsAccountVerified = false; diff --git a/src/BrockAllen.MembershipReboot/Repository/EF/DbContextRoleRepository`1.cs b/src/BrockAllen.MembershipReboot/Repository/EF/DbContextRoleRepository`1.cs deleted file mode 100644 index bbbba7bc..00000000 --- a/src/BrockAllen.MembershipReboot/Repository/EF/DbContextRoleRepository`1.cs +++ /dev/null @@ -1,22 +0,0 @@ -/* - * Copyright (c) Brock Allen. All rights reserved. - * see license.txt - */ - -using System.Data.Entity; -namespace BrockAllen.MembershipReboot -{ - public class DbContextRoleRepository - : DbContextRepository, IRoleRepository - where Ctx : DbContext, new() - { - public DbContextRoleRepository() - : this(new Ctx()) - { - } - public DbContextRoleRepository(Ctx ctx) - : base(ctx) - { - } - } -} diff --git a/src/BrockAllen.MembershipReboot/Repository/EF/DefaultMembershipRebootDatabase.cs b/src/BrockAllen.MembershipReboot/Repository/EF/DefaultMembershipRebootDatabase.cs index 64ffdebc..e3adc326 100644 --- a/src/BrockAllen.MembershipReboot/Repository/EF/DefaultMembershipRebootDatabase.cs +++ b/src/BrockAllen.MembershipReboot/Repository/EF/DefaultMembershipRebootDatabase.cs @@ -20,7 +20,6 @@ public DefaultMembershipRebootDatabase(string nameOrConnectionString) } public DbSet Users { get; set; } - public DbSet Roles { get; set; } } public class DefaultUserAccountRepository @@ -41,23 +40,4 @@ public DefaultUserAccountRepository(DefaultMembershipRebootDatabase ctx) { } } - - public class DefaultRoleRepository - : DbContextRoleRepository - { - public DefaultRoleRepository() - : this(SecuritySettings.Instance.ConnectionStringName) - { - } - - public DefaultRoleRepository(string name) - : this(new DefaultMembershipRebootDatabase(name)) - { - } - - public DefaultRoleRepository(DefaultMembershipRebootDatabase ctx) - : base(ctx) - { - } - } } diff --git a/src/BrockAllen.MembershipReboot/Repository/IRoleRepository.cs b/src/BrockAllen.MembershipReboot/Repository/IRoleRepository.cs deleted file mode 100644 index 90ba9dcf..00000000 --- a/src/BrockAllen.MembershipReboot/Repository/IRoleRepository.cs +++ /dev/null @@ -1,11 +0,0 @@ -/* - * Copyright (c) Brock Allen. All rights reserved. - * see license.txt - */ - -namespace BrockAllen.MembershipReboot -{ - public interface IRoleRepository : IRepository - { - } -}