fixup! Allow SSO users to send and recieve mail via master password

Signed-off-by: Christoph Wurst <[email protected]>
nextcloud · Oct 27, 2023 · 87a893f · 87a893f
1 parent abf92a6
commit 87a893f
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 5 deletions.
diff --git a/lib/Db/ProvisioningMapper.php b/lib/Db/ProvisioningMapper.php
@@ -125,7 +125,7 @@ public function validate(array $data): Provisioning {
 		$provisioning->setSmtpPort((int)$data['smtpPort']);
 		$provisioning->setSmtpSslMode($data['smtpSslMode']);
 
-		$provisioning->setMasterPasswordEnabled((bool)$data['masterPasswordEnabled']);
+		$provisioning->setMasterPasswordEnabled((bool)($data['masterPasswordEnabled'] ?? false));
 		$provisioning->setMasterPassword($data['masterPassword'] ?? '');
 
 		$provisioning->setSieveEnabled((bool)$data['sieveEnabled']);

diff --git a/tests/Unit/Service/Provisioning/ManagerTest.php b/tests/Unit/Service/Provisioning/ManagerTest.php
@@ -204,7 +204,7 @@ public function testDeprovision() {
 		$this->manager->deprovision($config);
 	}
 
-	public function testUpdatePasswordNotProvisioned() {
+	public function testUpdatePasswordNotProvisioned(): void {
 		/** @var IUser|MockObject $user */
 		$user = $this->createMock(IUser::class);
 		$this->mock->getParameter('mailAccountMapper')
@@ -213,23 +213,51 @@ public function testUpdatePasswordNotProvisioned() {
 			->with($user)
 			->willThrowException($this->createMock(DoesNotExistException::class));
 
-		$this->manager->updatePassword($user, '123456');
+		$this->manager->updatePassword($user, '123456', []);
 	}
 
-	public function testUpdatePassword() {
+	public function testUpdateLoginPassword(): void {
 		/** @var IUser|MockObject $user */
 		$user = $this->createMock(IUser::class);
 		$account = $this->createMock(MailAccount::class);
 		$this->mock->getParameter('mailAccountMapper')
 			->expects($this->once())
 			->method('findProvisionedAccount')
 			->willReturn($account);
+		$config = new Provisioning();
+		$config->setProvisioningDomain(Provisioning::WILDCARD);
+		$config->setMasterPasswordEnabled(false);
+		$this->mock->getParameter('mailAccountMapper')
+			->expects($this->once())
+			->method('update')
+			->with($account);
+
+		$this->manager->updatePassword($user, '123456', [$config]);
+	}
+
+	public function testUpdateMasterPassword(): void {
+		/** @var IUser|MockObject $user */
+		$user = $this->createMock(IUser::class);
+		$account = $this->createMock(MailAccount::class);
+		$this->mock->getParameter('mailAccountMapper')
+			->expects($this->once())
+			->method('findProvisionedAccount')
+			->willReturn($account);
+		$config = new Provisioning();
+		$config->setProvisioningDomain(Provisioning::WILDCARD);
+		$config->setMasterPasswordEnabled(true);
+		$config->setMasterPassword('topsecret');
+		$this->mock->getParameter('crypto')
+			->expects(self::atLeast(1))
+			->method('encrypt')
+			->with('topsecret')
+			->willReturn('tercespot');
 		$this->mock->getParameter('mailAccountMapper')
 			->expects($this->once())
 			->method('update')
 			->with($account);
 
-		$this->manager->updatePassword($user, '123456');
+		$this->manager->updatePassword($user, '123456', [$config]);
 	}
 
 	public function testNewProvisioning(): void {