From 49877434ac91808d206356614f71ec9cb91a147e Mon Sep 17 00:00:00 2001 From: Sebastian Date: Tue, 18 Aug 2020 10:45:54 +0200 Subject: [PATCH] Login improvement. --- .../Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs | 3 +-- .../IdentityServer/Controllers/Account/AccountController.cs | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/backend/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs b/backend/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs index 8c7ad4541..e855744ea 100644 --- a/backend/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs +++ b/backend/src/Squidex.Infrastructure/Log/Internal/FileLogProcessor.cs @@ -32,8 +32,7 @@ namespace Squidex.Infrastructure.Log.Internal outputThread = new Thread(ProcessLogQueue) { - IsBackground = true, - Name = "Logging" + IsBackground = true, Name = "Logging" }; } diff --git a/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs b/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs index 7e4f6b9a1..7e303b98a 100644 --- a/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs +++ b/backend/src/Squidex/Areas/IdentityServer/Controllers/Account/AccountController.cs @@ -208,7 +208,11 @@ namespace Squidex.Areas.IdentityServer.Controllers.Account var result = await signInManager.PasswordSignInAsync(model.Email, model.Password, true, true); - if (!result.Succeeded) + if (!result.Succeeded && result.IsLockedOut) + { + return View(nameof(LockedOut)); + } + else if (!result.Succeeded) { return await LoginViewAsync(returnUrl, true, true); }