Skip to content

[Notifier] fix Microsoft Teams webhook url #45290

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Feb 2, 2022
Merged

[Notifier] fix Microsoft Teams webhook url #45290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/MicrosoftTeamsOptions.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,8 +81,8 @@ public function getRecipientId(): ?string
*/
public function recipient(string $path): self
{
if (!preg_match('/^\/webhook\//', $path)) {
throw new InvalidArgumentException(sprintf('"%s" require recipient id format to be "/webhook/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}", "%s" given.', __CLASS__, $path));
if (!preg_match('/^\/webhookb2\//', $path)) {
throw new InvalidArgumentException(sprintf('"%s" require recipient id format to be "/webhookb2/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}", "%s" given.', __CLASS__, $path));
}

$this->options['recipient_id'] = $path;
Expand Down
2 changes: 1 addition & 1 deletion src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ MICROSOFT_TEAMS_DSN=microsoftteams://default/PATH
```

where:
- `PATH` has the following format: `webhook/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}`
- `PATH` has the following format: `webhookb2/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}`

Resources
---------
Expand Down
6 changes: 3 additions & 3 deletions src/Symfony/Component/Notifier/Bridge/MicrosoftTeams/Tests/MicrosoftTeamsOptionsTest.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ public function testFromNotification()
public function testGetRecipientIdReturnsRecipientWhenSetViaConstructor()
{
$options = new MicrosoftTeamsOptions([
'recipient_id' => $recipient = '/webhook/foo',
'recipient_id' => $recipient = '/webhookb2/foo',
]);

$this->assertSame($recipient, $options->getRecipientId());
Expand All @@ -39,7 +39,7 @@ public function testGetRecipientIdReturnsRecipientWhenSetViaConstructor()
public function testGetRecipientIdReturnsRecipientWhenSetSetter()
{
$options = (new MicrosoftTeamsOptions())
->recipient($recipient = '/webhook/foo');
->recipient($recipient = '/webhookb2/foo');

$this->assertSame($recipient, $options->getRecipientId());
}
Expand All @@ -58,7 +58,7 @@ public function testRecipientMethodThrowsIfValueDoesNotMatchRegex()
$recipient = 'foo';

$this->expectException(InvalidArgumentException::class);
$this->expectExceptionMessage(sprintf('"%s" require recipient id format to be "/webhook/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}", "%s" given.', MicrosoftTeamsOptions::class, $recipient));
$this->expectExceptionMessage(sprintf('"%s" require recipient id format to be "/webhookb2/{uuid}@{uuid}/IncomingWebhook/{id}/{uuid}", "%s" given.', MicrosoftTeamsOptions::class, $recipient));

$options->recipient($recipient);
}
Expand Down