Skip to content

2fa static fix #232

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

Merged
merged 2 commits into from
May 26, 2020
Merged

2fa static fix #232

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
db15184
2fa static fix
nathanjosiah May 26, 2020
b51a20e
Moved phpcs supression
nathanjosiah May 26, 2020
File filter

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions TwoFactorAuth/Model/AdminAccessTokenService.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,16 +90,16 @@ public function createAdminAccessToken($username, $password): string
}

if (!$this->configRequestManager->isConfigurationRequiredFor($userId)) {
// @codingStandardsIgnoreStart
throw new LocalizedException(
__(
// phpcs:ignore Magento2.Functions.DiscouragedFunction
call_user_func(
'__',
'Please use the 2fa provider-specific endpoints to obtain a token.',
[
'active_providers' => $activeProviderCodes
]
)
);
// @codingStandardsIgnoreEnd
} elseif (empty($this->tfa->getUserProviders($userId))) {
// It is expected that available 2fa providers are selected via db or admin ui
throw new LocalizedException(
Expand All @@ -116,7 +116,9 @@ public function createAdminAccessToken($username, $password): string
}

throw new LocalizedException(
__(
// phpcs:ignore Magento2.Functions.DiscouragedFunction
call_user_func(
'__',
'You are required to configure personal Two-Factor Authorization in order to login. '
. 'Please check your email.',
[
Expand Down