Skip to content

Bugfix/auth 2fa and elevated session #18753

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
i-just wants to merge 3 commits into
base: 5.x
Choose a base branch
from
+10 −6
Open

Bugfix/auth 2fa and elevated session #18753

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
9722e0b
that's not what the 3rd param is for...
i-just Apr 24, 2026
1d1540a
same error message when account is locked or in cooldown
i-just Apr 24, 2026
c37424a
build
i-just Apr 24, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/services/Auth.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -240,7 +240,13 @@ public function getAuthErrorMessage(?string $defaultMessage = null): string
if ($user) {
$authError = UserHelper::getAuthStatus($user);
}
if ($authError == User::AUTH_INVALID_CREDENTIALS || !$authError) {
if (
$authError == User::AUTH_INVALID_CREDENTIALS ||
!$authError ||
// if preventUserEnumeration is true and the account is locked, still show the same message
(Craft::$app->getConfig()->getGeneral()->preventUserEnumeration &&
in_array($authError, [User::AUTH_ACCOUNT_LOCKED, User::AUTH_ACCOUNT_COOLDOWN]))
) {
if ($defaultMessage) {
return $defaultMessage;
}
Expand Down
2 changes: 1 addition & 1 deletion src/web/assets/authmethodsetup/dist/auth.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion src/web/assets/authmethodsetup/dist/auth.js.map
View file
Open in desktop

Large diffs are not rendered by default.

4 changes: 1 addition & 3 deletions src/web/assets/authmethodsetup/src/AuthMethodSetup.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,9 +90,7 @@ Craft.AuthMethodSetup = Garnish.Base.extend(
},
() => {
button.classList.remove('loading');
},
// give them 5 minutes to complete setup
Math.min(Craft.elevatedSessionDuration, 300)
}
);
},

Expand Down
Loading