Skip to content

Commit 9b4f62d

Browse files
Merge pull request #60469 from nextcloud/backport/60449/stable34
[stable34] fix(windmill): Fix baseUrl in background job
2 parents d737720 + 7b429b1 commit 9b4f62d

1 file changed

Lines changed: 3 additions & 3 deletions

File tree

apps/webhook_listeners/lib/Service/TokenService.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
8484
$tokens['user_ids'][$userId] = [
8585
'userId' => $userId,
8686
'token' => $this->createEphemeralToken($userId),
87-
'baseUrl' => $this->urlGenerator->getBaseUrl()
87+
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
8888
];
8989
} catch (\Exception $e) {
9090
$this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
@@ -104,7 +104,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
104104
$tokens['owner'] = [
105105
'userId' => $ownerId,
106106
'token' => $this->createEphemeralToken($ownerId),
107-
'baseUrl' => $this->urlGenerator->getBaseUrl()
107+
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
108108
];
109109
break;
110110
case 'trigger':
@@ -115,7 +115,7 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
115115
$tokens['trigger'] = [
116116
'userId' => $triggerUserId,
117117
'token' => $this->createEphemeralToken($triggerUserId),
118-
'baseUrl' => $this->urlGenerator->getBaseUrl()
118+
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
119119
];
120120
break;
121121
default:

0 commit comments

Comments
 (0)