Kolpack-Software-Consulting/MileageTraker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Restyle login, change password works

Browse Source
This commit is contained in:
poprhythm
2012-12-22 10:48:34 -05:00
parent f129142dab
commit c1944f6262
54 changed files with 327 additions and 255 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Membership/CodeFirstMembershipProvider.cs
+44 -60
View File
@@ -1,5 +1,5 @@
using System;
using System.Collections.Generic;
using System.Data.SqlTypes;
using System.Linq;
using System.Security.Cryptography;
using System.Web;
@@ -18,7 +18,11 @@ namespace MileageTraker.Web.Membership
public override string ApplicationName
{
get { return GetType().Assembly.GetName().Name; }
set { ApplicationName = GetType().Assembly.GetName().Name; }
set
{
if (value == null) throw new ArgumentNullException("value");
ApplicationName = GetType().Assembly.GetName().Name;
}
}
public override int MaxInvalidPasswordAttempts
@@ -113,24 +117,19 @@ namespace MileageTraker.Web.Membership
PasswordFailuresSinceLastSuccess = 0,
LastLoginDate = DateTime.UtcNow,
LastActivityDate = DateTime.UtcNow,
LastLockoutDate = DateTime.UtcNow,
LastLockoutDate = SqlDateTime.MinValue.Value,
IsLockedOut = false,
LastPasswordFailureDate = DateTime.UtcNow
LastPasswordFailureDate = SqlDateTime.MinValue.Value
};
context.Users.Add(newUser);
context.SaveChanges();
status = MembershipCreateStatus.Success;
return new MembershipUser(System.Web.Security.Membership.Provider.Name, newUser.Username, newUser.UserId,
newUser.Email, null, null,
newUser.IsApproved, newUser.IsLockedOut, newUser.CreateDate.Value,
newUser.LastLoginDate.Value, newUser.LastActivityDate.Value,
newUser.LastPasswordChangedDate.Value, newUser.LastLockoutDate.Value);
return newUser.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name);
}
}
public string CreateUserAndAccount(string userName, string password, bool requireConfirmation,
IDictionary<string, object> values)
public string CreateUserAndAccount(string userName, string password, bool requireConfirmation)
{
return CreateAccount(userName, password, requireConfirmation);
}
@@ -196,7 +195,7 @@ namespace MileageTraker.Web.Membership
}
using (var context = new MileageTrakerContext())
{
User user = context.Users.FirstOrDefault(Usr => Usr.Username == username);
var user = context.Users.FirstOrDefault(usr => usr.Username == username);
if (user == null)
{
return null;
@@ -207,12 +206,7 @@ namespace MileageTraker.Web.Membership
user.LastActivityDate = DateTime.UtcNow;
context.SaveChanges();
}
return new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId, user.Email,
null, null,
user.IsApproved, user.IsLockedOut, user.CreateDate.Value, user.LastLoginDate.Value,
user.LastActivityDate.Value, user.LastPasswordChangedDate.Value,
user.LastLockoutDate.Value);
return user.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name);
}
}
@@ -228,8 +222,7 @@ namespace MileageTraker.Web.Membership
using (var context = new MileageTrakerContext())
{
User user;
user = context.Users.Find(providerUserKey);
var user = context.Users.Find(providerUserKey);
if (user == null)
{
return null;
@@ -240,12 +233,7 @@ namespace MileageTraker.Web.Membership
user.LastActivityDate = DateTime.UtcNow;
context.SaveChanges();
}
return new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId, user.Email,
null, null,
user.IsApproved, user.IsLockedOut, user.CreateDate.Value, user.LastLoginDate.Value,
user.LastActivityDate.Value, user.LastPasswordChangedDate.Value,
user.LastLockoutDate.Value);
return user.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name);
}
}
@@ -265,7 +253,7 @@ namespace MileageTraker.Web.Membership
}
using (var context = new MileageTrakerContext())
{
User user = context.Users.FirstOrDefault(Usr => Usr.Username == username);
User user = context.Users.FirstOrDefault(usr => usr.Username == username);
if (user == null)
{
return false;
@@ -309,7 +297,7 @@ namespace MileageTraker.Web.Membership
{
using (var context = new MileageTrakerContext())
{
var user = context.Users.FirstOrDefault(Usr => Usr.Username == userName);
var user = context.Users.FirstOrDefault(usr => usr.Username == userName);
if (user != null)
{
user.IsLockedOut = false;
@@ -325,7 +313,9 @@ namespace MileageTraker.Web.Membership
{
var dateActive =
DateTime.UtcNow.Subtract(
TimeSpan.FromMinutes(Convert.ToDouble(System.Web.Security.Membership.UserIsOnlineTimeWindow)));
TimeSpan.FromMinutes(
Convert.ToDouble(
System.Web.Security.Membership.UserIsOnlineTimeWindow)));
using (var context = new MileageTrakerContext())
{
return context.Users.Count(usr => usr.LastActivityDate > dateActive);
@@ -338,13 +328,13 @@ namespace MileageTraker.Web.Membership
{
return false;
}
using (var Context = new MileageTrakerContext())
using (var context = new MileageTrakerContext())
{
var user = Context.Users.FirstOrDefault(Usr => Usr.Username == username);
var user = context.Users.FirstOrDefault(usr => usr.Username == username);
if (user != null)
{
Context.Users.Remove(user);
Context.SaveChanges();
context.Users.Remove(user);
context.SaveChanges();
return true;
}
return false;
@@ -378,11 +368,8 @@ namespace MileageTraker.Web.Membership
.Take(pageSize);
foreach (var user in users)
{
membershipUsers.Add(new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId,
user.Email, null, null,
user.IsApproved, user.IsLockedOut, user.CreateDate.Value,
user.LastLoginDate.Value, user.LastActivityDate.Value,
user.LastPasswordChangedDate.Value, user.LastLockoutDate.Value));
membershipUsers.Add(
user.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name));
}
}
return membershipUsers;
@@ -402,11 +389,7 @@ namespace MileageTraker.Web.Membership
.Take(pageSize);
foreach (var user in users)
{
membershipUsers.Add(new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId,
user.Email, null, null,
user.IsApproved, user.IsLockedOut, user.CreateDate.Value,
user.LastLoginDate.Value, user.LastActivityDate.Value,
user.LastPasswordChangedDate.Value, user.LastLockoutDate.Value));
membershipUsers.Add(user.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name));
}
}
return membershipUsers;
@@ -414,21 +397,22 @@ namespace MileageTraker.Web.Membership
public override MembershipUserCollection GetAllUsers(int pageIndex, int pageSize, out int totalRecords)
{
var MembershipUsers = new MembershipUserCollection();
using (var Context = new MileageTrakerContext())
var membershipUsers = new MembershipUserCollection();
using (var context = new MileageTrakerContext())
{
totalRecords = Context.Users.Count();
var Users = Context.Users.OrderBy(Usrn => Usrn.Username).Skip(pageIndex*pageSize).Take(pageSize);
foreach (var user in Users)
totalRecords = context.Users.Count();
var users =
context.Users
.OrderBy(usrn => usrn.Username)
.Skip(pageIndex*pageSize)
.Take(pageSize);
foreach (var user in users)
{
MembershipUsers.Add(new MembershipUser(System.Web.Security.Membership.Provider.Name, user.Username, user.UserId,
user.Email, null, null,
user.IsApproved, user.IsLockedOut, user.CreateDate.Value,
user.LastLoginDate.Value, user.LastActivityDate.Value,
user.LastPasswordChangedDate.Value, user.LastLockoutDate.Value));
membershipUsers.Add(user.CloneToMembershipUser(System.Web.Security.Membership.Provider.Name));
}
}
return MembershipUsers;
return membershipUsers;
}
public string CreateAccount(string userName, string password, bool requireConfirmationToken)
@@ -451,7 +435,7 @@ namespace MileageTraker.Web.Membership
using (var context = new MileageTrakerContext())
{
if (context.Users.Any(Usr => Usr.Username == userName))
if (context.Users.Any(usr => usr.Username == userName))
{
throw new MembershipCreateUserException(MembershipCreateStatus.DuplicateUserName);
}
@@ -462,7 +446,7 @@ namespace MileageTraker.Web.Membership
token = GenerateToken();
}
var NewUser = new User
var newUser = new User
{
UserId = Guid.NewGuid(),
Username = userName,
@@ -474,13 +458,13 @@ namespace MileageTraker.Web.Membership
PasswordFailuresSinceLastSuccess = 0,
LastLoginDate = DateTime.UtcNow,
LastActivityDate = DateTime.UtcNow,
LastLockoutDate = DateTime.UtcNow,
LastLockoutDate = SqlDateTime.MinValue.Value,
IsLockedOut = false,
LastPasswordFailureDate = DateTime.UtcNow,
LastPasswordFailureDate = SqlDateTime.MinValue.Value,
ConfirmationToken = token
};
context.Users.Add(NewUser);
context.Users.Add(newUser);
context.SaveChanges();
return token;
}
@@ -494,7 +478,7 @@ namespace MileageTraker.Web.Membership
}
}
internal static string GenerateToken(RandomNumberGenerator generator)
private static string GenerateToken(RandomNumberGenerator generator)
{
var tokenBytes = new byte[TokenSizeInBytes];
generator.GetBytes(tokenBytes);