upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-05-28 04:32:30 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 54

Merge pull request #60449 from nextcloud/bugfix/noid/fix-base-url-in-background-job

Browse source 
fix(windmill): Fix baseUrl in background job
This commit is contained in:
Joas Schilling 2026-05-16 01:24:28 +02:00 committed by GitHub
commit 3f796a1dee
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
apps/webhook_listeners/lib/Service/TokenService.php
View file

@ -84,7 +84,7 @@ class TokenService {
$tokens['user_ids'][$userId] = [
'userId' => $userId,
'token' => $this->createEphemeralToken($userId),
'baseUrl' => $this->urlGenerator->getBaseUrl()
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
];
} catch (\Exception $e) {
$this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
@ -104,7 +104,7 @@ class TokenService {
$tokens['owner'] = [
'userId' => $ownerId,
'token' => $this->createEphemeralToken($ownerId),
'baseUrl' => $this->urlGenerator->getBaseUrl()
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
];
break;
case 'trigger':
@ -115,7 +115,7 @@ class TokenService {
$tokens['trigger'] = [
'userId' => $triggerUserId,
'token' => $this->createEphemeralToken($triggerUserId),
'baseUrl' => $this->urlGenerator->getBaseUrl()
'baseUrl' => rtrim($this->urlGenerator->getAbsoluteURL('/'), '/'),
];
break;
default: