nextcloud / server

apps/webhook_listeners/composer/composer/autoload_static.php

Spacing +27 added lines, -27 removed lines

@@ -6,46 +6,46 @@
 
 class ComposerStaticInitWebhookListeners
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\WebhookListeners\\' => 21,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\WebhookListeners\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'Composer\\InstalledVersions' => __DIR__ . '/..' . '/composer/InstalledVersions.php',
-        'OCA\\WebhookListeners\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => __DIR__ . '/..' . '/../lib/BackgroundJobs/WebhookCall.php',
-        'OCA\\WebhookListeners\\BackgroundJobs\\WebhookTokenCleanup' => __DIR__ . '/..' . '/../lib/BackgroundJobs/WebhookTokenCleanup.php',
-        'OCA\\WebhookListeners\\Command\\ListWebhooks' => __DIR__ . '/..' . '/../lib/Command/ListWebhooks.php',
-        'OCA\\WebhookListeners\\Controller\\WebhooksController' => __DIR__ . '/..' . '/../lib/Controller/WebhooksController.php',
-        'OCA\\WebhookListeners\\Db\\AuthMethod' => __DIR__ . '/..' . '/../lib/Db/AuthMethod.php',
-        'OCA\\WebhookListeners\\Db\\EphemeralToken' => __DIR__ . '/..' . '/../lib/Db/EphemeralToken.php',
-        'OCA\\WebhookListeners\\Db\\EphemeralTokenMapper' => __DIR__ . '/..' . '/../lib/Db/EphemeralTokenMapper.php',
-        'OCA\\WebhookListeners\\Db\\WebhookListener' => __DIR__ . '/..' . '/../lib/Db/WebhookListener.php',
-        'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => __DIR__ . '/..' . '/../lib/Db/WebhookListenerMapper.php',
-        'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => __DIR__ . '/..' . '/../lib/Listener/WebhooksEventListener.php',
-        'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => __DIR__ . '/..' . '/../lib/Migration/Version1000Date20240527153425.php',
-        'OCA\\WebhookListeners\\Migration\\Version1001Date20240716184935' => __DIR__ . '/..' . '/../lib/Migration/Version1001Date20240716184935.php',
-        'OCA\\WebhookListeners\\Migration\\Version1500Date20251007130000' => __DIR__ . '/..' . '/../lib/Migration/Version1500Date20251007130000.php',
-        'OCA\\WebhookListeners\\ResponseDefinitions' => __DIR__ . '/..' . '/../lib/ResponseDefinitions.php',
-        'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => __DIR__ . '/..' . '/../lib/Service/PHPMongoQuery.php',
-        'OCA\\WebhookListeners\\Service\\TokenService' => __DIR__ . '/..' . '/../lib/Service/TokenService.php',
-        'OCA\\WebhookListeners\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\WebhookListeners\\Settings\\AdminSection' => __DIR__ . '/..' . '/../lib/Settings/AdminSection.php',
+    public static $classMap = array(
+        'Composer\\InstalledVersions' => __DIR__.'/..'.'/composer/InstalledVersions.php',
+        'OCA\\WebhookListeners\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => __DIR__.'/..'.'/../lib/BackgroundJobs/WebhookCall.php',
+        'OCA\\WebhookListeners\\BackgroundJobs\\WebhookTokenCleanup' => __DIR__.'/..'.'/../lib/BackgroundJobs/WebhookTokenCleanup.php',
+        'OCA\\WebhookListeners\\Command\\ListWebhooks' => __DIR__.'/..'.'/../lib/Command/ListWebhooks.php',
+        'OCA\\WebhookListeners\\Controller\\WebhooksController' => __DIR__.'/..'.'/../lib/Controller/WebhooksController.php',
+        'OCA\\WebhookListeners\\Db\\AuthMethod' => __DIR__.'/..'.'/../lib/Db/AuthMethod.php',
+        'OCA\\WebhookListeners\\Db\\EphemeralToken' => __DIR__.'/..'.'/../lib/Db/EphemeralToken.php',
+        'OCA\\WebhookListeners\\Db\\EphemeralTokenMapper' => __DIR__.'/..'.'/../lib/Db/EphemeralTokenMapper.php',
+        'OCA\\WebhookListeners\\Db\\WebhookListener' => __DIR__.'/..'.'/../lib/Db/WebhookListener.php',
+        'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => __DIR__.'/..'.'/../lib/Db/WebhookListenerMapper.php',
+        'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => __DIR__.'/..'.'/../lib/Listener/WebhooksEventListener.php',
+        'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => __DIR__.'/..'.'/../lib/Migration/Version1000Date20240527153425.php',
+        'OCA\\WebhookListeners\\Migration\\Version1001Date20240716184935' => __DIR__.'/..'.'/../lib/Migration/Version1001Date20240716184935.php',
+        'OCA\\WebhookListeners\\Migration\\Version1500Date20251007130000' => __DIR__.'/..'.'/../lib/Migration/Version1500Date20251007130000.php',
+        'OCA\\WebhookListeners\\ResponseDefinitions' => __DIR__.'/..'.'/../lib/ResponseDefinitions.php',
+        'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => __DIR__.'/..'.'/../lib/Service/PHPMongoQuery.php',
+        'OCA\\WebhookListeners\\Service\\TokenService' => __DIR__.'/..'.'/../lib/Service/TokenService.php',
+        'OCA\\WebhookListeners\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\WebhookListeners\\Settings\\AdminSection' => __DIR__.'/..'.'/../lib/Settings/AdminSection.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitWebhookListeners::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitWebhookListeners::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitWebhookListeners::$classMap;

apps/webhook_listeners/composer/composer/autoload_classmap.php

Spacing +20 added lines, -20 removed lines

@@ -6,24 +6,24 @@
 $baseDir = $vendorDir;
 
 return array(
-    'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php',
-    'OCA\\WebhookListeners\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => $baseDir . '/../lib/BackgroundJobs/WebhookCall.php',
-    'OCA\\WebhookListeners\\BackgroundJobs\\WebhookTokenCleanup' => $baseDir . '/../lib/BackgroundJobs/WebhookTokenCleanup.php',
-    'OCA\\WebhookListeners\\Command\\ListWebhooks' => $baseDir . '/../lib/Command/ListWebhooks.php',
-    'OCA\\WebhookListeners\\Controller\\WebhooksController' => $baseDir . '/../lib/Controller/WebhooksController.php',
-    'OCA\\WebhookListeners\\Db\\AuthMethod' => $baseDir . '/../lib/Db/AuthMethod.php',
-    'OCA\\WebhookListeners\\Db\\EphemeralToken' => $baseDir . '/../lib/Db/EphemeralToken.php',
-    'OCA\\WebhookListeners\\Db\\EphemeralTokenMapper' => $baseDir . '/../lib/Db/EphemeralTokenMapper.php',
-    'OCA\\WebhookListeners\\Db\\WebhookListener' => $baseDir . '/../lib/Db/WebhookListener.php',
-    'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => $baseDir . '/../lib/Db/WebhookListenerMapper.php',
-    'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => $baseDir . '/../lib/Listener/WebhooksEventListener.php',
-    'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => $baseDir . '/../lib/Migration/Version1000Date20240527153425.php',
-    'OCA\\WebhookListeners\\Migration\\Version1001Date20240716184935' => $baseDir . '/../lib/Migration/Version1001Date20240716184935.php',
-    'OCA\\WebhookListeners\\Migration\\Version1500Date20251007130000' => $baseDir . '/../lib/Migration/Version1500Date20251007130000.php',
-    'OCA\\WebhookListeners\\ResponseDefinitions' => $baseDir . '/../lib/ResponseDefinitions.php',
-    'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => $baseDir . '/../lib/Service/PHPMongoQuery.php',
-    'OCA\\WebhookListeners\\Service\\TokenService' => $baseDir . '/../lib/Service/TokenService.php',
-    'OCA\\WebhookListeners\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\WebhookListeners\\Settings\\AdminSection' => $baseDir . '/../lib/Settings/AdminSection.php',
+    'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php',
+    'OCA\\WebhookListeners\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\WebhookListeners\\BackgroundJobs\\WebhookCall' => $baseDir.'/../lib/BackgroundJobs/WebhookCall.php',
+    'OCA\\WebhookListeners\\BackgroundJobs\\WebhookTokenCleanup' => $baseDir.'/../lib/BackgroundJobs/WebhookTokenCleanup.php',
+    'OCA\\WebhookListeners\\Command\\ListWebhooks' => $baseDir.'/../lib/Command/ListWebhooks.php',
+    'OCA\\WebhookListeners\\Controller\\WebhooksController' => $baseDir.'/../lib/Controller/WebhooksController.php',
+    'OCA\\WebhookListeners\\Db\\AuthMethod' => $baseDir.'/../lib/Db/AuthMethod.php',
+    'OCA\\WebhookListeners\\Db\\EphemeralToken' => $baseDir.'/../lib/Db/EphemeralToken.php',
+    'OCA\\WebhookListeners\\Db\\EphemeralTokenMapper' => $baseDir.'/../lib/Db/EphemeralTokenMapper.php',
+    'OCA\\WebhookListeners\\Db\\WebhookListener' => $baseDir.'/../lib/Db/WebhookListener.php',
+    'OCA\\WebhookListeners\\Db\\WebhookListenerMapper' => $baseDir.'/../lib/Db/WebhookListenerMapper.php',
+    'OCA\\WebhookListeners\\Listener\\WebhooksEventListener' => $baseDir.'/../lib/Listener/WebhooksEventListener.php',
+    'OCA\\WebhookListeners\\Migration\\Version1000Date20240527153425' => $baseDir.'/../lib/Migration/Version1000Date20240527153425.php',
+    'OCA\\WebhookListeners\\Migration\\Version1001Date20240716184935' => $baseDir.'/../lib/Migration/Version1001Date20240716184935.php',
+    'OCA\\WebhookListeners\\Migration\\Version1500Date20251007130000' => $baseDir.'/../lib/Migration/Version1500Date20251007130000.php',
+    'OCA\\WebhookListeners\\ResponseDefinitions' => $baseDir.'/../lib/ResponseDefinitions.php',
+    'OCA\\WebhookListeners\\Service\\PHPMongoQuery' => $baseDir.'/../lib/Service/PHPMongoQuery.php',
+    'OCA\\WebhookListeners\\Service\\TokenService' => $baseDir.'/../lib/Service/TokenService.php',
+    'OCA\\WebhookListeners\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\WebhookListeners\\Settings\\AdminSection' => $baseDir.'/../lib/Settings/AdminSection.php',
 );

apps/webhook_listeners/lib/Service/TokenService.php

Indentation +93 added lines, -93 removed lines

@@ -20,103 +20,103 @@
 use Psr\Log\LoggerInterface;
 
 class TokenService {
-	public function __construct(
-		private IProvider $tokenProvider,
-		private ISecureRandom $random,
-		private EphemeralTokenMapper $tokenMapper,
-		private LoggerInterface $logger,
-		private ITimeFactory $time,
-		private IFactory $l10nFactory,
-		private IUserManager $userManager,
-	) {
-	}
+    public function __construct(
+        private IProvider $tokenProvider,
+        private ISecureRandom $random,
+        private EphemeralTokenMapper $tokenMapper,
+        private LoggerInterface $logger,
+        private ITimeFactory $time,
+        private IFactory $l10nFactory,
+        private IUserManager $userManager,
+    ) {
+    }
 
-	/**
-	 * 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
-	 * ['user_ids' => [['jane' => 'abcdtokenabcd1'], ['bob','=> 'abcdtokenabcd2']], 'user_roles' => ['owner' => ['admin' => 'abcdtokenabcd3'], 'trigger' => ['user1' => 'abcdtokenabcd4']]]
-	 * Created auth tokens are valid for 1 hour.
-	 *
-	 * @param WebhookListener $webhookListener
-	 * @param ?string $triggerUserId the user that triggered the webhook call
-	 * @return array{user_ids?:array<string,string>,user_roles?:array{owner?:array<string,string>,trigger?:array<string,string>}}
-	 */
-	public function getTokens(WebhookListener $webhookListener, ?string $triggerUserId): array {
-		$tokens = [
-			'user_ids' => [],
-			'user_roles' => [],
-		];
-		$tokenNeeded = $webhookListener->getTokenNeeded();
-		if (isset($tokenNeeded['user_ids'])) {
-			foreach ($tokenNeeded['user_ids'] as $userId) {
-				try {
-					$tokens['user_ids'][$userId] = $this->createEphemeralToken($userId);
-				} catch (\Exception $e) {
-					$this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
-				}
+    /**
+     * 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
+     * ['user_ids' => [['jane' => 'abcdtokenabcd1'], ['bob','=> 'abcdtokenabcd2']], 'user_roles' => ['owner' => ['admin' => 'abcdtokenabcd3'], 'trigger' => ['user1' => 'abcdtokenabcd4']]]
+     * Created auth tokens are valid for 1 hour.
+     *
+     * @param WebhookListener $webhookListener
+     * @param ?string $triggerUserId the user that triggered the webhook call
+     * @return array{user_ids?:array<string,string>,user_roles?:array{owner?:array<string,string>,trigger?:array<string,string>}}
+     */
+    public function getTokens(WebhookListener $webhookListener, ?string $triggerUserId): array {
+        $tokens = [
+            'user_ids' => [],
+            'user_roles' => [],
+        ];
+        $tokenNeeded = $webhookListener->getTokenNeeded();
+        if (isset($tokenNeeded['user_ids'])) {
+            foreach ($tokenNeeded['user_ids'] as $userId) {
+                try {
+                    $tokens['user_ids'][$userId] = $this->createEphemeralToken($userId);
+                } catch (\Exception $e) {
+                    $this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
+                }
 
-			}
-		}
-		if (isset($tokenNeeded['user_roles'])) {
-			foreach ($tokenNeeded['user_roles'] as $user_role) {
-				switch ($user_role) {
-					case 'owner':
-						// token for the person who created the flow
-						$ownerId = $webhookListener->getUserId();
-						if (is_null($ownerId)) { // no owner uid available
-							break;
-						}
-						$tokens['user_roles']['owner'] = [
-							$ownerId => $this->createEphemeralToken($ownerId)
-						];
-						break;
-					case 'trigger':
-						// token for the person who triggered the webhook
-						if (is_null($triggerUserId)) { // no trigger uid available
-							break;
-						}
-						$tokens['user_roles']['trigger'] = [
-							$triggerUserId => $this->createEphemeralToken($triggerUserId)
-						];
-						break;
-					default:
-						$this->logger->error('Webhook token creation for user role ' . $user_role . ' not defined. ', ['Not defined' => $user_role]);
+            }
+        }
+        if (isset($tokenNeeded['user_roles'])) {
+            foreach ($tokenNeeded['user_roles'] as $user_role) {
+                switch ($user_role) {
+                    case 'owner':
+                        // token for the person who created the flow
+                        $ownerId = $webhookListener->getUserId();
+                        if (is_null($ownerId)) { // no owner uid available
+                            break;
+                        }
+                        $tokens['user_roles']['owner'] = [
+                            $ownerId => $this->createEphemeralToken($ownerId)
+                        ];
+                        break;
+                    case 'trigger':
+                        // token for the person who triggered the webhook
+                        if (is_null($triggerUserId)) { // no trigger uid available
+                            break;
+                        }
+                        $tokens['user_roles']['trigger'] = [
+                            $triggerUserId => $this->createEphemeralToken($triggerUserId)
+                        ];
+                        break;
+                    default:
+                        $this->logger->error('Webhook token creation for user role ' . $user_role . ' not defined. ', ['Not defined' => $user_role]);
 
-				}
-			}
-		}
-		return $tokens;
-	}
-	private function createEphemeralToken(string $userId): string {
-		$token = $this->generateRandomDeviceToken();
+                }
+            }
+        }
+        return $tokens;
+    }
+    private function createEphemeralToken(string $userId): string {
+        $token = $this->generateRandomDeviceToken();
 
-		// we need the user`s language to have the token name showing up in the session list in the correct language
-		$user = $this->userManager->get($userId);
-		$lang = $this->l10nFactory->getUserLanguage($user);
-		$l = $this->l10nFactory->get('webhook_listeners', $lang);
-		$name = $l->t('Ephemeral webhook authentication');
-		$password = null;
-		$deviceToken = $this->tokenProvider->generateToken(
-			$token,
-			$userId,
-			$userId,
-			$password,
-			$name,
-			IToken::PERMANENT_TOKEN);
+        // we need the user`s language to have the token name showing up in the session list in the correct language
+        $user = $this->userManager->get($userId);
+        $lang = $this->l10nFactory->getUserLanguage($user);
+        $l = $this->l10nFactory->get('webhook_listeners', $lang);
+        $name = $l->t('Ephemeral webhook authentication');
+        $password = null;
+        $deviceToken = $this->tokenProvider->generateToken(
+            $token,
+            $userId,
+            $userId,
+            $password,
+            $name,
+            IToken::PERMANENT_TOKEN);
 
-		$this->tokenMapper->addEphemeralToken(
-			$deviceToken->getId(),
-			$userId,
-			$this->time->getTime());
-		return $token;
-	}
+        $this->tokenMapper->addEphemeralToken(
+            $deviceToken->getId(),
+            $userId,
+            $this->time->getTime());
+        return $token;
+    }
 
-	private function generateRandomDeviceToken(): string {
-		$groups = [];
-		for ($i = 0; $i < 5; $i++) {
-			$groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
-		}
-		return implode('-', $groups);
-	}
+    private function generateRandomDeviceToken(): string {
+        $groups = [];
+        for ($i = 0; $i < 5; $i++) {
+            $groups[] = $this->random->generate(5, ISecureRandom::CHAR_HUMAN_READABLE);
+        }
+        return implode('-', $groups);
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -53,7 +53,7 @@ 
 				try {
 					$tokens['user_ids'][$userId] = $this->createEphemeralToken($userId);
 				} catch (\Exception $e) {
-					$this->logger->error('Webhook token creation for user ' . $userId . ' failed: ' . $e->getMessage(), ['exception' => $e]);
+					$this->logger->error('Webhook token creation for user '.$userId.' failed: '.$e->getMessage(), ['exception' => $e]);
 				}
 
 			}
@@ -81,7 +81,7 @@ 
 						];
 						break;
 					default:
-						$this->logger->error('Webhook token creation for user role ' . $user_role . ' not defined. ', ['Not defined' => $user_role]);
+						$this->logger->error('Webhook token creation for user role '.$user_role.' not defined. ', ['Not defined' => $user_role]);
 
 				}
 			}

apps/webhook_listeners/lib/Controller/WebhooksController.php

Indentation +269 added lines, -269 removed lines

@@ -35,280 +35,280 @@
  */
 #[OpenAPI(scope: OpenAPI::SCOPE_ADMINISTRATION)]
 class WebhooksController extends OCSController {
-	public function __construct(
-		string $appName,
-		IRequest $request,
-		private LoggerInterface $logger,
-		private WebhookListenerMapper $mapper,
-		private ?string $userId,
-		private ISession $session,
-	) {
-		parent::__construct($appName, $request);
-	}
+    public function __construct(
+        string $appName,
+        IRequest $request,
+        private LoggerInterface $logger,
+        private WebhookListenerMapper $mapper,
+        private ?string $userId,
+        private ISession $session,
+    ) {
+        parent::__construct($appName, $request);
+    }
 
-	/**
-	 * List registered webhooks
-	 *
-	 * @param string|null $uri The callback URI to filter by
-	 * @return DataResponse<Http::STATUS_OK, list<WebhookListenersWebhookInfo>, array{}>
-	 * @throws OCSException Other internal error
-	 *
-	 * 200: Webhook registrations returned
-	 */
-	#[ApiRoute(verb: 'GET', url: '/api/v1/webhooks')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function index(?string $uri = null): DataResponse {
-		try {
-			if ($uri !== null) {
-				$webhookListeners = $this->mapper->getByUri($uri);
-			} else {
-				$webhookListeners = $this->mapper->getAll();
-			}
+    /**
+     * List registered webhooks
+     *
+     * @param string|null $uri The callback URI to filter by
+     * @return DataResponse<Http::STATUS_OK, list<WebhookListenersWebhookInfo>, array{}>
+     * @throws OCSException Other internal error
+     *
+     * 200: Webhook registrations returned
+     */
+    #[ApiRoute(verb: 'GET', url: '/api/v1/webhooks')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function index(?string $uri = null): DataResponse {
+        try {
+            if ($uri !== null) {
+                $webhookListeners = $this->mapper->getByUri($uri);
+            } else {
+                $webhookListeners = $this->mapper->getAll();
+            }
 
-			return new DataResponse(array_values(array_map(
-				fn (WebhookListener $listener): array => $listener->jsonSerialize(),
-				$webhookListeners
-			)));
-		} catch (\Exception $e) {
-			$this->logger->error('Error when listing webhooks', ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+            return new DataResponse(array_values(array_map(
+                fn (WebhookListener $listener): array => $listener->jsonSerialize(),
+                $webhookListeners
+            )));
+        } catch (\Exception $e) {
+            $this->logger->error('Error when listing webhooks', ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 
-	/**
-	 * Get details on a registered webhook
-	 *
-	 * @param int $id id of the webhook
-	 *
-	 * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
-	 * @throws OCSNotFoundException Webhook not found
-	 * @throws OCSException Other internal error
-	 *
-	 * 200: Webhook registration returned
-	 */
-	#[ApiRoute(verb: 'GET', url: '/api/v1/webhooks/{id}')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function show(int $id): DataResponse {
-		try {
-			return new DataResponse($this->mapper->getById($id)->jsonSerialize());
-		} catch (DoesNotExistException $e) {
-			throw new OCSNotFoundException($e->getMessage(), $e);
-		} catch (\Exception $e) {
-			$this->logger->error('Error when getting webhook', ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+    /**
+     * Get details on a registered webhook
+     *
+     * @param int $id id of the webhook
+     *
+     * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
+     * @throws OCSNotFoundException Webhook not found
+     * @throws OCSException Other internal error
+     *
+     * 200: Webhook registration returned
+     */
+    #[ApiRoute(verb: 'GET', url: '/api/v1/webhooks/{id}')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function show(int $id): DataResponse {
+        try {
+            return new DataResponse($this->mapper->getById($id)->jsonSerialize());
+        } catch (DoesNotExistException $e) {
+            throw new OCSNotFoundException($e->getMessage(), $e);
+        } catch (\Exception $e) {
+            $this->logger->error('Error when getting webhook', ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 
-	/**
-	 * Register a new webhook
-	 *
-	 * @param string $httpMethod HTTP method to use to contact the webhook
-	 * @param string $uri Webhook URI endpoint
-	 * @param string $event Event class name to listen to
-	 * @param ?array<string,mixed> $eventFilter Mongo filter to apply to the serialized data to decide if firing
-	 * @param ?string $userIdFilter User id to filter on. The webhook will only be called by requests from this user. Empty or null means no filtering.
-	 * @param ?array<string,string> $headers Array of headers to send
-	 * @param "none"|"header"|null $authMethod Authentication method to use
-	 * @param ?array<string,mixed> $authData Array of data for authentication
-	 * @param ?array{user_ids?:list<string>,user_roles?:list<string>} $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.
-	 *                                                                             Requested auth tokens are valid for 1 hour after receiving them in the event call request.
-	 *
-	 * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
-	 *
-	 * 200: Webhook registration returned
-	 *
-	 * @throws OCSBadRequestException Bad request
-	 * @throws OCSForbiddenException Insufficient permissions
-	 * @throws OCSException Other error
-	 */
-	#[ApiRoute(verb: 'POST', url: '/api/v1/webhooks')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function create(
-		string $httpMethod,
-		string $uri,
-		string $event,
-		?array $eventFilter,
-		?string $userIdFilter,
-		?array $headers,
-		?string $authMethod,
-		#[\SensitiveParameter]
-		?array $authData,
-		?array $tokenNeeded = null,
-	): DataResponse {
-		$appId = null;
-		if ($this->session->get('app_api') === true) {
-			$appId = $this->request->getHeader('ex-app-id');
-		}
-		try {
-			$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
-		} catch (\ValueError $e) {
-			throw new OCSBadRequestException('This auth method does not exist');
-		}
-		try {
-			$webhookListener = $this->mapper->addWebhookListener(
-				$appId,
-				$this->userId,
-				$httpMethod,
-				$uri,
-				$event,
-				$eventFilter,
-				$userIdFilter,
-				$headers,
-				$authMethod,
-				$authData,
-				$tokenNeeded,
-			);
-			return new DataResponse($webhookListener->jsonSerialize());
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (\Exception $e) {
-			$this->logger->error('Error when inserting webhook', ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+    /**
+     * Register a new webhook
+     *
+     * @param string $httpMethod HTTP method to use to contact the webhook
+     * @param string $uri Webhook URI endpoint
+     * @param string $event Event class name to listen to
+     * @param ?array<string,mixed> $eventFilter Mongo filter to apply to the serialized data to decide if firing
+     * @param ?string $userIdFilter User id to filter on. The webhook will only be called by requests from this user. Empty or null means no filtering.
+     * @param ?array<string,string> $headers Array of headers to send
+     * @param "none"|"header"|null $authMethod Authentication method to use
+     * @param ?array<string,mixed> $authData Array of data for authentication
+     * @param ?array{user_ids?:list<string>,user_roles?:list<string>} $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.
+     *                                                                             Requested auth tokens are valid for 1 hour after receiving them in the event call request.
+     *
+     * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
+     *
+     * 200: Webhook registration returned
+     *
+     * @throws OCSBadRequestException Bad request
+     * @throws OCSForbiddenException Insufficient permissions
+     * @throws OCSException Other error
+     */
+    #[ApiRoute(verb: 'POST', url: '/api/v1/webhooks')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function create(
+        string $httpMethod,
+        string $uri,
+        string $event,
+        ?array $eventFilter,
+        ?string $userIdFilter,
+        ?array $headers,
+        ?string $authMethod,
+        #[\SensitiveParameter]
+        ?array $authData,
+        ?array $tokenNeeded = null,
+    ): DataResponse {
+        $appId = null;
+        if ($this->session->get('app_api') === true) {
+            $appId = $this->request->getHeader('ex-app-id');
+        }
+        try {
+            $authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
+        } catch (\ValueError $e) {
+            throw new OCSBadRequestException('This auth method does not exist');
+        }
+        try {
+            $webhookListener = $this->mapper->addWebhookListener(
+                $appId,
+                $this->userId,
+                $httpMethod,
+                $uri,
+                $event,
+                $eventFilter,
+                $userIdFilter,
+                $headers,
+                $authMethod,
+                $authData,
+                $tokenNeeded,
+            );
+            return new DataResponse($webhookListener->jsonSerialize());
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (\Exception $e) {
+            $this->logger->error('Error when inserting webhook', ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 
-	/**
-	 * Update an existing webhook registration
-	 *
-	 * @param int $id id of the webhook
-	 * @param string $httpMethod HTTP method to use to contact the webhook
-	 * @param string $uri Webhook URI endpoint
-	 * @param string $event Event class name to listen to
-	 * @param ?array<string,mixed> $eventFilter Mongo filter to apply to the serialized data to decide if firing
-	 * @param ?string $userIdFilter User id to filter on. The webhook will only be called by requests from this user. Empty or null means no filtering.
-	 * @param ?array<string,string> $headers Array of headers to send
-	 * @param "none"|"header"|null $authMethod Authentication method to use
-	 * @param ?array<string,mixed> $authData Array of data for authentication
-	 * @param ?array{user_ids?:list<string>,user_roles?:list<string>} $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.
-	 *                                                                             Requested auth tokens are valid for 1 hour after receiving them in the event call request.
-	 *
-	 * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
-	 *
-	 * 200: Webhook registration returned
-	 *
-	 * @throws OCSBadRequestException Bad request
-	 * @throws OCSForbiddenException Insufficient permissions
-	 * @throws OCSException Other error
-	 */
-	#[ApiRoute(verb: 'POST', url: '/api/v1/webhooks/{id}')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function update(
-		int $id,
-		string $httpMethod,
-		string $uri,
-		string $event,
-		?array $eventFilter,
-		?string $userIdFilter,
-		?array $headers,
-		?string $authMethod,
-		#[\SensitiveParameter]
-		?array $authData,
-		?array $tokenNeeded = null,
-	): DataResponse {
-		$appId = null;
-		if ($this->session->get('app_api') === true) {
-			$appId = $this->request->getHeader('ex-app-id');
-		}
-		try {
-			$authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
-		} catch (\ValueError $e) {
-			throw new OCSBadRequestException('This auth method does not exist');
-		}
-		try {
-			$webhookListener = $this->mapper->updateWebhookListener(
-				$id,
-				$appId,
-				$this->userId,
-				$httpMethod,
-				$uri,
-				$event,
-				$eventFilter,
-				$userIdFilter,
-				$headers,
-				$authMethod,
-				$authData,
-				$tokenNeeded,
-			);
-			return new DataResponse($webhookListener->jsonSerialize());
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (\Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+    /**
+     * Update an existing webhook registration
+     *
+     * @param int $id id of the webhook
+     * @param string $httpMethod HTTP method to use to contact the webhook
+     * @param string $uri Webhook URI endpoint
+     * @param string $event Event class name to listen to
+     * @param ?array<string,mixed> $eventFilter Mongo filter to apply to the serialized data to decide if firing
+     * @param ?string $userIdFilter User id to filter on. The webhook will only be called by requests from this user. Empty or null means no filtering.
+     * @param ?array<string,string> $headers Array of headers to send
+     * @param "none"|"header"|null $authMethod Authentication method to use
+     * @param ?array<string,mixed> $authData Array of data for authentication
+     * @param ?array{user_ids?:list<string>,user_roles?:list<string>} $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.
+     *                                                                             Requested auth tokens are valid for 1 hour after receiving them in the event call request.
+     *
+     * @return DataResponse<Http::STATUS_OK, WebhookListenersWebhookInfo, array{}>
+     *
+     * 200: Webhook registration returned
+     *
+     * @throws OCSBadRequestException Bad request
+     * @throws OCSForbiddenException Insufficient permissions
+     * @throws OCSException Other error
+     */
+    #[ApiRoute(verb: 'POST', url: '/api/v1/webhooks/{id}')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function update(
+        int $id,
+        string $httpMethod,
+        string $uri,
+        string $event,
+        ?array $eventFilter,
+        ?string $userIdFilter,
+        ?array $headers,
+        ?string $authMethod,
+        #[\SensitiveParameter]
+        ?array $authData,
+        ?array $tokenNeeded = null,
+    ): DataResponse {
+        $appId = null;
+        if ($this->session->get('app_api') === true) {
+            $appId = $this->request->getHeader('ex-app-id');
+        }
+        try {
+            $authMethod = AuthMethod::from($authMethod ?? AuthMethod::None->value);
+        } catch (\ValueError $e) {
+            throw new OCSBadRequestException('This auth method does not exist');
+        }
+        try {
+            $webhookListener = $this->mapper->updateWebhookListener(
+                $id,
+                $appId,
+                $this->userId,
+                $httpMethod,
+                $uri,
+                $event,
+                $eventFilter,
+                $userIdFilter,
+                $headers,
+                $authMethod,
+                $authData,
+                $tokenNeeded,
+            );
+            return new DataResponse($webhookListener->jsonSerialize());
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (\Exception $e) {
+            $this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 
-	/**
-	 * Remove an existing webhook registration
-	 *
-	 * @param int $id id of the webhook
-	 *
-	 * @return DataResponse<Http::STATUS_OK, bool, array{}>
-	 *
-	 * 200: Boolean returned whether something was deleted
-	 *
-	 * @throws OCSBadRequestException Bad request
-	 * @throws OCSForbiddenException Insufficient permissions
-	 * @throws OCSException Other error
-	 */
-	#[ApiRoute(verb: 'DELETE', url: '/api/v1/webhooks/{id}')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function destroy(int $id): DataResponse {
-		try {
-			$deleted = $this->mapper->deleteById($id);
-			return new DataResponse($deleted);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (\Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+    /**
+     * Remove an existing webhook registration
+     *
+     * @param int $id id of the webhook
+     *
+     * @return DataResponse<Http::STATUS_OK, bool, array{}>
+     *
+     * 200: Boolean returned whether something was deleted
+     *
+     * @throws OCSBadRequestException Bad request
+     * @throws OCSForbiddenException Insufficient permissions
+     * @throws OCSException Other error
+     */
+    #[ApiRoute(verb: 'DELETE', url: '/api/v1/webhooks/{id}')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function destroy(int $id): DataResponse {
+        try {
+            $deleted = $this->mapper->deleteById($id);
+            return new DataResponse($deleted);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (\Exception $e) {
+            $this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 
-	/**
-	 * Remove all existing webhook registration mapped to an AppAPI app id
-	 *
-	 * @param string $appid id of the app, as in the ex-app-id for creation
-	 *
-	 * @return DataResponse<Http::STATUS_OK, int, array{}>
-	 *
-	 * 200: Integer number of registrations deleted
-	 *
-	 * @throws OCSBadRequestException Bad request
-	 * @throws OCSForbiddenException Insufficient permissions
-	 * @throws OCSException Other error
-	 */
-	#[ApiRoute(verb: 'DELETE', url: '/api/v1/webhooks/byappid/{appid}')]
-	#[AuthorizedAdminSetting(settings:Admin::class)]
-	#[AppApiAdminAccessWithoutUser]
-	public function deleteByAppId(string $appid): DataResponse {
-		try {
-			$deletedCount = $this->mapper->deleteByAppId($appid);
-			return new DataResponse($deletedCount);
-		} catch (\UnexpectedValueException $e) {
-			throw new OCSBadRequestException($e->getMessage(), $e);
-		} catch (\DomainException $e) {
-			throw new OCSForbiddenException($e->getMessage(), $e);
-		} catch (\Exception $e) {
-			$this->logger->error('Error when deleting flows for app id ' . $appid, ['exception' => $e]);
-			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
-		}
-	}
+    /**
+     * Remove all existing webhook registration mapped to an AppAPI app id
+     *
+     * @param string $appid id of the app, as in the ex-app-id for creation
+     *
+     * @return DataResponse<Http::STATUS_OK, int, array{}>
+     *
+     * 200: Integer number of registrations deleted
+     *
+     * @throws OCSBadRequestException Bad request
+     * @throws OCSForbiddenException Insufficient permissions
+     * @throws OCSException Other error
+     */
+    #[ApiRoute(verb: 'DELETE', url: '/api/v1/webhooks/byappid/{appid}')]
+    #[AuthorizedAdminSetting(settings:Admin::class)]
+    #[AppApiAdminAccessWithoutUser]
+    public function deleteByAppId(string $appid): DataResponse {
+        try {
+            $deletedCount = $this->mapper->deleteByAppId($appid);
+            return new DataResponse($deletedCount);
+        } catch (\UnexpectedValueException $e) {
+            throw new OCSBadRequestException($e->getMessage(), $e);
+        } catch (\DomainException $e) {
+            throw new OCSForbiddenException($e->getMessage(), $e);
+        } catch (\Exception $e) {
+            $this->logger->error('Error when deleting flows for app id ' . $appid, ['exception' => $e]);
+            throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
+        }
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -138,7 +138,7 @@ 
 		?array $headers,
 		?string $authMethod,
 		#[\SensitiveParameter]
-		?array $authData,
+		? array $authData,
 		?array $tokenNeeded = null,
 	): DataResponse {
 		$appId = null;
@@ -214,7 +214,7 @@ 
 		?array $headers,
 		?string $authMethod,
 		#[\SensitiveParameter]
-		?array $authData,
+		? array $authData,
 		?array $tokenNeeded = null,
 	): DataResponse {
 		$appId = null;
@@ -247,7 +247,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (\Exception $e) {
-			$this->logger->error('Error when updating flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when updating flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
 		}
 	}
@@ -277,7 +277,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (\Exception $e) {
-			$this->logger->error('Error when deleting flow with id ' . $id, ['exception' => $e]);
+			$this->logger->error('Error when deleting flow with id '.$id, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
 		}
 	}
@@ -307,7 +307,7 @@ 
 		} catch (\DomainException $e) {
 			throw new OCSForbiddenException($e->getMessage(), $e);
 		} catch (\Exception $e) {
-			$this->logger->error('Error when deleting flows for app id ' . $appid, ['exception' => $e]);
+			$this->logger->error('Error when deleting flows for app id '.$appid, ['exception' => $e]);
 			throw new OCSException('An internal error occurred', Http::STATUS_INTERNAL_SERVER_ERROR, $e);
 		}
 	}

apps/webhook_listeners/lib/Db/WebhookListenerMapper.php

Indentation +239 added lines, -239 removed lines

@@ -23,243 +23,243 @@
  * @template-extends QBMapper<WebhookListener>
  */
 class WebhookListenerMapper extends QBMapper {
-	public const TABLE_NAME = 'webhook_listeners';
-
-	private const EVENTS_CACHE_KEY_PREFIX = 'eventsUsedInWebhooks';
-
-	private ?ICache $cache = null;
-
-	public function __construct(
-		IDBConnection $db,
-		ICacheFactory $cacheFactory,
-	) {
-		parent::__construct($db, self::TABLE_NAME, WebhookListener::class);
-		if ($cacheFactory->isAvailable()) {
-			$this->cache = $cacheFactory->createDistributed();
-		}
-	}
-
-	/**
-	 * @throws DoesNotExistException
-	 * @throws MultipleObjectsReturnedException
-	 * @throws Exception
-	 */
-	public function getById(int $id): WebhookListener {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @throws Exception
-	 * @return WebhookListener[]
-	 */
-	public function getAll(): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName());
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function addWebhookListener(
-		?string $appId,
-		?string $userId,
-		string $httpMethod,
-		string $uri,
-		string $event,
-		?array $eventFilter,
-		?string $userIdFilter,
-		?array $headers,
-		AuthMethod $authMethod,
-		#[\SensitiveParameter]
-		?array $authData,
-		?array $tokenNeeded = [],
-	): WebhookListener {
-		/* Remove any superfluous antislash */
-		$event = ltrim($event, '\\');
-		if (!class_exists($event) || !is_a($event, IWebhookCompatibleEvent::class, true)) {
-			throw new \UnexpectedValueException("$event is not an event class compatible with webhooks");
-		}
-		$webhookListener = WebhookListener::fromParams(
-			[
-				'appId' => $appId,
-				'userId' => $userId,
-				'httpMethod' => $httpMethod,
-				'uri' => $uri,
-				'event' => $event,
-				'eventFilter' => $eventFilter ?? [],
-				'userIdFilter' => $userIdFilter ?? '',
-				'headers' => $headers,
-				'authMethod' => $authMethod->value,
-				'tokenNeeded' => $tokenNeeded ?? [],
-			]
-		);
-		$webhookListener->setAuthDataClear($authData);
-		$this->cache?->remove($this->buildCacheKey($userIdFilter));
-		return $this->insert($webhookListener);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function updateWebhookListener(
-		int $id,
-		?string $appId,
-		?string $userId,
-		string $httpMethod,
-		string $uri,
-		string $event,
-		?array $eventFilter,
-		?string $userIdFilter,
-		?array $headers,
-		AuthMethod $authMethod,
-		#[\SensitiveParameter]
-		?array $authData,
-		?array $tokenNeeded = [],
-	): WebhookListener {
-		/* Remove any superfluous antislash */
-		$event = ltrim($event, '\\');
-		if (!class_exists($event) || !is_a($event, IWebhookCompatibleEvent::class, true)) {
-			throw new \UnexpectedValueException("$event is not an event class compatible with webhooks");
-		}
-		$webhookListener = WebhookListener::fromParams(
-			[
-				'id' => $id,
-				'appId' => $appId,
-				'userId' => $userId,
-				'httpMethod' => $httpMethod,
-				'uri' => $uri,
-				'event' => $event,
-				'eventFilter' => $eventFilter ?? [],
-				'userIdFilter' => $userIdFilter ?? '',
-				'headers' => $headers,
-				'authMethod' => $authMethod->value,
-				'tokenNeeded' => $tokenNeeded ?? [],
-			]
-		);
-		$webhookListener->setAuthDataClear($authData);
-		$this->cache?->remove($this->buildCacheKey($userIdFilter));
-		return $this->update($webhookListener);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function deleteById(int $id): bool {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete($this->getTableName())
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-
-		return ($qb->executeStatement() > 0);
-	}
-
-	/**
-	 * Delete all registrations made by the given appId
-	 *
-	 * @throws Exception
-	 * @return int number of registration deleted
-	 */
-	public function deleteByAppId(string $appId): int {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->delete($this->getTableName())
-			->where($qb->expr()->eq('app_id', $qb->createNamedParameter($appId, IQueryBuilder::PARAM_STR)));
-
-		return $qb->executeStatement();
-	}
-
-	/**
-	 * @throws Exception
-	 * @return list<string>
-	 */
-	private function getAllConfiguredEventsFromDatabase(string $userId): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->selectDistinct('event')
-			->from($this->getTableName())
-			->where($qb->expr()->emptyString('user_id_filter'));
-
-		if ($userId !== '') {
-			$qb->orWhere($qb->expr()->eq('user_id_filter', $qb->createNamedParameter($userId)));
-		}
-
-		$result = $qb->executeQuery();
-
-		$configuredEvents = [];
-
-		while (($event = $result->fetchOne()) !== false) {
-			$configuredEvents[] = $event;
-		}
-
-		return $configuredEvents;
-	}
-
-	/**
-	 * List all events with at least one webhook configured, with cache
-	 * @throws Exception
-	 * @return list<string>
-	 */
-	public function getAllConfiguredEvents(?string $userId = null): array {
-		$cacheKey = $this->buildCacheKey($userId);
-		$events = $this->cache?->get($cacheKey);
-		if ($events !== null) {
-			return json_decode($events);
-		}
-		$events = $this->getAllConfiguredEventsFromDatabase($userId ?? '');
-		// cache for 5 minutes
-		$this->cache?->set($cacheKey, json_encode($events), 300);
-		return $events;
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function getByEvent(string $event, ?string $userId = null): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('event', $qb->createNamedParameter($event, IQueryBuilder::PARAM_STR)));
-
-
-		if ($userId === '' || $userId === null) {
-			$qb->andWhere($qb->expr()->emptyString('user_id_filter'));
-		} else {
-			$qb->andWhere(
-				$qb->expr()->orX(
-					$qb->expr()->emptyString('user_id_filter'),
-					$qb->expr()->eq('user_id_filter', $qb->createNamedParameter($userId)),
-				)
-			);
-		}
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function getByUri(string $uri): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)));
-
-		return $this->findEntities($qb);
-	}
-
-	private function buildCacheKey(?string $userIdFilter): string {
-		return self::EVENTS_CACHE_KEY_PREFIX . '_' . ($userIdFilter ?? '');
-	}
+    public const TABLE_NAME = 'webhook_listeners';
+
+    private const EVENTS_CACHE_KEY_PREFIX = 'eventsUsedInWebhooks';
+
+    private ?ICache $cache = null;
+
+    public function __construct(
+        IDBConnection $db,
+        ICacheFactory $cacheFactory,
+    ) {
+        parent::__construct($db, self::TABLE_NAME, WebhookListener::class);
+        if ($cacheFactory->isAvailable()) {
+            $this->cache = $cacheFactory->createDistributed();
+        }
+    }
+
+    /**
+     * @throws DoesNotExistException
+     * @throws MultipleObjectsReturnedException
+     * @throws Exception
+     */
+    public function getById(int $id): WebhookListener {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @throws Exception
+     * @return WebhookListener[]
+     */
+    public function getAll(): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName());
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function addWebhookListener(
+        ?string $appId,
+        ?string $userId,
+        string $httpMethod,
+        string $uri,
+        string $event,
+        ?array $eventFilter,
+        ?string $userIdFilter,
+        ?array $headers,
+        AuthMethod $authMethod,
+        #[\SensitiveParameter]
+        ?array $authData,
+        ?array $tokenNeeded = [],
+    ): WebhookListener {
+        /* Remove any superfluous antislash */
+        $event = ltrim($event, '\\');
+        if (!class_exists($event) || !is_a($event, IWebhookCompatibleEvent::class, true)) {
+            throw new \UnexpectedValueException("$event is not an event class compatible with webhooks");
+        }
+        $webhookListener = WebhookListener::fromParams(
+            [
+                'appId' => $appId,
+                'userId' => $userId,
+                'httpMethod' => $httpMethod,
+                'uri' => $uri,
+                'event' => $event,
+                'eventFilter' => $eventFilter ?? [],
+                'userIdFilter' => $userIdFilter ?? '',
+                'headers' => $headers,
+                'authMethod' => $authMethod->value,
+                'tokenNeeded' => $tokenNeeded ?? [],
+            ]
+        );
+        $webhookListener->setAuthDataClear($authData);
+        $this->cache?->remove($this->buildCacheKey($userIdFilter));
+        return $this->insert($webhookListener);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function updateWebhookListener(
+        int $id,
+        ?string $appId,
+        ?string $userId,
+        string $httpMethod,
+        string $uri,
+        string $event,
+        ?array $eventFilter,
+        ?string $userIdFilter,
+        ?array $headers,
+        AuthMethod $authMethod,
+        #[\SensitiveParameter]
+        ?array $authData,
+        ?array $tokenNeeded = [],
+    ): WebhookListener {
+        /* Remove any superfluous antislash */
+        $event = ltrim($event, '\\');
+        if (!class_exists($event) || !is_a($event, IWebhookCompatibleEvent::class, true)) {
+            throw new \UnexpectedValueException("$event is not an event class compatible with webhooks");
+        }
+        $webhookListener = WebhookListener::fromParams(
+            [
+                'id' => $id,
+                'appId' => $appId,
+                'userId' => $userId,
+                'httpMethod' => $httpMethod,
+                'uri' => $uri,
+                'event' => $event,
+                'eventFilter' => $eventFilter ?? [],
+                'userIdFilter' => $userIdFilter ?? '',
+                'headers' => $headers,
+                'authMethod' => $authMethod->value,
+                'tokenNeeded' => $tokenNeeded ?? [],
+            ]
+        );
+        $webhookListener->setAuthDataClear($authData);
+        $this->cache?->remove($this->buildCacheKey($userIdFilter));
+        return $this->update($webhookListener);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function deleteById(int $id): bool {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->delete($this->getTableName())
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+
+        return ($qb->executeStatement() > 0);
+    }
+
+    /**
+     * Delete all registrations made by the given appId
+     *
+     * @throws Exception
+     * @return int number of registration deleted
+     */
+    public function deleteByAppId(string $appId): int {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->delete($this->getTableName())
+            ->where($qb->expr()->eq('app_id', $qb->createNamedParameter($appId, IQueryBuilder::PARAM_STR)));
+
+        return $qb->executeStatement();
+    }
+
+    /**
+     * @throws Exception
+     * @return list<string>
+     */
+    private function getAllConfiguredEventsFromDatabase(string $userId): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->selectDistinct('event')
+            ->from($this->getTableName())
+            ->where($qb->expr()->emptyString('user_id_filter'));
+
+        if ($userId !== '') {
+            $qb->orWhere($qb->expr()->eq('user_id_filter', $qb->createNamedParameter($userId)));
+        }
+
+        $result = $qb->executeQuery();
+
+        $configuredEvents = [];
+
+        while (($event = $result->fetchOne()) !== false) {
+            $configuredEvents[] = $event;
+        }
+
+        return $configuredEvents;
+    }
+
+    /**
+     * List all events with at least one webhook configured, with cache
+     * @throws Exception
+     * @return list<string>
+     */
+    public function getAllConfiguredEvents(?string $userId = null): array {
+        $cacheKey = $this->buildCacheKey($userId);
+        $events = $this->cache?->get($cacheKey);
+        if ($events !== null) {
+            return json_decode($events);
+        }
+        $events = $this->getAllConfiguredEventsFromDatabase($userId ?? '');
+        // cache for 5 minutes
+        $this->cache?->set($cacheKey, json_encode($events), 300);
+        return $events;
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function getByEvent(string $event, ?string $userId = null): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('event', $qb->createNamedParameter($event, IQueryBuilder::PARAM_STR)));
+
+
+        if ($userId === '' || $userId === null) {
+            $qb->andWhere($qb->expr()->emptyString('user_id_filter'));
+        } else {
+            $qb->andWhere(
+                $qb->expr()->orX(
+                    $qb->expr()->emptyString('user_id_filter'),
+                    $qb->expr()->eq('user_id_filter', $qb->createNamedParameter($userId)),
+                )
+            );
+        }
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function getByUri(string $uri): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('uri', $qb->createNamedParameter($uri, IQueryBuilder::PARAM_STR)));
+
+        return $this->findEntities($qb);
+    }
+
+    private function buildCacheKey(?string $userIdFilter): string {
+        return self::EVENTS_CACHE_KEY_PREFIX . '_' . ($userIdFilter ?? '');
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -81,7 +81,7 @@ 
 		?array $headers,
 		AuthMethod $authMethod,
 		#[\SensitiveParameter]
-		?array $authData,
+		? array $authData,
 		?array $tokenNeeded = [],
 	): WebhookListener {
 		/* Remove any superfluous antislash */
@@ -123,7 +123,7 @@ 
 		?array $headers,
 		AuthMethod $authMethod,
 		#[\SensitiveParameter]
-		?array $authData,
+		? array $authData,
 		?array $tokenNeeded = [],
 	): WebhookListener {
 		/* Remove any superfluous antislash */
@@ -260,6 +260,6 @@ 
 	}
 
 	private function buildCacheKey(?string $userIdFilter): string {
-		return self::EVENTS_CACHE_KEY_PREFIX . '_' . ($userIdFilter ?? '');
+		return self::EVENTS_CACHE_KEY_PREFIX.'_'.($userIdFilter ?? '');
 	}
 }

apps/webhook_listeners/lib/Db/EphemeralTokenMapper.php

Indentation +94 added lines, -94 removed lines

@@ -24,98 +24,98 @@
  */
 
 class EphemeralTokenMapper extends QBMapper {
-	public const TABLE_NAME = 'webhook_tokens';
-	public const TOKEN_LIFETIME = 1 * 1 * 60; // one hour in seconds
-
-	public function __construct(
-		IDBConnection $db,
-		private LoggerInterface $logger,
-		private ITimeFactory $time,
-		private PublicKeyTokenMapper $tokenMapper,
-	) {
-		parent::__construct($db, self::TABLE_NAME, EphemeralToken::class);
-	}
-
-	/**
-	 * @throws DoesNotExistException
-	 * @throws MultipleObjectsReturnedException
-	 * @throws Exception
-	 */
-	public function getById(int $id): EphemeralToken {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
-
-		return $this->findEntity($qb);
-	}
-
-	/**
-	 * @throws Exception
-	 * @return EphemeralToken[]
-	 */
-	public function getAll(): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName());
-
-		return $this->findEntities($qb);
-	}
-
-
-	/**
-	 * @param int $olderThan
-	 * @return EphemeralToken[]
-	 * @throws Exception
-	 */
-	public function getOlderThan($olderThan): array {
-		$qb = $this->db->getQueryBuilder();
-
-		$qb->select('*')
-			->from($this->getTableName())
-			->where($qb->expr()->lt('created_at', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)));
-
-		return $this->findEntities($qb);
-	}
-
-	/**
-	 * @throws Exception
-	 */
-	public function addEphemeralToken(
-		int $tokenId,
-		?string $userId,
-		int $createdAt,
-	): EphemeralToken {
-		$tempToken = EphemeralToken::fromParams(
-			[
-				'tokenId' => $tokenId,
-				'userId' => $userId,
-				'createdAt' => $createdAt,
-			]
-		);
-		return $this->insert($tempToken);
-	}
-	public function invalidateOldTokens(int $token_lifetime = self::TOKEN_LIFETIME) {
-		$olderThan = $this->time->getTime() - $token_lifetime;
-		try {
-			$tokensToDelete = $this->getOlderThan($olderThan);
-		} catch (Exception $e) {
-			$this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
-			return;
-		}
-
-
-		$this->logger->debug('Invalidating ephemeral webhook tokens older than ' . date('c', $olderThan), ['app' => 'webhook_listeners']);
-		foreach ($tokensToDelete as $token) {
-			try {
-				$this->tokenMapper->delete($this->tokenMapper->getTokenById($token->getTokenId())); // delete token itself
-				$this->delete($token); // delete db row in webhook_tokens
-			} catch (Exception $e) {
-				$this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
-			}
-
-		}
-	}
+    public const TABLE_NAME = 'webhook_tokens';
+    public const TOKEN_LIFETIME = 1 * 1 * 60; // one hour in seconds
+
+    public function __construct(
+        IDBConnection $db,
+        private LoggerInterface $logger,
+        private ITimeFactory $time,
+        private PublicKeyTokenMapper $tokenMapper,
+    ) {
+        parent::__construct($db, self::TABLE_NAME, EphemeralToken::class);
+    }
+
+    /**
+     * @throws DoesNotExistException
+     * @throws MultipleObjectsReturnedException
+     * @throws Exception
+     */
+    public function getById(int $id): EphemeralToken {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->eq('id', $qb->createNamedParameter($id, IQueryBuilder::PARAM_INT)));
+
+        return $this->findEntity($qb);
+    }
+
+    /**
+     * @throws Exception
+     * @return EphemeralToken[]
+     */
+    public function getAll(): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName());
+
+        return $this->findEntities($qb);
+    }
+
+
+    /**
+     * @param int $olderThan
+     * @return EphemeralToken[]
+     * @throws Exception
+     */
+    public function getOlderThan($olderThan): array {
+        $qb = $this->db->getQueryBuilder();
+
+        $qb->select('*')
+            ->from($this->getTableName())
+            ->where($qb->expr()->lt('created_at', $qb->createNamedParameter($olderThan, IQueryBuilder::PARAM_INT)));
+
+        return $this->findEntities($qb);
+    }
+
+    /**
+     * @throws Exception
+     */
+    public function addEphemeralToken(
+        int $tokenId,
+        ?string $userId,
+        int $createdAt,
+    ): EphemeralToken {
+        $tempToken = EphemeralToken::fromParams(
+            [
+                'tokenId' => $tokenId,
+                'userId' => $userId,
+                'createdAt' => $createdAt,
+            ]
+        );
+        return $this->insert($tempToken);
+    }
+    public function invalidateOldTokens(int $token_lifetime = self::TOKEN_LIFETIME) {
+        $olderThan = $this->time->getTime() - $token_lifetime;
+        try {
+            $tokensToDelete = $this->getOlderThan($olderThan);
+        } catch (Exception $e) {
+            $this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
+            return;
+        }
+
+
+        $this->logger->debug('Invalidating ephemeral webhook tokens older than ' . date('c', $olderThan), ['app' => 'webhook_listeners']);
+        foreach ($tokensToDelete as $token) {
+            try {
+                $this->tokenMapper->delete($this->tokenMapper->getTokenById($token->getTokenId())); // delete token itself
+                $this->delete($token); // delete db row in webhook_tokens
+            } catch (Exception $e) {
+                $this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
+            }
+
+        }
+    }
 }

Spacing +3 added lines, -3 removed lines

@@ -102,18 +102,18 @@
 		try {
 			$tokensToDelete = $this->getOlderThan($olderThan);
 		} catch (Exception $e) {
-			$this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
+			$this->logger->error('Webhook token deletion failed: '.$e->getMessage(), ['exception' => $e]);
 			return;
 		}
 
 
-		$this->logger->debug('Invalidating ephemeral webhook tokens older than ' . date('c', $olderThan), ['app' => 'webhook_listeners']);
+		$this->logger->debug('Invalidating ephemeral webhook tokens older than '.date('c', $olderThan), ['app' => 'webhook_listeners']);
 		foreach ($tokensToDelete as $token) {
 			try {
 				$this->tokenMapper->delete($this->tokenMapper->getTokenById($token->getTokenId())); // delete token itself
 				$this->delete($token); // delete db row in webhook_tokens
 			} catch (Exception $e) {
-				$this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
+				$this->logger->error('Webhook token deletion failed: '.$e->getMessage(), ['exception' => $e]);
 			}
 
 		}

apps/webhook_listeners/lib/Db/WebhookListener.php

Indentation +127 added lines, -127 removed lines

@@ -27,131 +27,131 @@
  * @psalm-suppress PropertyNotSetInConstructor
  */
 class WebhookListener extends Entity implements \JsonSerializable {
-	/**
-	 * @var ?string id of the app_api application who added the webhook listener
-	 */
-	protected $appId = null;
-
-	/**
-	 * @var ?string id of the user who added the webhook listener
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $userId = null;
-
-	/**
-	 * @var string
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $httpMethod;
-
-	/**
-	 * @var string
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $uri;
-
-	/**
-	 * @var string
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $event;
-
-	/**
-	 * @var array
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $eventFilter;
-
-	/**
-	 * @var ?string
-	 *              If not empty, id of the user that needs to be connected for the webhook to trigger
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $userIdFilter;
-
-	/**
-	 * @var ?array
-	 */
-	protected $headers = null;
-
-	/**
-	 * @var string
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $authMethod;
-
-	/**
-	 * @var ?string
-	 */
-	protected $authData = null;
-
-	/**
-	 * @var array
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $tokenNeeded;
-
-	private ICrypto $crypto;
-
-
-	public function __construct(
-		?ICrypto $crypto = null,
-	) {
-		if ($crypto === null) {
-			$crypto = Server::get(ICrypto::class);
-		}
-		$this->crypto = $crypto;
-		$this->addType('appId', 'string');
-		$this->addType('userId', 'string');
-		$this->addType('httpMethod', 'string');
-		$this->addType('uri', 'string');
-		$this->addType('event', 'string');
-		$this->addType('eventFilter', 'json');
-		$this->addType('userIdFilter', 'string');
-		$this->addType('headers', 'json');
-		$this->addType('authMethod', 'string');
-		$this->addType('authData', 'string');
-		$this->addType('tokenNeeded', 'json');
-	}
-
-	public function getAuthMethodEnum(): AuthMethod {
-		return AuthMethod::from($this->getAuthMethod());
-	}
-
-	public function getAuthDataClear(): array {
-		$authData = $this->getAuthData();
-		if ($authData === null) {
-			return [];
-		}
-		return json_decode($this->crypto->decrypt($authData), associative:true, flags:JSON_THROW_ON_ERROR);
-	}
-
-	public function setAuthDataClear(
-		#[\SensitiveParameter]
-		?array $data,
-	): void {
-		if ($data === null) {
-			if ($this->getAuthMethodEnum() === AuthMethod::Header) {
-				throw new \UnexpectedValueException('Header auth method needs an associative array of headers as auth data');
-			}
-			$this->setAuthData(null);
-			return;
-		}
-		$this->setAuthData($this->crypto->encrypt(json_encode($data)));
-	}
-
-	public function jsonSerialize(): array {
-		$fields = array_keys($this->getFieldTypes());
-		return array_combine(
-			$fields,
-			array_map(
-				fn ($field) => $this->getter($field),
-				$fields
-			)
-		);
-	}
-
-	public function getAppId(): ?string {
-		return $this->appId;
-	}
+    /**
+     * @var ?string id of the app_api application who added the webhook listener
+     */
+    protected $appId = null;
+
+    /**
+     * @var ?string id of the user who added the webhook listener
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $userId = null;
+
+    /**
+     * @var string
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $httpMethod;
+
+    /**
+     * @var string
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $uri;
+
+    /**
+     * @var string
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $event;
+
+    /**
+     * @var array
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $eventFilter;
+
+    /**
+     * @var ?string
+     *              If not empty, id of the user that needs to be connected for the webhook to trigger
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $userIdFilter;
+
+    /**
+     * @var ?array
+     */
+    protected $headers = null;
+
+    /**
+     * @var string
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $authMethod;
+
+    /**
+     * @var ?string
+     */
+    protected $authData = null;
+
+    /**
+     * @var array
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $tokenNeeded;
+
+    private ICrypto $crypto;
+
+
+    public function __construct(
+        ?ICrypto $crypto = null,
+    ) {
+        if ($crypto === null) {
+            $crypto = Server::get(ICrypto::class);
+        }
+        $this->crypto = $crypto;
+        $this->addType('appId', 'string');
+        $this->addType('userId', 'string');
+        $this->addType('httpMethod', 'string');
+        $this->addType('uri', 'string');
+        $this->addType('event', 'string');
+        $this->addType('eventFilter', 'json');
+        $this->addType('userIdFilter', 'string');
+        $this->addType('headers', 'json');
+        $this->addType('authMethod', 'string');
+        $this->addType('authData', 'string');
+        $this->addType('tokenNeeded', 'json');
+    }
+
+    public function getAuthMethodEnum(): AuthMethod {
+        return AuthMethod::from($this->getAuthMethod());
+    }
+
+    public function getAuthDataClear(): array {
+        $authData = $this->getAuthData();
+        if ($authData === null) {
+            return [];
+        }
+        return json_decode($this->crypto->decrypt($authData), associative:true, flags:JSON_THROW_ON_ERROR);
+    }
+
+    public function setAuthDataClear(
+        #[\SensitiveParameter]
+        ?array $data,
+    ): void {
+        if ($data === null) {
+            if ($this->getAuthMethodEnum() === AuthMethod::Header) {
+                throw new \UnexpectedValueException('Header auth method needs an associative array of headers as auth data');
+            }
+            $this->setAuthData(null);
+            return;
+        }
+        $this->setAuthData($this->crypto->encrypt(json_encode($data)));
+    }
+
+    public function jsonSerialize(): array {
+        $fields = array_keys($this->getFieldTypes());
+        return array_combine(
+            $fields,
+            array_map(
+                fn ($field) => $this->getter($field),
+                $fields
+            )
+        );
+    }
+
+    public function getAppId(): ?string {
+        return $this->appId;
+    }
 }

apps/webhook_listeners/lib/Db/EphemeralToken.php

Indentation +33 added lines, -33 removed lines

@@ -18,37 +18,37 @@
  * @psalm-suppress PropertyNotSetInConstructor
  */
 class EphemeralToken extends Entity implements \JsonSerializable {
-	/**
-	 * @var int id of the token in the oc_authtoken db table
-	 */
-	protected $tokenId;
-
-	/**
-	 * @var ?string id of the user wich the token belongs to
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $userId = null;
-
-	/**
-	 * @var int token creation timestamp
-	 * @psalm-suppress PropertyNotSetInConstructor
-	 */
-	protected $createdAt;
-
-	public function __construct() {
-		$this->addType('tokenId', 'integer');
-		$this->addType('userId', 'string');
-		$this->addType('createdAt', 'integer');
-	}
-
-	public function jsonSerialize(): array {
-		$fields = array_keys($this->getFieldTypes());
-		return array_combine(
-			$fields,
-			array_map(
-				fn ($field) => $this->getter($field),
-				$fields
-			)
-		);
-	}
+    /**
+     * @var int id of the token in the oc_authtoken db table
+     */
+    protected $tokenId;
+
+    /**
+     * @var ?string id of the user wich the token belongs to
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $userId = null;
+
+    /**
+     * @var int token creation timestamp
+     * @psalm-suppress PropertyNotSetInConstructor
+     */
+    protected $createdAt;
+
+    public function __construct() {
+        $this->addType('tokenId', 'integer');
+        $this->addType('userId', 'string');
+        $this->addType('createdAt', 'integer');
+    }
+
+    public function jsonSerialize(): array {
+        $fields = array_keys($this->getFieldTypes());
+        return array_combine(
+            $fields,
+            array_map(
+                fn ($field) => $this->getter($field),
+                $fields
+            )
+        );
+    }
 }

apps/webhook_listeners/lib/BackgroundJobs/WebhookCall.php

Indentation +70 added lines, -70 removed lines

@@ -25,76 +25,76 @@
 use RuntimeException;
 
 class WebhookCall extends QueuedJob {
-	public function __construct(
-		private IClientService $clientService,
-		private ICertificateManager $certificateManager,
-		private WebhookListenerMapper $mapper,
-		private LoggerInterface $logger,
-		private IAppManager $appManager,
-		private TokenService $tokenService,
-		ITimeFactory $timeFactory,
-	) {
-		parent::__construct($timeFactory);
-	}
+    public function __construct(
+        private IClientService $clientService,
+        private ICertificateManager $certificateManager,
+        private WebhookListenerMapper $mapper,
+        private LoggerInterface $logger,
+        private IAppManager $appManager,
+        private TokenService $tokenService,
+        ITimeFactory $timeFactory,
+    ) {
+        parent::__construct($timeFactory);
+    }
 
-	/**
-	 * @param array $argument
-	 */
-	protected function run($argument): void {
-		[$data, $webhookId] = $argument;
-		$webhookListener = $this->mapper->getById($webhookId);
-		$client = $this->clientService->newClient();
+    /**
+     * @param array $argument
+     */
+    protected function run($argument): void {
+        [$data, $webhookId] = $argument;
+        $webhookListener = $this->mapper->getById($webhookId);
+        $client = $this->clientService->newClient();
 
-		// adding Ephemeral auth tokens to the call
-		$data['tokens'] = $this->tokenService->getTokens($webhookListener, $data['user']['uid'] ?? null);
-		$options = [
-			'verify' => $this->certificateManager->getAbsoluteBundlePath(),
-			'headers' => $webhookListener->getHeaders() ?? [],
-			'body' => json_encode($data),
-		];
-		try {
-			switch ($webhookListener->getAuthMethodEnum()) {
-				case AuthMethod::None:
-					break;
-				case AuthMethod::Header:
-					$authHeaders = $webhookListener->getAuthDataClear();
-					$options['headers'] = array_merge($options['headers'], $authHeaders);
-					break;
-			}
-			$webhookUri = $webhookListener->getUri();
-			$exAppId = $webhookListener->getAppId();
-			if ($exAppId !== null && str_starts_with($webhookUri, '/')) {
-				// ExApp is awaiting a direct request to itself using AppAPI
-				if (!$this->appManager->isEnabledForAnyone('app_api')) {
-					throw new RuntimeException('AppAPI is disabled or not installed.');
-				}
-				try {
-					$appApiFunctions = Server::get(PublicFunctions::class);
-				} catch (ContainerExceptionInterface|NotFoundExceptionInterface) {
-					throw new RuntimeException('Could not get AppAPI public functions.');
-				}
-				$exApp = $appApiFunctions->getExApp($exAppId);
-				if ($exApp === null) {
-					throw new RuntimeException('ExApp ' . $exAppId . ' is missing.');
-				} elseif (!$exApp['enabled']) {
-					throw new RuntimeException('ExApp ' . $exAppId . ' is disabled.');
-				}
-				$userId = ($data['user'] ?? [])['uid'] ?? null;
-				$response = $appApiFunctions->exAppRequest($exAppId, $webhookUri, $userId, $webhookListener->getHttpMethod(), [], $options);
-				if (is_array($response) && isset($response['error'])) {
-					throw new RuntimeException(sprintf('Error during request to ExApp(%s): %s', $exAppId, $response['error']));
-				}
-			} else {
-				$response = $client->request($webhookListener->getHttpMethod(), $webhookUri, $options);
-			}
-			$statusCode = $response->getStatusCode();
-			if ($statusCode >= 200 && $statusCode < 300) {
-				$this->logger->debug('Webhook returned status code ' . $statusCode, ['body' => $response->getBody()]);
-			} else {
-				$this->logger->warning('Webhook(' . $webhookId . ') returned unexpected status code ' . $statusCode, ['body' => $response->getBody()]);
-			}
-		} catch (\Exception $e) {
-			$this->logger->error('Webhook(' . $webhookId . ') call failed: ' . $e->getMessage(), ['exception' => $e]);
-		}
-	}
+        // adding Ephemeral auth tokens to the call
+        $data['tokens'] = $this->tokenService->getTokens($webhookListener, $data['user']['uid'] ?? null);
+        $options = [
+            'verify' => $this->certificateManager->getAbsoluteBundlePath(),
+            'headers' => $webhookListener->getHeaders() ?? [],
+            'body' => json_encode($data),
+        ];
+        try {
+            switch ($webhookListener->getAuthMethodEnum()) {
+                case AuthMethod::None:
+                    break;
+                case AuthMethod::Header:
+                    $authHeaders = $webhookListener->getAuthDataClear();
+                    $options['headers'] = array_merge($options['headers'], $authHeaders);
+                    break;
+            }
+            $webhookUri = $webhookListener->getUri();
+            $exAppId = $webhookListener->getAppId();
+            if ($exAppId !== null && str_starts_with($webhookUri, '/')) {
+                // ExApp is awaiting a direct request to itself using AppAPI
+                if (!$this->appManager->isEnabledForAnyone('app_api')) {
+                    throw new RuntimeException('AppAPI is disabled or not installed.');
+                }
+                try {
+                    $appApiFunctions = Server::get(PublicFunctions::class);
+                } catch (ContainerExceptionInterface|NotFoundExceptionInterface) {
+                    throw new RuntimeException('Could not get AppAPI public functions.');
+                }
+                $exApp = $appApiFunctions->getExApp($exAppId);
+                if ($exApp === null) {
+                    throw new RuntimeException('ExApp ' . $exAppId . ' is missing.');
+                } elseif (!$exApp['enabled']) {
+                    throw new RuntimeException('ExApp ' . $exAppId . ' is disabled.');
+                }
+                $userId = ($data['user'] ?? [])['uid'] ?? null;
+                $response = $appApiFunctions->exAppRequest($exAppId, $webhookUri, $userId, $webhookListener->getHttpMethod(), [], $options);
+                if (is_array($response) && isset($response['error'])) {
+                    throw new RuntimeException(sprintf('Error during request to ExApp(%s): %s', $exAppId, $response['error']));
+                }
+            } else {
+                $response = $client->request($webhookListener->getHttpMethod(), $webhookUri, $options);
+            }
+            $statusCode = $response->getStatusCode();
+            if ($statusCode >= 200 && $statusCode < 300) {
+                $this->logger->debug('Webhook returned status code ' . $statusCode, ['body' => $response->getBody()]);
+            } else {
+                $this->logger->warning('Webhook(' . $webhookId . ') returned unexpected status code ' . $statusCode, ['body' => $response->getBody()]);
+            }
+        } catch (\Exception $e) {
+            $this->logger->error('Webhook(' . $webhookId . ') call failed: ' . $e->getMessage(), ['exception' => $e]);
+        }
+    }
 }