feat: error handling

Signed-off-by: Jana Peper <[email protected]>

Author: janepie

apps/webhook_listeners/lib/Db/EphemeralTokenMapper.php

@@ -110,8 +110,14 @@ public function invalidateOldTokens(int $token_lifetime = self::TOKEN_LIFETIME)
 
 		$this->logger->debug('Invalidating ephemeral webhook tokens older than ' . date('c', $olderThan), ['app' => 'webhook_listeners']);
 		foreach ($tokensToDelete as $token) {
-			$this->tokenMapper->invalidate($this->tokenMapper->getTokenById($token->getTokenId())->getToken()); // delete token itself
-			$this->deleteByTokenId($token->getTokenId()); // delete db row in webhook_tokens
+			try{
+				$this->tokenMapper->invalidate($this->tokenMapper->getTokenById($token->getTokenId())->getToken()); // delete token itself
+				$this->deleteByTokenId($token->getTokenId()); // delete db row in webhook_tokens
+			}
+			catch(Exception $e){
+				$this->logger->error('Webhook token deletion failed: ' . $e->getMessage(), ['exception' => $e]);
+			}
+			
 		}
 	}
 }

apps/webhook_listeners/lib/Service/TokenService.php

@@ -18,12 +18,14 @@
 use OCP\IUserManager;
 use OCP\L10N\IFactory;
 use OCP\Security\ISecureRandom;
+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,
@@ -39,7 +41,7 @@ public function __construct(
 	 *
 	 * @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>}}
+	 * @return array{user_ids?:list<string>,user_roles?:array{owner?:array<string,string>,trigger?:array<string,string>}}
 	 */
 	public function getTokens(WebhookListener $webhookListener, ?string $triggerUserId): array {
 		$tokens = [
@@ -49,7 +51,13 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
 		$tokenNeeded = $webhookListener->getTokenNeeded();
 		if (isset($tokenNeeded['user_ids'])) {
 			foreach ($tokenNeeded['user_ids'] as $userId) {
-				$tokens['user_ids'][$userId] = $this->createEphemeralToken($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'])) {
@@ -74,6 +82,9 @@ public function getTokens(WebhookListener $webhookListener, ?string $triggerUser
 							$triggerUserId => $this->createEphemeralToken($triggerUserId)
 						];
 						break;
+					default:
+						$this->logger->error('Webhook token creation for user role ' . $function . ' not defined. ' . $e->getMessage(), ['exception' => $e]);
+						
 				}
 			}
 		}