from_email:
address: "%from_email%"
sender_name: wallabag
+
fos_oauth_server:
db_driver: orm
client_class: Wallabag\ApiBundle\Entity\Client
refresh_token_class: Wallabag\ApiBundle\Entity\RefreshToken
auth_code_class: Wallabag\ApiBundle\Entity\AuthCode
service:
- user_provider: fos_user.user_manager
+ user_provider: fos_user.user_provider.username_email
options:
refresh_token_lifetime: 1209600
-
+
scheb_two_factor:
trusted_computer:
enabled: true
"liip/theme-bundle": "~1.1",
"lexik/form-filter-bundle": "~5.0",
"j0k3r/graby": "~1.0",
- "friendsofsymfony/user-bundle": "dev-master#e168ed64629d034cb9cbbffb9d4350f62ef04fab as 2.0.x-dev",
+ "friendsofsymfony/user-bundle": "2.0.x-dev",
"friendsofsymfony/oauth-server-bundle": "^1.5",
"stof/doctrine-extensions-bundle": "^1.2",
"scheb/two-factor-bundle": "~2.0",
{
return $this->createQueryBuilder('u')
->select('count(u)')
- ->andWhere('u.expired = false')
+ ->andWhere('u.enabled = true')
->getQuery()
->getSingleScalarResult();
}
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('empty');
- $user->setExpired(1);
+ $user->setEnabled(false);
$em->persist($user);
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('bob');
- $user->setExpired(1);
+ $user->setEnabled(false);
$em->persist($user);
$em->flush();
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('empty');
- $user->setExpired(0);
+ $user->setEnabled(true);
$em->persist($user);
$user = $em
->getRepository('WallabagUserBundle:User')
->findOneByUsername('bob');
- $user->setExpired(0);
+ $user->setEnabled(true);
$em->persist($user);
$em->flush();