ab0f61aa32
Summary: Depends on D18790. Ref T13024. Fixes T8335. Currently, "unapproved" and "disabled" users are bundled together. This prevents users from completing some registration steps (verification, legalpad documents, MFA enrollment) before approval. Separate approval out and move it to the end so users can do all the required enrollment stuff on their end before we roadblock them. Test Plan: Required approval, email verification, signatures, and MFA. Registered an account. Verified email, signed documents, enrolled in MFA, and then got prompted to wait for approval. Reviewers: amckinley Reviewed By: amckinley Maniphest Tasks: T13024, T8335 Differential Revision: https://secure.phabricator.com/D18791
104 lines
3.2 KiB
PHP
104 lines
3.2 KiB
PHP
<?php
|
|
|
|
final class PhabricatorAuthNeedsMultiFactorController
|
|
extends PhabricatorAuthController {
|
|
|
|
public function shouldRequireMultiFactorEnrollment() {
|
|
// Users need access to this controller in order to enroll in multi-factor
|
|
// auth.
|
|
return false;
|
|
}
|
|
|
|
public function shouldRequireEnabledUser() {
|
|
// Users who haven't been approved yet are allowed to enroll in MFA. We'll
|
|
// kick disabled users out later.
|
|
return false;
|
|
}
|
|
|
|
public function handleRequest(AphrontRequest $request) {
|
|
$viewer = $this->getViewer();
|
|
|
|
if ($viewer->getIsDisabled()) {
|
|
// We allowed unapproved and disabled users to hit this controller, but
|
|
// want to kick out disabled users now.
|
|
return new Aphront400Response();
|
|
}
|
|
|
|
$panel = id(new PhabricatorMultiFactorSettingsPanel())
|
|
->setUser($viewer)
|
|
->setViewer($viewer)
|
|
->setOverrideURI($this->getApplicationURI('/multifactor/'))
|
|
->processRequest($request);
|
|
|
|
if ($panel instanceof AphrontResponse) {
|
|
return $panel;
|
|
}
|
|
|
|
$crumbs = $this->buildApplicationCrumbs();
|
|
$crumbs->addTextCrumb(pht('Add Multi-Factor Auth'));
|
|
|
|
$viewer->updateMultiFactorEnrollment();
|
|
|
|
if (!$viewer->getIsEnrolledInMultiFactor()) {
|
|
$help = id(new PHUIInfoView())
|
|
->setTitle(pht('Add Multi-Factor Authentication To Your Account'))
|
|
->setSeverity(PHUIInfoView::SEVERITY_WARNING)
|
|
->setErrors(
|
|
array(
|
|
pht(
|
|
'Before you can use Phabricator, you need to add multi-factor '.
|
|
'authentication to your account.'),
|
|
pht(
|
|
'Multi-factor authentication helps secure your account by '.
|
|
'making it more difficult for attackers to gain access or '.
|
|
'take sensitive actions.'),
|
|
pht(
|
|
'To learn more about multi-factor authentication, click the '.
|
|
'%s button below.',
|
|
phutil_tag('strong', array(), pht('Help'))),
|
|
pht(
|
|
'To add an authentication factor, click the %s button below.',
|
|
phutil_tag('strong', array(), pht('Add Authentication Factor'))),
|
|
pht(
|
|
'To continue, add at least one authentication factor to your '.
|
|
'account.'),
|
|
));
|
|
} else {
|
|
$help = id(new PHUIInfoView())
|
|
->setTitle(pht('Multi-Factor Authentication Configured'))
|
|
->setSeverity(PHUIInfoView::SEVERITY_NOTICE)
|
|
->setErrors(
|
|
array(
|
|
pht(
|
|
'You have successfully configured multi-factor authentication '.
|
|
'for your account.'),
|
|
pht(
|
|
'You can make adjustments from the Settings panel later.'),
|
|
pht(
|
|
'When you are ready, %s.',
|
|
phutil_tag(
|
|
'strong',
|
|
array(),
|
|
phutil_tag(
|
|
'a',
|
|
array(
|
|
'href' => '/',
|
|
),
|
|
pht('continue to Phabricator')))),
|
|
));
|
|
}
|
|
|
|
$view = array(
|
|
$help,
|
|
$panel,
|
|
);
|
|
|
|
return $this->newPage()
|
|
->setTitle(pht('Add Multi-Factor Authentication'))
|
|
->setCrumbs($crumbs)
|
|
->appendChild($view);
|
|
|
|
}
|
|
|
|
}
|