From 7a757e84b27a9957f8878c479a00fcc55e5a038c Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Fri, 11 Apr 2025 08:51:34 +0200 Subject: [PATCH 1/3] =?UTF-8?q?Login=20tov=C3=A1bbfejleszt=C3=A9se?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Pages/Account/Login.cshtml | 27 ++++++++++++------- 1 file changed, 18 insertions(+), 9 deletions(-) diff --git a/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml b/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml index 7e94936..0b4b228 100644 --- a/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml +++ b/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml @@ -23,10 +23,7 @@

Bejelentkezés

- @if (!string.IsNullOrEmpty(Model.ErrorMessage)) - { -
@Model.ErrorMessage
- } +
@@ -69,6 +66,8 @@ $('#Login2F2Btn').hide(); $('#Login2F1Btn').on('click', function () { + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); + $('#errorMessageContainer').hide().text(''); const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content'); const userName = $('#User2FADTO_UserName').val(); const password = $('#User2FADTO_Password').val(); @@ -94,17 +93,21 @@ $('#Login2F2Btn').show(); $('#User2FADTO_Token2FA').val(result.data) } else { - alert('Hibás felhasználónév vagy jelszó!'); + $('#errorMessageContainer').text('Hibás felhasználónév vagy jelszó!').show(); + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); } }, error: function () { - alert('Hiba történt a kérés során.'); + $('#errorMessageContainer').text('Hiba történt a kérés során.').show(); + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); } }); - + }); $('#Login2F2Btn').on('click', function () { + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); + $('#errorMessageContainer').hide().text(''); const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content'); const userName = $('#User2FADTO_UserName').val(); @@ -130,16 +133,22 @@ if (result.success) { window.location.href = `/Index`; } else { - alert('Hibás felhasználónév vagy jelszó!'); + $('#errorMessageContainer').text('Hibás felhasználónév vagy jelszó!').show(); + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); } }, error: function (xhr) { console.log(xhr.status); console.log(xhr.responseText); - alert('Hiba történt a kérés során.'); + $('#errorMessageContainer').text('Hiba történt a kérés során.').show(); + $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); } }); + + }); + $('input').on('input', function () { + $('#errorMessageContainer').hide().text(''); }); }); From fad139866842ecfec79b2a0be1550aae9a20f688 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Fri, 11 Apr 2025 10:56:44 +0200 Subject: [PATCH 2/3] =?UTF-8?q?Csak=20a=20Web=20be=C3=A1ll=C3=ADtott=20l?= =?UTF-8?q?=C3=A9phet=20be?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/WorkFlowCheck.BL/Services/UserService.cs | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) diff --git a/src/WorkFlowCheck.BL/Services/UserService.cs b/src/WorkFlowCheck.BL/Services/UserService.cs index 2503cad..f22f445 100644 --- a/src/WorkFlowCheck.BL/Services/UserService.cs +++ b/src/WorkFlowCheck.BL/Services/UserService.cs @@ -135,7 +135,17 @@ namespace WorkFlowCheck.BL.Services .FirstOrDefaultAsync(); if (user != null && PasswordHasher.VerifyPassword(user.PasswordHash, password)) { - if (!string.IsNullOrEmpty(user.Email)) + var canUseWebAdmin = false; + foreach (var userRole in user.UserRoles) + { + if (userRole.Role.CanUseWebAdmin) + { + canUseWebAdmin = true; + break; + } + } + + if (!string.IsNullOrEmpty(user.Email) && canUseWebAdmin) { var code = CodeGenerator2F.GenerateSixDigitCode(); From 5c5a852ead247e800553215ac0aba96750cbdf97 Mon Sep 17 00:00:00 2001 From: ivanszabo Date: Fri, 11 Apr 2025 16:18:58 +0200 Subject: [PATCH 3/3] Release +Version Backend --- .../WorkFlowCheck.API.csproj | 6 +++++ .../Pages/Account/Login.cshtml | 25 +++++++++++++------ .../Pages/Shared/_Layout.cshtml | 2 +- .../WorkFlowCheck.Web.csproj | 5 ++++ 4 files changed, 30 insertions(+), 8 deletions(-) diff --git a/src/WorkFlowCheck.API/WorkFlowCheck.API.csproj b/src/WorkFlowCheck.API/WorkFlowCheck.API.csproj index 741e280..45f13ef 100644 --- a/src/WorkFlowCheck.API/WorkFlowCheck.API.csproj +++ b/src/WorkFlowCheck.API/WorkFlowCheck.API.csproj @@ -46,4 +46,10 @@ + + + Never + + + diff --git a/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml b/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml index 0b4b228..897fd4a 100644 --- a/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml +++ b/src/WorkFlowCheck.Web/Pages/Account/Login.cshtml @@ -66,7 +66,7 @@ $('#Login2F2Btn').hide(); $('#Login2F1Btn').on('click', function () { - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); + // $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); $('#errorMessageContainer').hide().text(''); const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content'); const userName = $('#User2FADTO_UserName').val(); @@ -94,19 +94,25 @@ $('#User2FADTO_Token2FA').val(result.data) } else { $('#errorMessageContainer').text('Hibás felhasználónév vagy jelszó!').show(); - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); + // $('#Login2F1Btn, #Login2F2Btn') + // .prop('disabled', false) + // .removeAttr('disabled') + // .removeClass('disabled'); } }, error: function () { $('#errorMessageContainer').text('Hiba történt a kérés során.').show(); - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); + // $('#Login2F1Btn, #Login2F2Btn') + // .prop('disabled', false) + // .removeAttr('disabled') + // .removeClass('disabled'); } }); }); $('#Login2F2Btn').on('click', function () { - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); + // $('#Login2F1Btn, #Login2F2Btn').prop('disabled', true); $('#errorMessageContainer').hide().text(''); const csrfToken = document.querySelector('meta[name="csrf-token"]').getAttribute('content'); @@ -134,17 +140,22 @@ window.location.href = `/Index`; } else { $('#errorMessageContainer').text('Hibás felhasználónév vagy jelszó!').show(); - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); + // $('#Login2F1Btn, #Login2F2Btn') + // .prop('disabled', false) + // .removeAttr('disabled') + // .removeClass('disabled'); } }, error: function (xhr) { console.log(xhr.status); console.log(xhr.responseText); $('#errorMessageContainer').text('Hiba történt a kérés során.').show(); - $('#Login2F1Btn, #Login2F2Btn').prop('disabled', false); + // $('#Login2F1Btn, #Login2F2Btn') + // .prop('disabled', false) + // .removeAttr('disabled') + // .removeClass('disabled'); } }); - }); $('input').on('input', function () { diff --git a/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml b/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml index 6b27da4..3e42c18 100644 --- a/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml +++ b/src/WorkFlowCheck.Web/Pages/Shared/_Layout.cshtml @@ -138,7 +138,7 @@
- © @DateTime.Now.Year - Workflow Check App - Version 0.899Privacy + © @DateTime.Now.Year - Workflow Check App - Version v1.1.003 Privacy
diff --git a/src/WorkFlowCheck.Web/WorkFlowCheck.Web.csproj b/src/WorkFlowCheck.Web/WorkFlowCheck.Web.csproj index eace772..fc0f03e 100644 --- a/src/WorkFlowCheck.Web/WorkFlowCheck.Web.csproj +++ b/src/WorkFlowCheck.Web/WorkFlowCheck.Web.csproj @@ -40,4 +40,9 @@ + + + Never + +