nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-07 22:18:17 -05:00
Code

use message codes in query string (#681)

Browse Source
This commit is contained in:
Kyle Spearrin 2020-03-29 23:41:31 -04:00 committed by GitHub
parent 0422436287
commit fef512bad1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Admin/Controllers/LoginController.cs
View File

@ -16,19 +16,19 @@ namespace Bit.Admin.Controllers
_signInManager = signInManager; _signInManager = signInManager;
} }
public IActionResult Index(string returnUrl = null, string error = null, string success = null, public IActionResult Index(string returnUrl = null, int? error = null, int? success = null,
bool accessDenied = false) bool accessDenied = false)
{ {
if (string.IsNullOrWhiteSpace(error) && accessDenied) if (!error.HasValue && accessDenied)
{ {
error = "Access denied. Please log in."; error = 4;
} }
return View(new LoginModel return View(new LoginModel
{ {
ReturnUrl = returnUrl, ReturnUrl = returnUrl,
Error = error, Error = GetMessage(error),
Success = success Success = GetMessage(success)
}); });
} }
@ -41,8 +41,7 @@ namespace Bit.Admin.Controllers
await _signInManager.PasswordlessSignInAsync(model.Email, model.ReturnUrl); await _signInManager.PasswordlessSignInAsync(model.Email, model.ReturnUrl);
return RedirectToAction("Index", new return RedirectToAction("Index", new
{ {
success = "If a valid admin user with this email address exists, " + success = 3
"we've sent you an email with a secure link to log in."
}); });
} }
@ -56,7 +55,7 @@ namespace Bit.Admin.Controllers
{ {
return RedirectToAction("Index", new return RedirectToAction("Index", new
{ {
error = "This login confirmation link is invalid. Try logging in again." error = 2
}); });
} }
@ -75,8 +74,21 @@ namespace Bit.Admin.Controllers
await _signInManager.SignOutAsync(); await _signInManager.SignOutAsync();
return RedirectToAction("Index", new return RedirectToAction("Index", new
{ {
success = "You have been logged out." success = 1
}); });
} }
private string GetMessage(int? messageCode)
{
return messageCode switch
{
1 => "You have been logged out.",
2 => "This login confirmation link is invalid. Try logging in again.",
3 => "If a valid admin user with this email address exists, " +
"we've sent you an email with a secure link to log in.",
4 => "Access denied. Please log in.",
_ => null,
};
}
} }
} }