namespace Wallabag\CoreBundle\Controller;
-use Sensio\Bundle\FrameworkExtraBundle\Configuration\Route;
+use PragmaRX\Recovery\Recovery as BackupCodes;
use Symfony\Bundle\FrameworkBundle\Controller\Controller;
use Symfony\Component\HttpFoundation\JsonResponse;
use Symfony\Component\HttpFoundation\RedirectResponse;
use Symfony\Component\HttpFoundation\Request;
use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Validator\Constraints\Locale as LocaleConstraint;
use Wallabag\CoreBundle\Entity\Config;
use Wallabag\CoreBundle\Entity\TaggingRule;
-use Wallabag\CoreBundle\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\ChangePasswordType;
+use Wallabag\CoreBundle\Form\Type\ConfigType;
use Wallabag\CoreBundle\Form\Type\RssType;
use Wallabag\CoreBundle\Form\Type\TaggingRuleType;
use Wallabag\CoreBundle\Form\Type\UserInformationType;
$configForm = $this->createForm(ConfigType::class, $config, ['action' => $this->generateUrl('config')]);
$configForm->handleRequest($request);
- if ($configForm->isValid()) {
+ if ($configForm->isSubmitted() && $configForm->isValid()) {
$em->persist($config);
$em->flush();
$activeTheme = $this->get('liip_theme.active_theme');
$activeTheme->setName($config->getTheme());
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.config_saved'
);
}
// handle changing password
- $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config').'#set4']);
+ $pwdForm = $this->createForm(ChangePasswordType::class, null, ['action' => $this->generateUrl('config') . '#set4']);
$pwdForm->handleRequest($request);
- if ($pwdForm->isValid()) {
+ if ($pwdForm->isSubmitted() && $pwdForm->isValid()) {
if ($this->get('craue_config')->get('demo_mode_enabled') && $this->get('craue_config')->get('demo_mode_username') === $user->getUsername()) {
$message = 'flashes.config.notice.password_not_updated_demo';
} else {
$userManager->updateUser($user, true);
}
- $this->get('session')->getFlashBag()->add('notice', $message);
+ $this->addFlash('notice', $message);
- return $this->redirect($this->generateUrl('config').'#set4');
+ return $this->redirect($this->generateUrl('config') . '#set4');
}
// handle changing user information
$userForm = $this->createForm(UserInformationType::class, $user, [
'validation_groups' => ['Profile'],
- 'action' => $this->generateUrl('config').'#set3',
+ 'action' => $this->generateUrl('config') . '#set3',
]);
$userForm->handleRequest($request);
- if ($userForm->isValid()) {
+ if ($userForm->isSubmitted() && $userForm->isValid()) {
$userManager->updateUser($user, true);
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.user_updated'
);
- return $this->redirect($this->generateUrl('config').'#set3');
+ return $this->redirect($this->generateUrl('config') . '#set3');
}
// handle rss information
- $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config').'#set2']);
+ $rssForm = $this->createForm(RssType::class, $config, ['action' => $this->generateUrl('config') . '#set2']);
$rssForm->handleRequest($request);
- if ($rssForm->isValid()) {
+ if ($rssForm->isSubmitted() && $rssForm->isValid()) {
$em->persist($config);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_updated'
);
- return $this->redirect($this->generateUrl('config').'#set2');
+ return $this->redirect($this->generateUrl('config') . '#set2');
}
// handle tagging rule
$taggingRule = new TaggingRule();
- $action = $this->generateUrl('config').'#set5';
+ $action = $this->generateUrl('config') . '#set5';
if ($request->query->has('tagging-rule')) {
$taggingRule = $this->getDoctrine()
return $this->redirect($action);
}
- $action = $this->generateUrl('config').'?tagging-rule='.$taggingRule->getId().'#set5';
+ $action = $this->generateUrl('config') . '?tagging-rule=' . $taggingRule->getId() . '#set5';
}
$newTaggingRule = $this->createForm(TaggingRuleType::class, $taggingRule, ['action' => $action]);
$newTaggingRule->handleRequest($request);
- if ($newTaggingRule->isValid()) {
+ if ($newTaggingRule->isSubmitted() && $newTaggingRule->isValid()) {
$taggingRule->setConfig($config);
$em->persist($taggingRule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_updated'
);
- return $this->redirect($this->generateUrl('config').'#set5');
+ return $this->redirect($this->generateUrl('config') . '#set5');
}
return $this->render('WallabagCoreBundle:Config:index.html.twig', [
'token' => $config->getRssToken(),
],
'twofactor_auth' => $this->getParameter('twofactor_auth'),
- 'wallabag_url' => $this->get('craue_config')->get('wallabag_url'),
- 'enabled_users' => $this->getDoctrine()
- ->getRepository('WallabagUserBundle:User')
- ->getSumEnabledUsers(),
+ 'wallabag_url' => $this->getParameter('domain_name'),
+ 'enabled_users' => $this->get('wallabag_user.user_repository')->getSumEnabledUsers(),
+ ]);
+ }
+
+ /**
+ * Enable 2FA using email.
+ *
+ * @Route("/config/otp/email", name="config_otp_email")
+ */
+ public function otpEmailAction()
+ {
+ if (!$this->getParameter('twofactor_auth')) {
+ return $this->createNotFoundException('two_factor not enabled');
+ }
+
+ $user = $this->getUser();
+
+ $user->setGoogleAuthenticatorSecret(null);
+ $user->setBackupCodes(null);
+ $user->setEmailTwoFactor(true);
+
+ $this->container->get('fos_user.user_manager')->updateUser($user, true);
+
+ $this->addFlash(
+ 'notice',
+ 'flashes.config.notice.otp_enabled'
+ );
+
+ return $this->redirect($this->generateUrl('config') . '#set3');
+ }
+
+ /**
+ * Enable 2FA using OTP app, user will need to confirm the generated code from the app.
+ *
+ * @Route("/config/otp/app", name="config_otp_app")
+ */
+ public function otpAppAction()
+ {
+ if (!$this->getParameter('twofactor_auth')) {
+ return $this->createNotFoundException('two_factor not enabled');
+ }
+
+ $user = $this->getUser();
+ $secret = $this->get('scheb_two_factor.security.google_authenticator')->generateSecret();
+
+ $user->setGoogleAuthenticatorSecret($secret);
+ $user->setEmailTwoFactor(false);
+
+ $backupCodes = (new BackupCodes())->toArray();
+ $backupCodesHashed = array_map(
+ function ($backupCode) {
+ return password_hash($backupCode, PASSWORD_DEFAULT);
+ },
+ $backupCodes
+ );
+
+ $user->setBackupCodes($backupCodesHashed);
+
+ $this->container->get('fos_user.user_manager')->updateUser($user, true);
+
+ return $this->render('WallabagCoreBundle:Config:otp_app.html.twig', [
+ 'backupCodes' => $backupCodes,
+ 'qr_code' => $this->get('scheb_two_factor.security.google_authenticator')->getQRContent($user),
]);
}
+ /**
+ * Cancelling 2FA using OTP app.
+ *
+ * @Route("/config/otp/app/cancel", name="config_otp_app_cancel")
+ */
+ public function otpAppCancelAction()
+ {
+ if (!$this->getParameter('twofactor_auth')) {
+ return $this->createNotFoundException('two_factor not enabled');
+ }
+
+ $user = $this->getUser();
+ $user->setGoogleAuthenticatorSecret(null);
+ $user->setBackupCodes(null);
+
+ $this->container->get('fos_user.user_manager')->updateUser($user, true);
+
+ return $this->redirect($this->generateUrl('config') . '#set3');
+ }
+
+ /**
+ * Validate OTP code.
+ *
+ * @param Request $request
+ *
+ * @Route("/config/otp/app/check", name="config_otp_app_check")
+ */
+ public function otpAppCheckAction(Request $request)
+ {
+ $isValid = $this->get('scheb_two_factor.security.google_authenticator')->checkCode(
+ $this->getUser(),
+ $request->get('_auth_code')
+ );
+
+ if (true === $isValid) {
+ $this->addFlash(
+ 'notice',
+ 'flashes.config.notice.otp_enabled'
+ );
+
+ return $this->redirect($this->generateUrl('config') . '#set3');
+ }
+
+ $this->addFlash(
+ 'two_factor',
+ 'scheb_two_factor.code_invalid'
+ );
+
+ return $this->redirect($this->generateUrl('config_otp_app'));
+ }
+
/**
* @param Request $request
*
return new JsonResponse(['token' => $config->getRssToken()]);
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.rss_token_updated'
);
- return $this->redirect($this->generateUrl('config').'#set2');
+ return $this->redirect($this->generateUrl('config') . '#set2');
}
/**
$em->remove($rule);
$em->flush();
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
'flashes.config.notice.tagging_rules_deleted'
);
- return $this->redirect($this->generateUrl('config').'#set5');
+ return $this->redirect($this->generateUrl('config') . '#set5');
}
/**
{
$this->validateRuleAction($rule);
- return $this->redirect($this->generateUrl('config').'?tagging-rule='.$rule->getId().'#set5');
+ return $this->redirect($this->generateUrl('config') . '?tagging-rule=' . $rule->getId() . '#set5');
}
/**
->getRepository('WallabagAnnotationBundle:Annotation')
->removeAllByUserId($this->getUser()->getId());
break;
-
case 'tags':
$this->removeAllTagsByUserId($this->getUser()->getId());
break;
-
case 'entries':
- // SQLite doesn't care about cascading remove, so we need to manually remove associated stuf
+ // SQLite doesn't care about cascading remove, so we need to manually remove associated stuff
// otherwise they won't be removed ...
- if ($this->get('doctrine')->getConnection()->getDriver() instanceof \Doctrine\DBAL\Driver\PDOSqlite\Driver) {
+ if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
$this->getDoctrine()->getRepository('WallabagAnnotationBundle:Annotation')->removeAllByUserId($this->getUser()->getId());
}
// manually remove tags to avoid orphan tag
$this->removeAllTagsByUserId($this->getUser()->getId());
- $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
- ->removeAllByUserId($this->getUser()->getId());
+ $this->get('wallabag_core.entry_repository')->removeAllByUserId($this->getUser()->getId());
+ break;
+ case 'archived':
+ if ($this->get('doctrine')->getConnection()->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\SqlitePlatform) {
+ $this->removeAnnotationsForArchivedByUserId($this->getUser()->getId());
+ }
+
+ // manually remove tags to avoid orphan tag
+ $this->removeTagsForArchivedByUserId($this->getUser()->getId());
+
+ $this->get('wallabag_core.entry_repository')->removeArchivedByUserId($this->getUser()->getId());
+ break;
}
- $this->get('session')->getFlashBag()->add(
+ $this->addFlash(
'notice',
- 'flashes.config.notice.'.$type.'_reset'
+ 'flashes.config.notice.' . $type . '_reset'
);
- return $this->redirect($this->generateUrl('config').'#set3');
+ return $this->redirect($this->generateUrl('config') . '#set3');
}
/**
- * Remove all tags for a given user and cleanup orphan tags.
+ * Delete account for current user.
*
- * @param int $userId
+ * @Route("/account/delete", name="delete_account")
+ *
+ * @param Request $request
+ *
+ * @throws AccessDeniedHttpException
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
*/
- private function removeAllTagsByUserId($userId)
+ public function deleteAccountAction(Request $request)
{
- $tags = $this->getDoctrine()->getRepository('WallabagCoreBundle:Tag')->findAllTags($userId);
+ $enabledUsers = $this->get('wallabag_user.user_repository')
+ ->getSumEnabledUsers();
+ if ($enabledUsers <= 1) {
+ throw new AccessDeniedHttpException();
+ }
+
+ $user = $this->getUser();
+
+ // logout current user
+ $this->get('security.token_storage')->setToken(null);
+ $request->getSession()->invalidate();
+
+ $em = $this->get('fos_user.user_manager');
+ $em->deleteUser($user);
+
+ return $this->redirect($this->generateUrl('fos_user_security_login'));
+ }
+
+ /**
+ * Switch view mode for current user.
+ *
+ * @Route("/config/view-mode", name="switch_view_mode")
+ *
+ * @param Request $request
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ */
+ public function changeViewModeAction(Request $request)
+ {
+ $user = $this->getUser();
+ $user->getConfig()->setListMode(!$user->getConfig()->getListMode());
+
+ $em = $this->getDoctrine()->getManager();
+ $em->persist($user);
+ $em->flush();
+
+ return $this->redirect($request->headers->get('referer'));
+ }
+
+ /**
+ * Change the locale for the current user.
+ *
+ * @param Request $request
+ * @param string $language
+ *
+ * @Route("/locale/{language}", name="changeLocale")
+ *
+ * @return \Symfony\Component\HttpFoundation\RedirectResponse
+ */
+ public function setLocaleAction(Request $request, $language = null)
+ {
+ $errors = $this->get('validator')->validate($language, (new LocaleConstraint()));
+
+ if (0 === \count($errors)) {
+ $request->getSession()->set('_locale', $language);
+ }
+
+ return $this->redirect($request->headers->get('referer', $this->generateUrl('homepage')));
+ }
+
+ /**
+ * Remove all tags for given tags and a given user and cleanup orphan tags.
+ *
+ * @param array $tags
+ * @param int $userId
+ */
+ private function removeAllTagsByStatusAndUserId($tags, $userId)
+ {
if (empty($tags)) {
return;
}
- $this->getDoctrine()
- ->getRepository('WallabagCoreBundle:Entry')
+ $this->get('wallabag_core.entry_repository')
->removeTags($userId, $tags);
// cleanup orphan tags
$em = $this->getDoctrine()->getManager();
foreach ($tags as $tag) {
- if (count($tag->getEntries()) === 0) {
+ if (0 === \count($tag->getEntries())) {
$em->remove($tag);
}
}
$em->flush();
}
+ /**
+ * Remove all tags for a given user and cleanup orphan tags.
+ *
+ * @param int $userId
+ */
+ private function removeAllTagsByUserId($userId)
+ {
+ $tags = $this->get('wallabag_core.tag_repository')->findAllTags($userId);
+ $this->removeAllTagsByStatusAndUserId($tags, $userId);
+ }
+
+ /**
+ * Remove all tags for a given user and cleanup orphan tags.
+ *
+ * @param int $userId
+ */
+ private function removeTagsForArchivedByUserId($userId)
+ {
+ $tags = $this->get('wallabag_core.tag_repository')->findForArchivedArticlesByUser($userId);
+ $this->removeAllTagsByStatusAndUserId($tags, $userId);
+ }
+
+ private function removeAnnotationsForArchivedByUserId($userId)
+ {
+ $em = $this->getDoctrine()->getManager();
+
+ $archivedEntriesAnnotations = $this->getDoctrine()
+ ->getRepository('WallabagAnnotationBundle:Annotation')
+ ->findAllArchivedEntriesByUser($userId);
+
+ foreach ($archivedEntriesAnnotations as $archivedEntriesAnnotation) {
+ $em->remove($archivedEntriesAnnotation);
+ }
+
+ $em->flush();
+ }
+
/**
* Validate that a rule can be edited/deleted by the current user.
*
*/
private function validateRuleAction(TaggingRule $rule)
{
- if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
+ if ($this->getUser()->getId() !== $rule->getConfig()->getUser()->getId()) {
throw $this->createAccessDeniedException('You can not access this tagging rule.');
}
}
return $config;
}
-
- /**
- * Delete account for current user.
- *
- * @Route("/account/delete", name="delete_account")
- *
- * @param Request $request
- *
- * @throws AccessDeniedHttpException
- *
- * @return \Symfony\Component\HttpFoundation\RedirectResponse
- */
- public function deleteAccountAction(Request $request)
- {
- $enabledUsers = $this->getDoctrine()
- ->getRepository('WallabagUserBundle:User')
- ->getSumEnabledUsers();
-
- if ($enabledUsers <= 1) {
- throw new AccessDeniedHttpException();
- }
-
- $user = $this->getUser();
-
- // logout current user
- $this->get('security.token_storage')->setToken(null);
- $request->getSession()->invalidate();
-
- $em = $this->get('fos_user.user_manager');
- $em->deleteUser($user);
-
- return $this->redirect($this->generateUrl('fos_user_security_login'));
- }
}