Merge pull request #374 from nextcloud/implement-IDeactivatableByAdmin

Implement IDeactivatableByAdmin interface
nextcloud · Jan 21, 2025 · 6e5ba6f · 6e5ba6f
2 parents 4dfcc85 + c2a9ea7
commit 6e5ba6f
Show file tree

Hide file tree

Showing 4 changed files with 42 additions and 21 deletions.
diff --git a/lib/Provider/AdminProvider.php b/lib/Provider/AdminProvider.php
@@ -10,35 +10,20 @@
 namespace OCA\TwoFactorAdmin\Provider;
 
 use OCA\TwoFactorAdmin\Service\CodeStorage;
+use OCP\Authentication\TwoFactorAuth\IDeactivatableByAdmin;
 use OCP\Authentication\TwoFactorAuth\IProvider;
 use OCP\Authentication\TwoFactorAuth\IProvidesIcons;
 use OCP\IL10N;
 use OCP\IURLGenerator;
 use OCP\IUser;
 use OCP\Template;
 
-class AdminProvider implements IProvider, IProvidesIcons {
+class AdminProvider implements IProvider, IProvidesIcons, IDeactivatableByAdmin {
 
-	/** @var string */
-	private $appName;
-
-	/** @var IL10N */
-	private $l10n;
-
-	/** @var IURLGenerator */
-	private $urlGenerator;
-
-	/** @var CodeStorage */
-	private $codeStorage;
-
-	public function __construct(string $appName,
-		IL10N $l10n,
-		IURLGenerator $urlGenerator,
-		CodeStorage $codeStorage) {
-		$this->appName = $appName;
-		$this->l10n = $l10n;
-		$this->urlGenerator = $urlGenerator;
-		$this->codeStorage = $codeStorage;
+	public function __construct(private string $appName,
+		private IL10N $l10n,
+		private IURLGenerator $urlGenerator,
+		private CodeStorage $codeStorage) {
 	}
 
 	/**
@@ -102,6 +87,15 @@ public function isTwoFactorAuthEnabledForUser(IUser $user): bool {
 		return $this->codeStorage->hasCode($user);
 	}
 
+	/**
+	 * Disable this provider for the given user.
+	 *
+	 * @param IUser $user the user to deactivate this provider for
+	 */
+	public function disableFor(IUser $user): void {
+		$this->codeStorage->removeCodesForUser($user);
+	}
+
 	public function getLightIcon(): String {
 		return $this->urlGenerator->imagePath('core', 'actions/more-white.svg');
 	}

diff --git a/lib/Service/CodeStorage.php b/lib/Service/CodeStorage.php
@@ -87,4 +87,9 @@ public function validateCode(IUser $user, string $code): bool {
 		}
 	}
 
+	public function removeCodesForUser(IUser $user): void {
+		$this->codeMapper->deleteAll($user);
+		$this->eventDispatcher->dispatch(StateChanged::class, new StateChanged($user, false));
+	}
+
 }
diff --git a/tests/Unit/Provider/AdminProviderTest.php b/tests/Unit/Provider/AdminProviderTest.php
@@ -115,6 +115,15 @@ public function testIsTwoFactorAuthEnabled() {
 		$this->assertTrue($enabled);
 	}
 
+	public function testDisableForUser() {
+		$user = $this->createMock(IUser::class);
+		$this->codeStorage->expects($this->once())
+			->method('removeCodesForUser')
+			->with($user);
+
+		$this->provider->disableFor($user);
+	}
+
 	public function testGetDarkIcon() {
 		$this->urlGenerator->expects($this->once())
 			->method('imagePath')

diff --git a/tests/Unit/Service/CodeStorageTest.php b/tests/Unit/Service/CodeStorageTest.php
@@ -12,6 +12,7 @@
 use ChristophWurst\Nextcloud\Testing\TestCase;
 use OCA\TwoFactorAdmin\Db\Code;
 use OCA\TwoFactorAdmin\Db\CodeMapper;
+use OCA\TwoFactorAdmin\Event\StateChanged;
 use OCA\TwoFactorAdmin\Service\CodeStorage;
 use OCP\AppFramework\Db\DoesNotExistException;
 use OCP\AppFramework\Db\MultipleObjectsReturnedException;
@@ -153,4 +154,16 @@ public function testValidateValidCode() {
 		$this->assertTrue($valid);
 	}
 
+	public function testRemoveCodesForUser() {
+		$user = $this->createMock(IUser::class);
+		$this->codeMapper->expects($this->once())
+			->method("deleteAll")
+			->with($user);
+		$this->eventDispatcher->expects($this->once())
+			->method('dispatch')
+			->with(StateChanged::class, new StateChanged($user, false));
+
+		$this->codeStorage->removeCodesForUser($user);
+	}
+
 }