sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix: rename field names of tokenNeeded 

Signed-off-by: Jana Peper <jana.peper@nextcloud.com>
pull/55790/head
Jana Peper 2025-11-12 12:42:28 +07:00 committed by janepie
parent 5689d9488e
commit 5ad1ea3726
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
apps/webhook_listeners/lib/Controller/WebhooksController.php
Unescape Escape View File

@ -113,8 +113,8 @@ class WebhooksController extends OCSController {
* @param "none"|"header"|null $authMethod Authentication method to use
* @param ?array<string,mixed> $authData Array of data for authentication
* @param ?array<string,mixed> $tokenNeeded List of user ids for which to include auth tokens in the event.
* Has two fields: "users" list of user uids for which tokens are needed, "functions" list of functions for which tokens can be included.
* Possible functions: "owner" for the user creating the webhook, "trigger" for the user triggering the webhook call
* Has two fields: "user_ids" list of user uids for which tokens are needed, "user_roles" list of roles (users not defined by their ID but by the role they have in the webhook event) for which tokens can be included.
* Possible roles: "owner" for the user creating the webhook, "trigger" for the user triggering the webhook call.
*
* @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
*
@ -186,8 +186,9 @@ class WebhooksController extends OCSController {
* @param "none"|"header"|null $authMethod Authentication method to use
* @param ?array<string,mixed> $authData Array of data for authentication
* @param ?array<string,mixed> $tokenNeeded List of user ids for which to include auth tokens in the event.
* Has two fields: "users" list of user uids for which tokens are needed, "functions" list of functions for which tokens can be included.
* Possible functions: "owner" for the user creating the webhook, "trigger" for the user triggering the webhook call
* @param ?array<string,mixed> $tokenNeeded List of user ids for which to include auth tokens in the event.
* Has two fields: "user_ids" list of user uids for which tokens are needed, "user_roles" list of roles (users not defined by their ID but by the role they have in the webhook event) for which tokens can be included.
* Possible roles: "owner" for the user creating the webhook, "trigger" for the user triggering the webhook call.
*
* @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
*

24
apps/webhook_listeners/lib/Service/TokenService.php
Unescape Escape View File

@ -25,10 +25,10 @@ class TokenService {
/**
* creates an array which includes two arrays of tokens: 'users' and 'functions'
* The array ['users' => ['jane', 'bob'], 'functions' => ['owner', 'trigger']]
* creates an array which includes two arrays of tokens: 'user_ids' and 'user_roles'
* The array ['user_ids' => ['jane', 'bob'], 'user_roles' => ['owner', 'trigger']]
* as requested tokens in the registered webhook produces a result like
* ['users' => [['jane' => 'abcdtokenabcd1'], ['bob','=> 'abcdtokenabcd2']], 'functions' => [['owner' => ['admin' => 'abcdtokenabcd3']], ['trigger' => ['user1' => 'abcdtokenabcd4']]]]
* ['user_ids' => [['jane' => 'abcdtokenabcd1'], ['bob','=> 'abcdtokenabcd2']], 'user_roles' => [['owner' => ['admin' => 'abcdtokenabcd3']], ['trigger' => ['user1' => 'abcdtokenabcd4']]]]
*
* @param WebhookListener $webhookListener
* @param string|null $triggerUserId the user that triggered the webhook call
@ -36,17 +36,17 @@ class TokenService {
*/
public function getTokens(WebhookListener $webhookListener, ?string $triggerUserId): array {
$tokens = [
'users' => [],
'functions' => [],
'user_ids' => [],
'user_roles' => [],
];
$tokenNeeded = $webhookListener->getTokenNeeded();
if (isset($tokenNeeded['users'])) {
foreach ($tokenNeeded['users'] as $userId) {
$tokens['users'][$userId] = $this->createTemporaryToken($userId);
if (isset($tokenNeeded['user_ids'])) {
foreach ($tokenNeeded['user_ids'] as $userId) {
$tokens['user_ids'][$userId] = $this->createTemporaryToken($userId);
}
}
if (isset($tokenNeeded['users'])) {
foreach ($tokenNeeded['functions'] as $function) {
if (isset($tokenNeeded['user_ids'])) {
foreach ($tokenNeeded['user_roles'] as $function) {
switch ($function) {
case 'owner':
// token for the person who created the flow
@ -54,7 +54,7 @@ class TokenService {
if (is_null($functionId)) { // no owner uid available
break;
}
$tokens['functions']['owner'] = [
$tokens['user_roles']['owner'] = [
$functionId => $this->createTemporaryToken($functionId)
];
break;
@ -63,7 +63,7 @@ class TokenService {
if (is_null($triggerUserId)) { // no trigger uid available
break;
}
$tokens['functions']['trigger'] = [
$tokens['user_roles']['trigger'] = [
$triggerUserId => $this->createTemporaryToken($triggerUserId)
];
break;