feat(webpush): Prepare webpush requests

Signed-off-by: sim <[email protected]>

lib/Push.php

@@ -63,10 +63,14 @@ class Push {
 	 * @psalm-var array<string, ?IUserStatus>
 	 */
 	protected array $userStatuses = [];
+	/**
+	 * @psalm-var array<string, list<array{id: int, uid: string, token: int, endpoint: string, p256dh: string, auth: string, appTypes: string, activated: bool, activation_token: string}>>
+	 */
+	protected array $userWebPushDevices = [];
 	/**
 	 * @psalm-var array<string, list<array{id: int, uid: string, token: int, deviceidentifier: string, devicepublickey: string, devicepublickeyhash: string, pushtokenhash: string, proxyserver: string, apptype: string}>>
 	 */
-	protected array $userDevices = [];
+	protected array $userProxyDevices = [];
 	/** @var string[] */
 	protected array $loadDevicesForUsers = [];
 	/** @var string[] */
@@ -113,10 +117,17 @@ public function flushPayloads(): void {
 
 		if (!empty($this->loadDevicesForUsers)) {
 			$this->loadDevicesForUsers = array_unique($this->loadDevicesForUsers);
-			$missingDevicesFor = array_diff($this->loadDevicesForUsers, array_keys($this->userDevices));
-			$newUserDevices = $this->getDevicesForUsers($missingDevicesFor);
-			foreach ($missingDevicesFor as $userId) {
-				$this->userDevices[$userId] = $newUserDevices[$userId] ?? [];
+			// Add missing web push devices
+			$missingWebPushDevicesFor = array_diff($this->loadDevicesForUsers, array_keys($this->userWebPushDevices));
+			$newUserWebPushDevices = $this->getWebPushDevicesForUsers($missingWebPushDevicesFor);
+			foreach ($missingWebPushDevicesFor as $userId) {
+				$this->userWebPushDevices[$userId] = $newUserWebPushDevices[$userId] ?? [];
+			}
+			// Add missing proxy devices
+			$missingProxyDevicesFor = array_diff($this->loadDevicesForUsers, array_keys($this->userProxyDevices));
+			$newUserProxyDevices = $this->getProxyDevicesForUsers($missingProxyDevicesFor);
+			foreach ($missingProxyDevicesFor as $userId) {
+				$this->userProxyDevices[$userId] = $newUserProxyDevices[$userId] ?? [];
 			}
 			$this->loadDevicesForUsers = [];
 		}
@@ -230,14 +241,20 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
 			}
 		}
 
-		if (!array_key_exists($notification->getUser(), $this->userDevices)) {
-			$devices = $this->getDevicesForUser($notification->getUser());
-			$this->userDevices[$notification->getUser()] = $devices;
+		if (!array_key_exists($notification->getUser(), $this->userWebPushDevices)) {
+			$webPushDevices = $this->getWebPushDevicesForUser($notification->getUser());
+			$this->userWebPushDevices[$notification->getUser()] = $webPushDevices;
+		} else {
+			$webPushDevices = $this->userWebPushDevices[$notification->getUser()];
+		}
+		if (!array_key_exists($notification->getUser(), $this->userProxyDevices)) {
+			$proxyDevices = $this->getProxyDevicesForUser($notification->getUser());
+			$this->userProxyDevices[$notification->getUser()] = $proxyDevices;
 		} else {
-			$devices = $this->userDevices[$notification->getUser()];
+			$proxyDevices = $this->userProxyDevices[$notification->getUser()];
 		}
 
-		if (empty($devices)) {
+		if (empty($proxyDevices) && empty($webPushDevices)) {
 			$this->printInfo('<comment>No devices found for user</comment>');
 			return;
 		}
@@ -258,6 +275,23 @@ public function pushToDevice(int $id, INotification $notification, ?OutputInterf
 			}
 		}
 
+		$this->webPushToDevice($id, $user, $webPushDevices, $notification, $output);
+		$this->proxyPushToDevice($id, $user, $proxyDevices, $notification, $output);
+	}
+
+	public function webPushToDevice(int $id, IUser $user, array $devices, INotification $notification, ?OutputInterface $output = null): void {
+		if (empty($devices)) {
+			$this->printInfo('<comment>No web push devices found for user</comment>');
+			return;
+		}
+	}
+
+	public function proxyPushToDevice(int $id, IUser $user, array $devices, INotification $notification, ?OutputInterface $output = null): void {
+		if (empty($devices)) {
+			$this->printInfo('<comment>No proxy devices found for user</comment>');
+			return;
+		}
+
 		$userKey = $this->keyManager->getKey($user);
 
 		$this->printInfo('Private user key size: ' . strlen($userKey->getPrivate()));
@@ -352,17 +386,46 @@ public function pushDeleteToDevice(string $userId, ?array $notificationIds, stri
 
 		$user = $this->createFakeUserObject($userId);
 
-		if (!array_key_exists($userId, $this->userDevices)) {
-			$devices = $this->getDevicesForUser($userId);
-			$this->userDevices[$userId] = $devices;
+		if (!array_key_exists($userId, $this->userWebPushDevices)) {
+			$webPushDevices = $this->getWebPushDevicesForUser($userId);
+			$this->userWebPushDevices[$userId] = $webPushDevices;
+		} else {
+			$webPushDevices = $this->userWebPushDevices[$userId];
+		}
+		if (!array_key_exists($userId, $this->userProxyDevices)) {
+			$proxyDevices = $this->getProxyDevicesForUser($userId);
+			$this->userProxyDevices[$userId] = $proxyDevices;
 		} else {
-			$devices = $this->userDevices[$userId];
+			$proxyDevices = $this->userProxyDevices[$userId];
 		}
 
 		if (!$deleteAll) {
 			// Only filter when it's not delete-all
-			$devices = $this->filterDeviceList($devices, $app);
+			$proxyDevices = $this->filterDeviceList($proxyDevices, $app);
+			//TODO filter webpush devices
 		}
+
+		$this->webPushDeleteToDevice($userId, $user, $webPushDevices, $notificationIds, $app);
+		$this->proxyPushDeleteToDevice($userId, $user, $proxyDevices, $notificationIds, $app);
+	}
+
+	/**
+	 * @param string $userId
+	 * @param ?int[] $notificationIds
+	 * @param string $app
+	 */
+	public function webPushDeleteToDevice(string $userId, IUser $user, array $devices, ?array $notificationIds, string $app = ''): void {
+		if (empty($devices)) {
+			return;
+		}
+	}
+
+	/**
+	 * @param string $userId
+	 * @param ?int[] $notificationIds
+	 * @param string $app
+	 */
+	public function proxyPushDeleteToDevice(string $userId, IUser $user, array $devices, ?array $notificationIds, string $app = ''): void {
 		if (empty($devices)) {
 			return;
 		}
@@ -715,7 +778,7 @@ protected function encryptAndSignDelete(Key $userKey, array $device, ?array $ids
 	 * @return array[]
 	 * @psalm-return list<array{id: int, uid: string, token: int, deviceidentifier: string, devicepublickey: string, devicepublickeyhash: string, pushtokenhash: string, proxyserver: string, apptype: string}>
 	 */
-	protected function getDevicesForUser(string $uid): array {
+	protected function getProxyDevicesForUser(string $uid): array {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
 			->from('notifications_pushhash')
@@ -733,7 +796,7 @@ protected function getDevicesForUser(string $uid): array {
 	 * @return array[]
 	 * @psalm-return array<string, list<array{id: int, uid: string, token: int, deviceidentifier: string, devicepublickey: string, devicepublickeyhash: string, pushtokenhash: string, proxyserver: string, apptype: string}>>
 	 */
-	protected function getDevicesForUsers(array $userIds): array {
+	protected function getProxyDevicesForUsers(array $userIds): array {
 		$query = $this->db->getQueryBuilder();
 		$query->select('*')
 			->from('notifications_pushhash')
@@ -753,6 +816,50 @@ protected function getDevicesForUsers(array $userIds): array {
 		return $devices;
 	}
 
+
+	/**
+	 * @param string $uid
+	 * @return array[]
+	 * @psalm-return list<array{id: int, uid: string, token: int, endpoint: string, p256dh: string, auth: string, appTypes: string, activated: bool, activation_token: string}>
+	 */
+	protected function getWebPushDevicesForUser(string $uid): array {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from('notifications_webpush')
+			->where($query->expr()->eq('uid', $query->createNamedParameter($uid)));
+
+		$result = $query->executeQuery();
+		$devices = $result->fetchAll();
+		$result->closeCursor();
+
+		return $devices;
+	}
+
+	/**
+	 * @param string[] $userIds
+	 * @return array[]
+	 * @psalm-return array<string, list<array{id: int, uid: string, token: int, endpoint: string, p256dh: string, auth: string, appTypes: string, activated: bool, activation_token: string}>>
+	 */
+	protected function getWebPushDevicesForUsers(array $userIds): array {
+		$query = $this->db->getQueryBuilder();
+		$query->select('*')
+			->from('notifications_webpush')
+			->where($query->expr()->in('uid', $query->createNamedParameter($userIds, IQueryBuilder::PARAM_STR_ARRAY)));
+
+		$devices = [];
+		$result = $query->executeQuery();
+		while ($row = $result->fetch()) {
+			if (!isset($devices[$row['uid']])) {
+				$devices[$row['uid']] = [];
+			}
+			$devices[$row['uid']][] = $row;
+		}
+
+		$result->closeCursor();
+
+		return $devices;
+	}
+
 	/**
 	 * @param int $tokenId
 	 * @return bool

tests/Unit/PushTest.php

@@ -141,8 +141,8 @@ public function testPushToDeviceNoInternet(): void {
 		$push->pushToDevice(23, $notification);
 	}
 
-	public function testPushToDeviceNoDevices(): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser']);
+	public function testProxyPushToDeviceNoDevices(): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser']);
 		$this->keyManager->expects($this->never())
 			->method('getKey');
 		$this->clientService->expects($this->never())
@@ -168,14 +168,14 @@ public function testPushToDeviceNoDevices(): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([]);
 
 		$push->pushToDevice(42, $notification);
 	}
 
-	public function testPushToDeviceNotPrepared(): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser']);
+	public function testProxyPushToDeviceNotPrepared(): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser']);
 		$this->keyManager->expects($this->never())
 			->method('getKey');
 		$this->clientService->expects($this->never())
@@ -201,7 +201,7 @@ public function testPushToDeviceNotPrepared(): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([[
 				'proxyserver' => 'proxyserver1',
 				'token' => 'token1',
@@ -220,8 +220,8 @@ public function testPushToDeviceNotPrepared(): void {
 		$push->pushToDevice(1337, $notification);
 	}
 
-	public function testPushToDeviceInvalidToken(): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser', 'encryptAndSign', 'deletePushToken']);
+	public function testProxyPushToDeviceInvalidToken(): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser', 'encryptAndSign', 'deletePushToken']);
 		$this->clientService->expects($this->never())
 			->method('newClient');
 
@@ -245,7 +245,7 @@ public function testPushToDeviceInvalidToken(): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([[
 				'proxyserver' => 'proxyserver1',
 				'token' => 23,
@@ -285,8 +285,8 @@ public function testPushToDeviceInvalidToken(): void {
 		$push->pushToDevice(2018, $notification);
 	}
 
-	public function testPushToDeviceEncryptionError(): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken']);
+	public function testProxyPushToDeviceEncryptionError(): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken']);
 		$this->clientService->expects($this->never())
 			->method('newClient');
 
@@ -310,7 +310,7 @@ public function testPushToDeviceEncryptionError(): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([[
 				'proxyserver' => 'proxyserver1',
 				'token' => 23,
@@ -349,8 +349,8 @@ public function testPushToDeviceEncryptionError(): void {
 
 		$push->pushToDevice(1970, $notification);
 	}
-	public function testPushToDeviceNoFairUse(): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken', 'deletePushTokenByDeviceIdentifier']);
+	public function testProxyPushToDeviceNoFairUse(): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken', 'deletePushTokenByDeviceIdentifier']);
 
 		/** @var INotification&MockObject $notification */
 		$notification = $this->createMock(INotification::class);
@@ -367,7 +367,7 @@ public function testPushToDeviceNoFairUse(): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([
 				[
 					'proxyserver' => 'proxyserver',
@@ -427,18 +427,18 @@ public function testPushToDeviceNoFairUse(): void {
 		$push->pushToDevice(207787, $notification);
 	}
 
-	public static function dataPushToDeviceSending(): array {
+	public static function dataProxyPushToDeviceSending(): array {
 		return [
 			[true],
 			[false],
 		];
 	}
 
 	/**
-	 * @dataProvider dataPushToDeviceSending
+	 * @dataProvider dataProxyPushToDeviceSending
 	 */
-	public function testPushToDeviceSending(bool $isDebug): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken', 'deletePushTokenByDeviceIdentifier']);
+	public function testProxyPushToDeviceSending(bool $isDebug): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken', 'deletePushTokenByDeviceIdentifier']);
 
 		/** @var INotification&MockObject $notification */
 		$notification = $this->createMock(INotification::class);
@@ -455,7 +455,7 @@ public function testPushToDeviceSending(bool $isDebug): void {
 			->willReturn($user);
 
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn([
 				[
 					'proxyserver' => 'proxyserver1',
@@ -650,7 +650,7 @@ public function testPushToDeviceSending(bool $isDebug): void {
 		$push->pushToDevice(207787, $notification);
 	}
 
-	public static function dataPushToDeviceTalkNotification(): array {
+	public static function dataProxyPushToDeviceTalkNotification(): array {
 		return [
 			[['nextcloud'], false, 0],
 			[['nextcloud'], true, 0],
@@ -664,11 +664,11 @@ public static function dataPushToDeviceTalkNotification(): array {
 	}
 
 	/**
-	 * @dataProvider dataPushToDeviceTalkNotification
+	 * @dataProvider dataProxyPushToDeviceTalkNotification
 	 * @param string[] $deviceTypes
 	 */
-	public function testPushToDeviceTalkNotification(array $deviceTypes, bool $isTalkNotification, ?int $pushedDevice): void {
-		$push = $this->getPush(['createFakeUserObject', 'getDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken']);
+	public function testProxyPushToDeviceTalkNotification(array $deviceTypes, bool $isTalkNotification, ?int $pushedDevice): void {
+		$push = $this->getPush(['createFakeUserObject', 'getProxyDevicesForUser', 'encryptAndSign', 'deletePushToken', 'validateToken']);
 
 		/** @var INotification&MockObject $notification */
 		$notification = $this->createMock(INotification::class);
@@ -703,7 +703,7 @@ public function testPushToDeviceTalkNotification(array $deviceTypes, bool $isTal
 			];
 		}
 		$push->expects($this->once())
-			->method('getDevicesForUser')
+			->method('getProxyDevicesForUser')
 			->willReturn($devices);
 
 		$this->l10nFactory