@@ -29,42 +29,42 @@ |
||
29 | 29 | |
30 | 30 | class BackupCodeMapper extends QBMapper { |
31 | 31 | |
32 | - public function __construct(IDBConnection $db) { |
|
33 | - parent::__construct($db, 'twofactor_backupcodes'); |
|
34 | - } |
|
32 | + public function __construct(IDBConnection $db) { |
|
33 | + parent::__construct($db, 'twofactor_backupcodes'); |
|
34 | + } |
|
35 | 35 | |
36 | - /** |
|
37 | - * @param IUser $user |
|
38 | - * @return BackupCode[] |
|
39 | - */ |
|
40 | - public function getBackupCodes(IUser $user) { |
|
41 | - /* @var IQueryBuilder $qb */ |
|
42 | - $qb = $this->db->getQueryBuilder(); |
|
36 | + /** |
|
37 | + * @param IUser $user |
|
38 | + * @return BackupCode[] |
|
39 | + */ |
|
40 | + public function getBackupCodes(IUser $user) { |
|
41 | + /* @var IQueryBuilder $qb */ |
|
42 | + $qb = $this->db->getQueryBuilder(); |
|
43 | 43 | |
44 | - $qb->select('id', 'user_id', 'code', 'used') |
|
45 | - ->from('twofactor_backupcodes') |
|
46 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID()))); |
|
44 | + $qb->select('id', 'user_id', 'code', 'used') |
|
45 | + ->from('twofactor_backupcodes') |
|
46 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($user->getUID()))); |
|
47 | 47 | |
48 | - return self::findEntities($qb); |
|
49 | - } |
|
48 | + return self::findEntities($qb); |
|
49 | + } |
|
50 | 50 | |
51 | - /** |
|
52 | - * @param IUser $user |
|
53 | - */ |
|
54 | - public function deleteCodes(IUser $user) { |
|
55 | - $this->deleteCodesByUserId($user->getUID()); |
|
56 | - } |
|
51 | + /** |
|
52 | + * @param IUser $user |
|
53 | + */ |
|
54 | + public function deleteCodes(IUser $user) { |
|
55 | + $this->deleteCodesByUserId($user->getUID()); |
|
56 | + } |
|
57 | 57 | |
58 | - /** |
|
59 | - * @param string $uid |
|
60 | - */ |
|
61 | - public function deleteCodesByUserId($uid) { |
|
62 | - /* @var IQueryBuilder $qb */ |
|
63 | - $qb = $this->db->getQueryBuilder(); |
|
58 | + /** |
|
59 | + * @param string $uid |
|
60 | + */ |
|
61 | + public function deleteCodesByUserId($uid) { |
|
62 | + /* @var IQueryBuilder $qb */ |
|
63 | + $qb = $this->db->getQueryBuilder(); |
|
64 | 64 | |
65 | - $qb->delete('twofactor_backupcodes') |
|
66 | - ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid))); |
|
67 | - $qb->execute(); |
|
68 | - } |
|
65 | + $qb->delete('twofactor_backupcodes') |
|
66 | + ->where($qb->expr()->eq('user_id', $qb->createNamedParameter($uid))); |
|
67 | + $qb->execute(); |
|
68 | + } |
|
69 | 69 | |
70 | 70 | } |
@@ -33,58 +33,58 @@ |
||
33 | 33 | |
34 | 34 | class RememberBackupCodesJob extends TimedJob { |
35 | 35 | |
36 | - /** @var IRegistry */ |
|
37 | - private $registry; |
|
36 | + /** @var IRegistry */ |
|
37 | + private $registry; |
|
38 | 38 | |
39 | - /** @var IUserManager */ |
|
40 | - private $userManager; |
|
39 | + /** @var IUserManager */ |
|
40 | + private $userManager; |
|
41 | 41 | |
42 | - /** @var IManager */ |
|
43 | - private $notificationManager; |
|
42 | + /** @var IManager */ |
|
43 | + private $notificationManager; |
|
44 | 44 | |
45 | - /** @var IJobList */ |
|
46 | - private $jobList; |
|
45 | + /** @var IJobList */ |
|
46 | + private $jobList; |
|
47 | 47 | |
48 | - public function __construct(IRegistry $registry, |
|
49 | - IUserManager $userManager, |
|
50 | - ITimeFactory $timeFactory, |
|
51 | - IManager $notificationManager, |
|
52 | - IJobList $jobList) { |
|
53 | - parent::__construct($timeFactory); |
|
54 | - $this->registry = $registry; |
|
55 | - $this->userManager = $userManager; |
|
56 | - $this->time = $timeFactory; |
|
57 | - $this->notificationManager = $notificationManager; |
|
58 | - $this->jobList = $jobList; |
|
48 | + public function __construct(IRegistry $registry, |
|
49 | + IUserManager $userManager, |
|
50 | + ITimeFactory $timeFactory, |
|
51 | + IManager $notificationManager, |
|
52 | + IJobList $jobList) { |
|
53 | + parent::__construct($timeFactory); |
|
54 | + $this->registry = $registry; |
|
55 | + $this->userManager = $userManager; |
|
56 | + $this->time = $timeFactory; |
|
57 | + $this->notificationManager = $notificationManager; |
|
58 | + $this->jobList = $jobList; |
|
59 | 59 | |
60 | - $this->setInterval(60*60*24*14); |
|
61 | - } |
|
60 | + $this->setInterval(60*60*24*14); |
|
61 | + } |
|
62 | 62 | |
63 | - protected function run($argument) { |
|
64 | - $uid = $argument['uid']; |
|
65 | - $user = $this->userManager->get($uid); |
|
63 | + protected function run($argument) { |
|
64 | + $uid = $argument['uid']; |
|
65 | + $user = $this->userManager->get($uid); |
|
66 | 66 | |
67 | - if ($user === null) { |
|
68 | - // We can't run with an invalid user |
|
69 | - return; |
|
70 | - } |
|
67 | + if ($user === null) { |
|
68 | + // We can't run with an invalid user |
|
69 | + return; |
|
70 | + } |
|
71 | 71 | |
72 | - $providers = $this->registry->getProviderStates($user); |
|
73 | - if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) { |
|
74 | - // Backup codes already generated lets remove this job |
|
75 | - $this->jobList->remove(self::class, $argument); |
|
76 | - return; |
|
77 | - } |
|
72 | + $providers = $this->registry->getProviderStates($user); |
|
73 | + if (isset($providers['backup_codes']) && $providers['backup_codes'] === true) { |
|
74 | + // Backup codes already generated lets remove this job |
|
75 | + $this->jobList->remove(self::class, $argument); |
|
76 | + return; |
|
77 | + } |
|
78 | 78 | |
79 | - $date = new \DateTime(); |
|
80 | - $date->setTimestamp($this->time->getTime()); |
|
79 | + $date = new \DateTime(); |
|
80 | + $date->setTimestamp($this->time->getTime()); |
|
81 | 81 | |
82 | - $notification = $this->notificationManager->createNotification(); |
|
83 | - $notification->setApp('twofactor_backupcodes') |
|
84 | - ->setUser($user->getUID()) |
|
85 | - ->setDateTime($date) |
|
86 | - ->setObject('create', 'codes') |
|
87 | - ->setSubject('create_backupcodes'); |
|
88 | - $this->notificationManager->notify($notification); |
|
89 | - } |
|
82 | + $notification = $this->notificationManager->createNotification(); |
|
83 | + $notification->setApp('twofactor_backupcodes') |
|
84 | + ->setUser($user->getUID()) |
|
85 | + ->setDateTime($date) |
|
86 | + ->setObject('create', 'codes') |
|
87 | + ->setSubject('create_backupcodes'); |
|
88 | + $this->notificationManager->notify($notification); |
|
89 | + } |
|
90 | 90 | } |
@@ -34,35 +34,35 @@ |
||
34 | 34 | |
35 | 35 | class CheckBackupCodes extends QueuedJob { |
36 | 36 | |
37 | - /** @var IUserManager */ |
|
38 | - private $userManager; |
|
37 | + /** @var IUserManager */ |
|
38 | + private $userManager; |
|
39 | 39 | |
40 | - /** @var IJobList */ |
|
41 | - private $jobList; |
|
40 | + /** @var IJobList */ |
|
41 | + private $jobList; |
|
42 | 42 | |
43 | - /** @var Manager */ |
|
44 | - private $registry; |
|
43 | + /** @var Manager */ |
|
44 | + private $registry; |
|
45 | 45 | |
46 | - /** @var Manager */ |
|
47 | - private $twofactorManager; |
|
46 | + /** @var Manager */ |
|
47 | + private $twofactorManager; |
|
48 | 48 | |
49 | - public function __construct(ITimeFactory $timeFactory, IUserManager $userManager, IJobList $jobList, Manager $twofactorManager, IRegistry $registry) { |
|
50 | - parent::__construct($timeFactory); |
|
51 | - $this->userManager = $userManager; |
|
52 | - $this->jobList = $jobList; |
|
53 | - $this->twofactorManager = $twofactorManager; |
|
54 | - $this->registry = $registry; |
|
55 | - } |
|
49 | + public function __construct(ITimeFactory $timeFactory, IUserManager $userManager, IJobList $jobList, Manager $twofactorManager, IRegistry $registry) { |
|
50 | + parent::__construct($timeFactory); |
|
51 | + $this->userManager = $userManager; |
|
52 | + $this->jobList = $jobList; |
|
53 | + $this->twofactorManager = $twofactorManager; |
|
54 | + $this->registry = $registry; |
|
55 | + } |
|
56 | 56 | |
57 | - protected function run($argument) { |
|
58 | - $this->userManager->callForSeenUsers(function(IUser $user) { |
|
59 | - $providers = $this->registry->getProviderStates($user); |
|
60 | - $isTwoFactorAuthenticated = $this->twofactorManager->isTwoFactorAuthenticated($user); |
|
57 | + protected function run($argument) { |
|
58 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
59 | + $providers = $this->registry->getProviderStates($user); |
|
60 | + $isTwoFactorAuthenticated = $this->twofactorManager->isTwoFactorAuthenticated($user); |
|
61 | 61 | |
62 | - if ($isTwoFactorAuthenticated && isset($providers['backup_codes']) && $providers['backup_codes'] === false) { |
|
63 | - $this->jobList->add(RememberBackupCodesJob::class, ['uid' => $user->getUID()]); |
|
64 | - } |
|
65 | - }); |
|
66 | - } |
|
62 | + if ($isTwoFactorAuthenticated && isset($providers['backup_codes']) && $providers['backup_codes'] === false) { |
|
63 | + $this->jobList->add(RememberBackupCodesJob::class, ['uid' => $user->getUID()]); |
|
64 | + } |
|
65 | + }); |
|
66 | + } |
|
67 | 67 | |
68 | 68 | } |