Switch to OCP background jobs

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
This commit is contained in:
Roeland Jago Douma 2019-01-14 15:51:26 +01:00
parent 49a4f2fd61
commit da7dd24378
No known key found for this signature in database
GPG key ID: F941078878347C0C
3 changed files with 8 additions and 6 deletions

View file

@ -25,9 +25,10 @@ declare(strict_types=1);
namespace OCA\TwoFactorBackupCodes\BackgroundJob;
use OC\Authentication\TwoFactorAuth\Manager;
use OC\BackgroundJob\QueuedJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\QueuedJob;
use OCP\IUser;
use OCP\IUserManager;
@ -45,7 +46,8 @@ class CheckBackupCodes extends QueuedJob {
/** @var Manager */
private $twofactorManager;
public function __construct(IUserManager $userManager, IJobList $jobList, Manager $twofactorManager, IRegistry $registry) {
public function __construct(ITimeFactory $timeFactory, IUserManager $userManager, IJobList $jobList, Manager $twofactorManager, IRegistry $registry) {
parent::__construct($timeFactory);
$this->userManager = $userManager;
$this->jobList = $jobList;
$this->twofactorManager = $twofactorManager;

View file

@ -24,10 +24,10 @@ declare(strict_types=1);
namespace OCA\TwoFactorBackupCodes\BackgroundJob;
use OC\BackgroundJob\TimedJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\BackgroundJob\IJobList;
use OCP\BackgroundJob\TimedJob;
use OCP\IUserManager;
use OCP\Notification\IManager;
@ -39,9 +39,6 @@ class RememberBackupCodesJob extends TimedJob {
/** @var IUserManager */
private $userManager;
/** @var ITimeFactory */
private $time;
/** @var IManager */
private $notificationManager;
@ -53,6 +50,7 @@ class RememberBackupCodesJob extends TimedJob {
ITimeFactory $timeFactory,
IManager $notificationManager,
IJobList $jobList) {
parent::__construct($timeFactory);
$this->registry = $registry;
$this->userManager = $userManager;
$this->time = $timeFactory;

View file

@ -27,6 +27,7 @@ namespace OCA\TwoFactorBackupCodes\Tests\Unit\BackgroundJob;
use OC\Authentication\TwoFactorAuth\Manager;
use OCA\TwoFactorBackupCodes\BackgroundJob\CheckBackupCodes;
use OCA\TwoFactorBackupCodes\BackgroundJob\RememberBackupCodesJob;
use OCP\AppFramework\Utility\ITimeFactory;
use OCP\Authentication\TwoFactorAuth\IRegistry;
use OCP\BackgroundJob\IJobList;
use OCP\IUser;
@ -70,6 +71,7 @@ class CheckBackupCodeTest extends TestCase {
}));
$this->checkBackupCodes = new CheckBackupCodes(
$this->createMock(ITimeFactory::class),
$this->userManager,
$this->jobList,
$this->manager,