[Mailer] removed the auth mode DSN option and support in the eSMTP transport

Author: fabpot

CHANGELOG.md

@@ -4,6 +4,7 @@ CHANGELOG
 4.4.0
 -----
 
+ * [BC BREAK] removed the `auth_mode` DSN option (it is now always determined automatically)
  * STARTTLS cannot be enabled anymore (it is used automatically if TLS is disabled and the server supports STARTTLS)
  * [BC BREAK] Removed the `encryption` DSN option (use `smtps` instead)
  * Added support for the `smtps` protocol (does the same as using `smtp` and port `465`)

Tests/Transport/Smtp/EsmtpTransportFactoryTest.php

@@ -38,30 +38,30 @@ public function createProvider(): iterable
         $eventDispatcher = $this->getDispatcher();
         $logger = $this->getLogger();
 
-        $transport = new EsmtpTransport('localhost', 25, false, null, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('localhost', 25, false, $eventDispatcher, $logger);
 
         yield [
             new Dsn('smtp', 'localhost'),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 99, true, 'login', $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 99, true, $eventDispatcher, $logger);
         $transport->setUsername(self::USER);
         $transport->setPassword(self::PASSWORD);
 
         yield [
-            new Dsn('smtps', 'example.com', self::USER, self::PASSWORD, 99, ['auth_mode' => 'login']),
+            new Dsn('smtps', 'example.com', self::USER, self::PASSWORD, 99),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, null, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
 
         yield [
             new Dsn('smtps', 'example.com'),
             $transport,
         ];
 
-        $transport = new EsmtpTransport('example.com', 465, true, null, $eventDispatcher, $logger);
+        $transport = new EsmtpTransport('example.com', 465, true, $eventDispatcher, $logger);
 
         yield [
             new Dsn('smtp', 'example.com', '', '', 465),

Transport/Smtp/EsmtpTransport.php

@@ -29,12 +29,12 @@ class EsmtpTransport extends SmtpTransport
     private $authenticators = [];
     private $username = '';
     private $password = '';
-    private $authMode;
 
-    public function __construct(string $host = 'localhost', int $port = 0, bool $tls = null, string $authMode = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
+    public function __construct(string $host = 'localhost', int $port = 0, bool $tls = null, EventDispatcherInterface $dispatcher = null, LoggerInterface $logger = null)
     {
         parent::__construct(null, $dispatcher, $logger);
 
+        // order is important here (roughly most secure and popular first)
         $this->authenticators = [
             new Auth\CramMd5Authenticator(),
             new Auth\LoginAuthenticator(),
@@ -61,9 +61,6 @@ public function __construct(string $host = 'localhost', int $port = 0, bool $tls
 
         $stream->setHost($host);
         $stream->setPort($port);
-        if (null !== $authMode) {
-            $this->setAuthMode($authMode);
-        }
     }
 
     public function setUsername(string $username): self
@@ -90,18 +87,6 @@ public function getPassword(): string
         return $this->password;
     }
 
-    public function setAuthMode(string $mode): self
-    {
-        $this->authMode = $mode;
-
-        return $this;
-    }
-
-    public function getAuthMode(): string
-    {
-        return $this->authMode;
-    }
-
     public function addAuthenticator(AuthenticatorInterface $authenticator): void
     {
         $this->authenticators[] = $authenticator;
@@ -166,7 +151,7 @@ private function handleAuth(array $modes): void
         $authNames = [];
         $errors = [];
         $modes = array_map('strtolower', $modes);
-        foreach ($this->getActiveAuthenticators() as $authenticator) {
+        foreach ($this->authenticators as $authenticator) {
             if (!\in_array(strtolower($authenticator->getAuthKeyword()), $modes, true)) {
                 continue;
             }
@@ -195,22 +180,4 @@ private function handleAuth(array $modes): void
 
         throw new TransportException($message);
     }
-
-    /**
-     * @return AuthenticatorInterface[]
-     */
-    private function getActiveAuthenticators(): array
-    {
-        if (!$mode = strtolower($this->authMode)) {
-            return $this->authenticators;
-        }
-
-        foreach ($this->authenticators as $authenticator) {
-            if (strtolower($authenticator->getAuthKeyword()) === $mode) {
-                return [$authenticator];
-            }
-        }
-
-        throw new TransportException(sprintf('Auth mode "%s" is invalid.', $mode));
-    }
 }

Transport/Smtp/EsmtpTransportFactory.php

@@ -23,11 +23,10 @@ final class EsmtpTransportFactory extends AbstractTransportFactory
     public function create(Dsn $dsn): TransportInterface
     {
         $tls = 'smtps' === $dsn->getScheme() ? true : null;
-        $authMode = $dsn->getOption('auth_mode');
         $port = $dsn->getPort(0);
         $host = $dsn->getHost();
 
-        $transport = new EsmtpTransport($host, $port, $tls, $authMode, $this->dispatcher, $this->logger);
+        $transport = new EsmtpTransport($host, $port, $tls, $this->dispatcher, $this->logger);
 
         if ($user = $dsn->getUser()) {
             $transport->setUsername($user);