bug #53594 [Notifier] Updated the NTFY notifier to run without a user parameter (lostfocus)

nicolas-grekas · nicolas-grekas · commit 30810dd3edab · 2024-01-29T14:22:35.000+01:00
This PR was squashed before being merged into the 6.4 branch. Discussion ---------- [Notifier] Updated the NTFY notifier to run without a user parameter | Q | A | ------------- | --- | Branch? | 6.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | License | MIT The ntfy integration of the notifier component was missing the option to run without set username. Commits ------- fa3be01 [Notifier] Updated the NTFY notifier to run without a user parameter
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransport.php
@@ -84,6 +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->password) {
+            $headers['Authorization'] = 'Bearer '.$this->password;
         }
 
         $response = $this->client->request('POST', ($this->secureHttp ? 'https' : 'http').'://'.$this->getEndpoint(), [
@@ -115,8 +117,8 @@ protected function doSend(MessageInterface $message): SentMessage
 
     public function supports(MessageInterface $message): bool
     {
-        return $message instanceof PushMessage &&
-            (null === $message->getOptions() || $message->getOptions() instanceof NtfyOptions);
+        return $message instanceof PushMessage
+            && (null === $message->getOptions() || $message->getOptions() instanceof NtfyOptions);
     }
 
     public function __toString(): string
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransportFactory.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/NtfyTransportFactory.php
@@ -41,8 +41,11 @@ public function create(Dsn $dsn): TransportInterface
             $transport->setPort($port);
         }
 
-        if (!empty($user = $dsn->getUser()) && !empty($password = $dsn->getPassword())) {
+        if (!empty($user = $dsn->getUser())) {
             $transport->setUser($user);
+        }
+
+        if (!empty($password = $dsn->getPassword())) {
             $transport->setPassword($password);
         }
 
diff --git a/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php b/src/Symfony/Component/Notifier/Bridge/Ntfy/Tests/NtfyTransportFactoryTest.php
@@ -31,6 +31,10 @@ public static function createProvider(): iterable
             'ntfy://ntfy.sh/test',
             'ntfy://user:password@default/test',
         ];
+        yield [
+            'ntfy://ntfy.sh/test',
+            'ntfy://:password@default/test',
+        ];
         yield [
             '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,6 +85,32 @@ public function testSend()
         $this->assertSame('2BYIwRmvBKcv', $sentMessage->getMessageId());
     }
 
+    public function testSendWithPassword()
+    {
+        $response = $this->createMock(ResponseInterface::class);
+        $response->expects($this->exactly(2))
+            ->method('getStatusCode')
+            ->willReturn(200);
+        $response->expects($this->once())
+            ->method('getContent')
+            ->willReturn(json_encode(['id' => '2BYIwRmvBKcv', 'event' => 'message']));
+
+        $client = new MockHttpClient(function (string $method, string $url, array $options = []) use ($response): ResponseInterface {
+            $expectedBody = json_encode(['topic' => 'test', 'title' => 'Hello', 'message' => 'World']);
+            $expectedAuthorization = 'Authorization: Bearer testtokentesttoken';
+            $this->assertJsonStringEqualsJsonString($expectedBody, $options['body']);
+            $this->assertTrue(\in_array($expectedAuthorization, $options['headers'], true));
+
+            return $response;
+        });
+
+        $transport = $this->createTransport($client)->setPassword('testtokentesttoken');
+
+        $sentMessage = $transport->send(new PushMessage('Hello', 'World'));
+
+        $this->assertSame('2BYIwRmvBKcv', $sentMessage->getMessageId());
+    }
+
     public function testSendWithUserAndPassword()
     {
         $response = $this->createMock(ResponseInterface::class);

Original file line number	Diff line number	Diff line change
`@@ -84,6 +84,8 @@ protected function doSend(MessageInterface $message): SentMessage`
`84`	`84`
`85`	`85`	`if (null !== $this->user && null !== $this->password) {`
`86`	`86`	`$headers['Authorization'] = 'Basic '.rtrim(base64_encode($this->user.':'.$this->password), '=');`
	`87`	`+ } elseif (null !== $this->password) {`
	`88`	`+ $headers['Authorization'] = 'Bearer '.$this->password;`
`87`	`89`	`}`
`88`	`90`
`89`	`91`	`$response = $this->client->request('POST', ($this->secureHttp ? 'https' : 'http').'://'.$this->getEndpoint(), [`
`@@ -115,8 +117,8 @@ protected function doSend(MessageInterface $message): SentMessage`
`115`	`117`
`116`	`118`	`public function supports(MessageInterface $message): bool`
`117`	`119`	`{`
`118`		`- return $message instanceof PushMessage &&`
`119`		`- (null === $message->getOptions() \|\| $message->getOptions() instanceof NtfyOptions);`
	`120`	`+ return $message instanceof PushMessage`
	`121`	`+ && (null === $message->getOptions() \|\| $message->getOptions() instanceof NtfyOptions);`
`120`	`122`	`}`
`121`	`123`
`122`	`124`	`public function __toString(): string`
Original file line number	Diff line number	Diff line change
`@@ -41,8 +41,11 @@ public function create(Dsn $dsn): TransportInterface`
`41`	`41`	`$transport->setPort($port);`
`42`	`42`	`}`
`43`	`43`
`44`		`- if (!empty($user = $dsn->getUser()) && !empty($password = $dsn->getPassword())) {`
	`44`	`+ if (!empty($user = $dsn->getUser())) {`
`45`	`45`	`$transport->setUser($user);`
	`46`	`+ }`
	`47`	`+`
	`48`	`+ if (!empty($password = $dsn->getPassword())) {`
`46`	`49`	`$transport->setPassword($password);`
`47`	`50`	`}`
`48`	`51`