yv01p/Umbraco-CMS
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #5390 from umbraco/v8/bugfix/ui-2fa-login-view

Browse Source 
Add back the ability to use a custom 2-factor auth screen
This commit is contained in:
Shannon Deminick
2019-05-06 16:23:18 +10:00
committed by GitHub
parent f34b2edb08 c03a4d978b
commit 74be040298
4 changed files with 32 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
src/Umbraco.Web.UI.Client/src/common/directives/components/application/umblogin.directive.js
View File

@@ -16,7 +16,6 @@
function UmbLoginController($scope, $location, currentUserResource, formHelper, mediaHelper, umbRequestHelper, Upload, localizationService, userService, externalLoginInfo, resetPasswordCodeInfo, $timeout, authResource, $q) {
const vm = this;
let twoFactorloginDialog = null;
vm.invitedUser = null;
@@ -69,7 +68,9 @@
).then(function (data) {
vm.labels.usernameLabel = data[0];
vm.labels.usernamePlaceholder = data[1];
})
});
vm.twoFactor = {};
function onInit() {
@@ -187,15 +188,18 @@
vm.view = "set-password";
}
function loginSubmit(login, password) {
function loginSubmit() {
// make sure that we are returning to the login view.
vm.view = "login";
// TODO: Do validation properly like in the invite password update
//if the login and password are not empty we need to automatically
// validate them - this is because if there are validation errors on the server
// then the user has to change both username & password to resubmit which isn't ideal,
// so if they're not empty, we'll just make sure to set them to valid.
if (login && password && login.length > 0 && password.length > 0) {
if (vm.login && vm.password && vm.login.length > 0 && vm.password.length > 0) {
vm.loginForm.username.$setValidity('auth', true);
vm.loginForm.password.$setValidity('auth', true);
}
@@ -206,7 +210,7 @@
vm.loginStates.submitButton = "busy";
userService.authenticate(login, password)
userService.authenticate(vm.login, vm.password)
.then(function (data) {
vm.loginStates.submitButton = "success";
userService._retryRequestQueue(true);
@@ -219,7 +223,7 @@
//is Two Factor required?
if (reason.status === 402) {
vm.errorMsg = "Additional authentication required";
show2FALoginDialog(reason.data.twoFactorView, submit);
show2FALoginDialog(reason.data.twoFactorView);
}
else {
vm.loginStates.submitButton = "error";
@@ -403,8 +407,12 @@
});
}
function show2FALoginDialog(view, callback) {
// TODO: show 2FA window
function show2FALoginDialog(viewPath) {
vm.twoFactor.submitCallback = function submitCallback() {
vm.onLogin();
}
vm.twoFactor.view = viewPath;
vm.view = "2fa-login";
}
function resetInputValidation() {

7
src/Umbraco.Web.UI.Client/src/views/components/application/umb-login.html
View File

@@ -146,7 +146,7 @@
</div>
<form method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit(vm.login, vm.password)">
<form method="POST" name="vm.loginForm" ng-submit="vm.loginSubmit()">
<div class="control-group" ng-show="vm.loginForm.$invalid">
<div class="text-error">{{vm.errorMsg}}</div>
@@ -258,6 +258,11 @@
<a class="muted" href="#" prevent-default ng-click="vm.showLogin()"><localize key="login_returnToLogin">Return to login form</localize></a>
</div>
</div>
<div ng-show="vm.view == '2fa-login'">
<div ng-include='vm.twoFactor.view'></div>
</div>
</div>
</div>
</div>

7
src/Umbraco.Web/Editors/AuthenticationController.cs
View File

@@ -329,7 +329,7 @@ namespace Umbraco.Web.Editors
public async Task<IEnumerable<string>> Get2FAProviders()
{
var userId = await SignInManager.GetVerifiedUserIdAsync();
if (userId < 0)
if (userId == int.MinValue)
{
Logger.Warn<AuthenticationController>("Get2FAProviders :: No verified user found, returning 404");
throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -345,7 +345,7 @@ namespace Umbraco.Web.Editors
throw new HttpResponseException(HttpStatusCode.NotFound);
var userId = await SignInManager.GetVerifiedUserIdAsync();
if (userId < 0)
if (userId == int.MinValue)
{
Logger.Warn<AuthenticationController>("Get2FAProviders :: No verified user found, returning 404");
throw new HttpResponseException(HttpStatusCode.NotFound);
@@ -475,8 +475,7 @@ namespace Umbraco.Web.Editors
if (UserManager != null)
{
var userId = -1;
int.TryParse(User.Identity.GetUserId(), out userId);
int.TryParse(User.Identity.GetUserId(), out var userId);
UserManager.RaiseLogoutSuccessEvent(userId);
}

12
src/Umbraco.Web/Security/BackOfficeSignInManager.cs
View File

@@ -227,7 +227,7 @@ namespace Umbraco.Web.Security
}
/// <summary>
/// Get the user id that has been verified already or -1.
/// Get the user id that has been verified already or int.MinValue if the user has not been verified yet
/// </summary>
/// <returns></returns>
/// <remarks>
@@ -240,7 +240,7 @@ namespace Umbraco.Web.Security
{
return ConvertIdFromString(result.Identity.GetUserId());
}
return -1;
return int.MinValue;
}
/// <summary>
@@ -269,12 +269,12 @@ namespace Umbraco.Web.Security
/// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
/// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
/// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
/// all of this code to check for -1 instead.
/// all of this code to check for int.MinValue
/// </remarks>
public override async Task<SignInStatus> TwoFactorSignInAsync(string provider, string code, bool isPersistent, bool rememberBrowser)
{
var userId = await GetVerifiedUserIdAsync();
if (userId == -1)
if (userId == int.MinValue)
{
return SignInStatus.Failure;
}
@@ -306,12 +306,12 @@ namespace Umbraco.Web.Security
/// This is implemented because we cannot override GetVerifiedUserIdAsync and instead we have to shadow it
/// so due to this and because we are using an INT as the TKey and not an object, it can never be null. Adding to that
/// the default(int) value returned by the base class is always a valid user (i.e. the admin) so we just have to duplicate
/// all of this code to check for -1 instead.
/// all of this code to check for int.MinVale instead.
/// </remarks>
public override async Task<bool> SendTwoFactorCodeAsync(string provider)
{
var userId = await GetVerifiedUserIdAsync();
if (userId == -1)
if (userId == int.MinValue)
return false;
var token = await UserManager.GenerateTwoFactorTokenAsync(userId, provider);