Fire the login failed event only once when a known user login fails. #16552
Conversation
|
Any reason you didn't merge @MikeAlhayek? Are we waiting for something or can it be merged? |
|
Because of comments like #16533 (review) . Giving others chance to look at it. |
|
That was for a larger PR with multiple reviewers requested. |
|
Let's merge #16539 first, as it will cause a conflict with this PR. I'll then resolve the conflict and test the necessary commands to handle PR conflicts resulting from the namespace change. |
|
Alright! |
|
This pull request has merge conflicts. Please resolve those before requesting a review. |
|
@mvarblow can you please re-sync your main branch with OC? You should be able to do that by going to https://github.com/mvarblow/OrchardCore and click Sync form
|
MikeAlhayek
force-pushed
the
fix/double-loginfailed-event
branch
from
9f0e7c7
to
d735fe3
Compare
Fixed the merge
|
@MikeAlhayek it looks like you already forced the resync. I resolved the merge conflicts. |
|
/backport to release/1.8.3 |
|
Started backporting to release/1.8.3: https://github.com/OrchardCMS/OrchardCore/actions/runs/10565378786 |
|
@MikeAlhayek backporting to release/1.8.3 failed, the patch most likely resulted in conflicts: $ git am --3way --ignore-whitespace --keep-non-patch changes.patch
Applying: Fire the login failed event only once when a known user login fails.
Using index info to reconstruct a base tree...
M src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
Falling back to patching base and 3-way merge...
Auto-merging src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
CONFLICT (content): Merge conflict in src/OrchardCore.Modules/OrchardCore.Users/Controllers/AccountController.cs
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
hint: When you have resolved this problem, run "git am --continue".
hint: If you prefer to skip this patch, run "git am --skip" instead.
hint: To restore the original branch and stop patching, run "git am --abort".
hint: Disable this message with "git config advice.mergeConflict false"
Patch failed at 0001 Fire the login failed event only once when a known user login fails.
Error: The process '/usr/bin/git' failed with exit code 128Please backport manually! |
|
@MikeAlhayek an error occurred while backporting to release/1.8.3, please check the run log for details! Error: git am failed, most likely due to a merge conflict. |
Fixes #16551