oss/wallabag
oss/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-08-11 17:51:02 +00:00
Code Wiki Activity

Fix tests

Browse source
This commit is contained in:
Jeremy Benoist 2018-12-02 18:39:02 +01:00
parent edc79ad886
commit 2dfbe9e5fa
No known key found for this signature in database
GPG key ID: BCA73962457ACC3C
4 changed files with 36 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/Wallabag/CoreBundle/Controller/ConfigController.php
View file

@ -81,23 +81,23 @@ class ConfigController extends Controller
$userForm->handleRequest($request);
// `googleTwoFactor` isn't a field within the User entity, we need to define it's value in a different way
if (true === $user->isGoogleAuthenticatorEnabled() && false === $userForm->isSubmitted()) {
if ($this->getParameter('twofactor_auth') && true === $user->isGoogleAuthenticatorEnabled() && false === $userForm->isSubmitted()) {
$userForm->get('googleTwoFactor')->setData(true);
}
if ($userForm->isSubmitted() && $userForm->isValid()) {
// handle creation / reset of the OTP secret if checkbox changed from the previous state
if (true === $userForm->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
$secret = $this->get('scheb_two_factor.security.google_authenticator')->generateSecret();
if ($this->getParameter('twofactor_auth')) {
if (true === $userForm->get('googleTwoFactor')->getData() && false === $user->isGoogleAuthenticatorEnabled()) {
$secret = $this->get('scheb_two_factor.security.google_authenticator')->generateSecret();
$user->setGoogleAuthenticatorSecret($secret);
$user->setEmailTwoFactor(false);
$user->setGoogleAuthenticatorSecret($secret);
$user->setEmailTwoFactor(false);
$qrCode = $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user);
$this->addFlash('OTPSecret', ['code' => $secret, 'qrCode' => $qrCode]);
} elseif (false === $userForm->get('googleTwoFactor')->getData() && true === $user->isGoogleAuthenticatorEnabled()) {
$user->setGoogleAuthenticatorSecret(null);
$this->addFlash('OtpQrCode', $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user));
} elseif (false === $userForm->get('googleTwoFactor')->getData() && true === $user->isGoogleAuthenticatorEnabled()) {
$user->setGoogleAuthenticatorSecret(null);
}
}
$userManager->updateUser($user, true);