Combine layouts

Web/Membership/CodeFirstMembershipProvider.cs

@@ -6,6 +6,7 @@ using System.Web;
 using System.Web.Security;
 using MileageTraker.Web.Context;
 using MileageTraker.Web.Models;
+using MileageTraker.Web.Utility;
 
 namespace MileageTraker.Web.Membership
 {
@@ -311,11 +312,7 @@ namespace MileageTraker.Web.Membership
 
 		public override int GetNumberOfUsersOnline()
 		{
-			var dateActive =
-				DateTime.UtcNow.Subtract(
-					TimeSpan.FromMinutes(
-						Convert.ToDouble(
-							System.Web.Security.Membership.UserIsOnlineTimeWindow)));
+			var dateActive = CustomExtensions.UserOnlineThreshold();
 			using (var context = new MileageTrakerContext())
 			{
 				return context.Users.Count(usr => usr.LastActivityDate > dateActive);
@@ -360,7 +357,7 @@ namespace MileageTraker.Web.Membership
 			var membershipUsers = new MembershipUserCollection();
 			using (var context = new MileageTrakerContext())
 			{
-				totalRecords = context.Users.Count(Usr => Usr.Email == emailToMatch);
+				totalRecords = context.Users.Count(user => user.Email == emailToMatch);
 				var users =
 					context.Users.Where(usr => usr.Email == emailToMatch)
 					       .OrderBy(usrn => usrn.Username)

Web/Membership/WebSecurity.cs

@@ -101,10 +101,10 @@ namespace MileageTraker.Web.Membership
 			return System.Web.Security.Membership.DeleteUser(username);
 		}
 
-		public static int GetUserId(string userName)
+		public static Guid GetUserId(string userName)
 		{
 			var user = System.Web.Security.Membership.GetUser(userName);
-			return (int) user.ProviderUserKey;
+			return (Guid) user.ProviderUserKey;
 		}
 
 		public static string CreateAccount(string userName, string password)
@@ -114,7 +114,7 @@ namespace MileageTraker.Web.Membership
 
 		public static string CreateAccount(string userName, string password, bool requireConfirmationToken = false)
 		{
-			var codeFirstMembership = System.Web.Security.Membership.Provider as CodeFirstMembershipProvider;
+			var codeFirstMembership = (CodeFirstMembershipProvider)System.Web.Security.Membership.Provider;
 			return codeFirstMembership.CreateAccount(userName, password, requireConfirmationToken);
 		}
 
@@ -136,7 +136,7 @@ namespace MileageTraker.Web.Membership
 		private static string CreateUserAndAccount(string userName, string password, object propertyValues = null,
 		                                          bool requireConfirmationToken = false)
 		{
-			var codeFirstMembership = System.Web.Security.Membership.Provider as CodeFirstMembershipProvider;
+			var codeFirstMembership = (CodeFirstMembershipProvider)System.Web.Security.Membership.Provider;
 
 			//IDictionary<string, object> values = null;
 			//if (propertyValues != null)
@@ -171,6 +171,5 @@ namespace MileageTraker.Web.Membership
 			return
 				System.Web.Security.Membership.GetAllUsers(pageIndex, pageSize, out totalRecords).Cast<MembershipUser>().ToList();
 		}
-
 	}
 }