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

Set password operational

Browse Source 
Sitewide plan for status messages
This commit is contained in:
poprhythm
2012-12-29 20:41:50 -05:00
parent ce6fd9c215
commit 8739251066
32 changed files with 332 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Web/Controllers/AccountController.cs
+4 -41
View File
@@ -26,7 +26,7 @@ namespace MileageTraker.Web.Controllers
if (success)
{
FormsAuthentication.SetAuthCookie(model.Username, model.RememberMe);
// TODO: send notification to user
TempData["StatusMessage"] = "Logged in as " + model.Username;
return RedirectToLocal(returnUrl);
}
}
@@ -42,7 +42,7 @@ namespace MileageTraker.Web.Controllers
{
FormsAuthentication.SignOut();
// TODO: send notification to user
TempData["StatusMessage"] = "Logged off";
return RedirectToAction("Index", "CreateLog");
}
@@ -108,7 +108,8 @@ namespace MileageTraker.Web.Controllers
if (changePasswordSucceeded)
{
return RedirectToAction("Manage", new { Message = ManageMessageId.ChangePasswordSuccess });
TempData["StatusMessage"] = ManageMessageId.ChangePasswordSuccess;
return RedirectToAction("Manage");
}
ModelState.AddModelError("", "The current password is incorrect or the new password is invalid.");
}
@@ -131,43 +132,5 @@ namespace MileageTraker.Web.Controllers
ChangePasswordSuccess,
SetPasswordSuccess,
}
private static string ErrorCodeToString(MembershipCreateStatus createStatus)
{
// See http://go.microsoft.com/fwlink/?LinkID=177550 for
// a full list of status codes.
switch (createStatus)
{
case MembershipCreateStatus.DuplicateUserName:
return "User name already exists. Please enter a different user name.";
case MembershipCreateStatus.DuplicateEmail:
return "A user name for that e-mail address already exists. Please enter a different e-mail address.";
case MembershipCreateStatus.InvalidPassword:
return "The password provided is invalid. Please enter a valid password value.";
case MembershipCreateStatus.InvalidEmail:
return "The e-mail address provided is invalid. Please check the value and try again.";
case MembershipCreateStatus.InvalidAnswer:
return "The password retrieval answer provided is invalid. Please check the value and try again.";
case MembershipCreateStatus.InvalidQuestion:
return "The password retrieval question provided is invalid. Please check the value and try again.";
case MembershipCreateStatus.InvalidUserName:
return "The user name provided is invalid. Please check the value and try again.";
case MembershipCreateStatus.ProviderError:
return "The authentication provider returned an error. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
case MembershipCreateStatus.UserRejected:
return "The user creation request has been canceled. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
default:
return "An unknown error occurred. Please verify your entry and try again. If the problem persists, please contact your system administrator.";
}
}
}
}
Web/Controllers/CreateLogController.cs
-1
View File
@@ -2,7 +2,6 @@
using System.Web.Mvc;
using MileageTraker.Web.Attributes;
using MileageTraker.Web.Models;
using MileageTraker.Web.Utility;
using MileageTraker.Web.ViewModels.CreateLog;
namespace MileageTraker.Web.Controllers
Web/Controllers/LogController.cs
+6 -2
View File
@@ -98,7 +98,7 @@ namespace MileageTraker.Web.Controllers
else
{
logId = id;
TempData["Message"] = "This is the first log for this vehicle";
TempData["StatusMessage"] = "This is the first log for this vehicle";
}
return RedirectToAction("Details", new {id = logId});
}
@@ -114,7 +114,7 @@ namespace MileageTraker.Web.Controllers
else
{
logId = id;
TempData["Message"] = "This is the most recent log for this vehicle";
TempData["StatusMessage"] = "This is the most recent log for this vehicle";
}
return RedirectToAction("Details", new { id = logId });
}
@@ -142,6 +142,8 @@ namespace MileageTraker.Web.Controllers
log.UserAgent = HttpContext.Request.UserAgent;
DataService.AddLog(log);
TempData["StatusMessage"] = "Log created";
return RedirectToAction("Index");
}
@@ -162,6 +164,7 @@ namespace MileageTraker.Web.Controllers
if (ModelState.IsValid)
{
DataService.UpdateLog(log);
TempData["StatusMessage"] = "Log updated";
return RedirectToAction("Details", new{id = log.LogId});
}
return View(log);
@@ -188,6 +191,7 @@ namespace MileageTraker.Web.Controllers
{
DataService.DeleteLog(id);
TempData["StatusMessage"] = "Log deleted";
if (Session["LogPage"] != null)
return Redirect((string) Session["LogPage"]);
return RedirectToAction("Index");
Web/Controllers/UserController.cs
+62 -14
View File
@@ -2,8 +2,6 @@
using System.Linq;
using System.Web.Mvc;
using System.Web.Security;
using MileageTraker.Web.Attributes;
using MileageTraker.Web.Models;
using MileageTraker.Web.ViewModels.User;
namespace MileageTraker.Web.Controllers
@@ -41,8 +39,6 @@ namespace MileageTraker.Web.Controllers
{
if (ModelState.IsValid)
{
var hasRoles = viewModel.Roles != null && viewModel.Roles.Any();
MembershipCreateStatus membershipCreateStatus;
var membershipUser =
Membership.CreateUser(
@@ -51,7 +47,7 @@ namespace MileageTraker.Web.Controllers
viewModel.Email,
null,
null,
hasRoles,
true,
out membershipCreateStatus);
if (membershipUser == null)
@@ -61,19 +57,19 @@ namespace MileageTraker.Web.Controllers
return View(viewModel);
}
if (hasRoles)
if (viewModel.Roles != null && viewModel.Roles.Any())
{
Roles.AddUserToRoles(
membershipUser.UserName,
viewModel.Roles);
}
var user = DataService.GetUser(
(Guid) membershipUser.ProviderUserKey);
var user = DataService.GetUser((Guid) membershipUser.ProviderUserKey);
user.FullName = viewModel.FullName;
DataService.UpdateUserPersonalInfo(user);
return RedirectToAction("Index");
TempData["StatusMessage"] = "User " + user.Username + " created";
return RedirectToAction("Index");
}
viewModel.AvailableRoles = Roles.GetAllRoles();
@@ -87,20 +83,72 @@ namespace MileageTraker.Web.Controllers
{
return HttpNotFound();
}
return View(user);
var vm = new EditUserViewModel(user)
{
Roles = Roles.GetRolesForUser(user.Username),
AvailableRoles = Roles.GetAllRoles()
};
return View(vm);
}
[HttpPost]
public ActionResult Edit(User user)
public ActionResult Edit(EditUserViewModel viewModel)
{
if (ModelState.IsValid)
{
DataService.UpdateUser(user);
return RedirectToAction("Index");
var user = DataService.GetUser(viewModel.UserId);
viewModel.UpdateUser(user);
DataService.UpdateUserPersonalInfo(user);
Roles.RemoveUserFromRoles(user.Username, Roles.GetAllRoles());
if (viewModel.Roles != null && viewModel.Roles.Any())
{
Roles.AddUserToRoles(
user.Username,
viewModel.Roles);
}
TempData["StatusMessage"] = "Changes saved for " + user.Username;
return RedirectToAction("Index");
}
return View(user);
return View(viewModel);
}
public ActionResult SetPassword(Guid id)
{
var user = Membership.GetUser(id);
if (user == null)
{
return HttpNotFound();
}
var viewModel = new SetPasswordViewModel {UserId = id, Username = user.UserName};
return View(viewModel);
}
[HttpPost]
public ActionResult SetPassword(SetPasswordViewModel viewModel)
{
if (ModelState.IsValid)
{
// ChangePassword will throw an exception rather than return false in certain failure scenarios.
try
{
DataService.UpdateUserPassword(viewModel.UserId, viewModel.NewPassword);
TempData["StatusMessage"] = "Password set for " + viewModel.Username;
return RedirectToAction("Details", new { id = viewModel.UserId});
}
catch (Exception)
{
ModelState.AddModelError("", "The new password is invalid.");
}
}
// If we got this far, something failed, redisplay form
return View(viewModel);
}
private static string ErrorCodeToString(MembershipCreateStatus createStatus)
{
// See http://go.microsoft.com/fwlink/?LinkID=177550 for
Web/Controllers/VehicleController.cs
+3 -1
View File
@@ -38,7 +38,8 @@ namespace MileageTraker.Web.Controllers
if (ModelState.IsValid)
{
DataService.AddVehicle(vehicle);
return RedirectToAction("Index");
TempData["StatusMessage"] = "Vehicle " + vehicle.VehicleId + "created";
return RedirectToAction("Index");
}
return View(vehicle);
@@ -56,6 +57,7 @@ namespace MileageTraker.Web.Controllers
if (ModelState.IsValid)
{
DataService.UpdateVehicle(vehicle);
TempData["StatusMessage"] = "Changes saved for vehicle " + vehicle.VehicleId;
return RedirectToAction("Details", new { id = vehicle.VehicleId });
}
return View(vehicle);