Removed the token parameter and fixed the TransportFactory to work without user parameter

lostfocus · lostfocus · commit 0e8052d42143 · 2024-01-21T11:51:16.000+01:00
per the discussion on the PR symfony#53594
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php
@@ -30,7 +30,6 @@ final class NtfyTransport extends AbstractTransport
     protected const HOST = 'ntfy.sh';
     private ?string $user = null;
     private ?string $password = null;
-    private ?string $token = null;
 
     public function __construct(private string $topic, private bool $secureHttp = true, HttpClientInterface $client = null, EventDispatcherInterface $dispatcher = null)
     {
@@ -42,13 +41,6 @@ public function getTopic(): string
         return $this->topic;
     }
 
-    public function setToken(?string $token): self
-    {
-        $this->token = $token;
-
-        return $this;
-    }
-
     public function setPassword(?string $password): self
     {
         $this->password = $password;
@@ -92,8 +84,8 @@ protected function doSend(MessageInterface $message): SentMessage
 
         if (null !== $this->user && null !== $this->password) {
             $headers['Authorization'] = 'Basic '.rtrim(base64_encode($this->user.':'.$this->password), '=');
-        } elseif (null !== $this->token) {
-            $headers['Authorization'] = 'Bearer '.$this->token;
+        } elseif (null !== $this->password) {
+            $headers['Authorization'] = 'Bearer '. $this->password;
         }
 
         $response = $this->client->request('POST', ($this->secureHttp ? 'https' : 'http').'://'.$this->getEndpoint(), [
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransportFactory.php
@@ -41,12 +41,11 @@ public function create(Dsn $dsn): TransportInterface
             $transport->setPort($port);
         }
 
-        if (!empty($token = $dsn->getOption('token'))) {
-            $transport->setToken($token);
+        if (!empty($user = $dsn->getUser())) {
+            $transport->setUser($user);
         }
 
-        if (!empty($user = $dsn->getUser()) && !empty($password = $dsn->getPassword())) {
-            $transport->setUser($user);
+        if (!empty($password = $dsn->getPassword())) {
             $transport->setPassword($password);
         }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/README.md b/src/Symfony/Component/Notifier/Bridge/Ntfy/README.md
@@ -7,15 +7,14 @@ DSN example
 -----------
 
 ```
-NTFY_DSN=ntfy://[USER:PASSWORD]@default[:PORT]/TOPIC?[secureHttp=[on]]&[token=[:TOKEN]]
+NTFY_DSN=ntfy://[USER:PASSWORD]@default[:PORT]/TOPIC?[secureHttp=[on]]
 ```
 where:
 - `URL` is the ntfy server which you are using
     - if `default` is provided, this will default to the public ntfy server hosted on [ntfy.sh](https://ntfy.sh/).
 - `TOPIC` is the topic on this ntfy server.
 - `PORT` is an optional specific port.
 - `USER`and `PASSWORD` are username and password in case of access control supported by the server
-- `TOKEN` is the access token in case of access control supported by the server
 
 In case of a non-secure server, you can disable https by setting `secureHttp=off`. For example if you use a local [Ntfy Docker image](https://hub.docker.com/r/binwiederhier/ntfy) during development or testing.
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php
@@ -32,12 +32,12 @@ public static function createProvider(): iterable
             'ntfy://user:password@default/test',
         ];
         yield [
-            'ntfy://ntfy.sh:8888/test',
-            'ntfy://user:password@default:8888/test?secureHttp=off',
+            'ntfy://ntfy.sh/test',
+            'ntfy://:password@default/test',
         ];
         yield [
-            'ntfy://ntfy.sh/test',
-            'ntfy://default/test?secureHttp=off&token=testToken',
+            'ntfy://ntfy.sh:8888/test',
+            'ntfy://user:password@default:8888/test?secureHttp=off',
         ];
     }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportTest.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportTest.php
@@ -85,7 +85,7 @@ public function testSend()
         $this->assertSame('2BYIwRmvBKcv', $sentMessage->getMessageId());
     }
 
-    public function testSendWithToken()
+    public function testSendWithPassword()
     {
         $response = $this->createMock(ResponseInterface::class);
         $response->expects($this->exactly(2))
@@ -104,7 +104,7 @@ public function testSendWithToken()
             return $response;
         });
 
-        $transport = $this->createTransport($client)->setToken('testtokentesttoken');
+        $transport = $this->createTransport($client)->setPassword('testtokentesttoken');
 
         $sentMessage = $transport->send(new PushMessage('Hello', 'World'));
 

Original file line number	Diff line number	Diff line change
`@@ -41,12 +41,11 @@ public function create(Dsn $dsn): TransportInterface`
`41`	`41`	`$transport->setPort($port);`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!empty($token = $dsn->getOption('token'))) {`
`45`		`- $transport->setToken($token);`
	`44`	`+ if (!empty($user = $dsn->getUser())) {`
	`45`	`+ $transport->setUser($user);`
`46`	`46`	`}`
`47`	`47`
`48`		`- if (!empty($user = $dsn->getUser()) && !empty($password = $dsn->getPassword())) {`
`49`		`- $transport->setUser($user);`
	`48`	`+ if (!empty($password = $dsn->getPassword())) {`
`50`	`49`	`$transport->setPassword($password);`
`51`	`50`	`}`
`52`	`51`
Original file line number	Diff line number	Diff line change
`@@ -85,7 +85,7 @@ public function testSend()`
`85`	`85`	`$this->assertSame('2BYIwRmvBKcv', $sentMessage->getMessageId());`
`86`	`86`	`}`
`87`	`87`
`88`		`- public function testSendWithToken()`
	`88`	`+ public function testSendWithPassword()`
`89`	`89`	`{`
`90`	`90`	`$response = $this->createMock(ResponseInterface::class);`
`91`	`91`	`$response->expects($this->exactly(2))`
`@@ -104,7 +104,7 @@ public function testSendWithToken()`
`104`	`104`	`return $response;`
`105`	`105`	`});`
`106`	`106`
`107`		`- $transport = $this->createTransport($client)->setToken('testtokentesttoken');`
	`107`	`+ $transport = $this->createTransport($client)->setPassword('testtokentesttoken');`
`108`	`108`
`109`	`109`	`$sentMessage = $transport->send(new PushMessage('Hello', 'World'));`
`110`	`110`