Merge pull request #7656 from nextcloud/backport/7652/stable1.14

[stable1.14] Fix XOAUTH2 auth via SMTP
nextcloud · Dec 21, 2022 · 3593287 · 3593287
2 parents 317aa37 + f794fa4
commit 3593287
Showing 1 changed file with 9 additions and 3 deletions.
diff --git a/lib/SMTP/SmtpClientFactory.php b/lib/SMTP/SmtpClientFactory.php
@@ -29,6 +29,7 @@
 use Horde_Mail_Transport;
 use Horde_Mail_Transport_Mail;
 use Horde_Mail_Transport_Smtphorde;
+use Horde_Smtp_Password_Xoauth2;
 use OCA\Mail\Account;
 use OCA\Mail\Support\HostNameFactory;
 use OCP\IConfig;
@@ -65,13 +66,12 @@ public function create(Account $account): Horde_Mail_Transport {
 			return new Horde_Mail_Transport_Mail();
 		}
 
-		$password = $mailAccount->getOutboundPassword();
-		$password = $this->crypto->decrypt($password);
+		$decryptedPassword = $this->crypto->decrypt($mailAccount->getOutboundPassword());
 		$security = $mailAccount->getOutboundSslMode();
 		$params = [
 			'localhost' => $this->hostNameFactory->getHostName(),
 			'host' => $mailAccount->getOutboundHost(),
-			'password' => $password,
+			'password' => $decryptedPassword,
 			'port' => $mailAccount->getOutboundPort(),
 			'username' => $mailAccount->getOutboundUser(),
 			'secure' => $security === 'none' ? false : $security,
@@ -83,6 +83,12 @@ public function create(Account $account): Horde_Mail_Transport {
 				],
 			],
 		];
+		if ($account->getMailAccount()->getAuthMethod() === 'xoauth2') {
+			$params['xoauth2_token'] = new Horde_Smtp_Password_Xoauth2(
+				$account->getEmail(),
+				$decryptedPassword,
+			);
+		}
 		if ($this->config->getSystemValue('debug', false)) {
 			$params['debug'] = $this->config->getSystemValue('datadirectory') . '/horde_smtp.log';
 		}