feat(webpush): Fix psalm CI

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

lib/Push.php

@@ -641,8 +641,8 @@ protected function webPushCallback(MessageSentReport $report): void {
 		if ($report->isSubscriptionExpired()) {
 			$this->deleteWebPushTokenByEndpoint($report->getEndpoint());
 		} elseif ($report->getResponse()?->getStatusCode() === 429) {
-			$retryAfter = $report->getResponse()?->getHeader('Retry-After');
-			$this->cache->set('wp.' . $report->getEndpoint(), true, $retryAfter ?? 60);
+			$retryAfter = (int)($report->getResponse()?->getHeader('Retry-After')[0] ?? "60");
+			$this->cache->set('wp.' . $report->getEndpoint(), true, $retryAfter);
 		}
 	}
 
@@ -851,7 +851,7 @@ protected function encodeNotif(int $id, INotification $notification, int $maxLen
 	/**
 	 * @param ?int[] $ids
 	 * @return array
-	 * @psalm-return array{remaining: list<int>, data: array{delete-all: bool, nid: int, delete: bool, nids: int[], delete-multiple: int}}
+	 * @psalm-return array{data: array{'delete-all'?: true, 'delete-multiple'?: true, delete?: true, nid?: int, nids?: int[]}, remaining: int[]}
 	 */
 	protected function encodeDeleteNotifs(?array $ids): array {
 		$remainingIds = [];

lib/WebPushClient.php

@@ -19,7 +19,7 @@
 
 class WebPushClient {
 	private WebPush $client;
-	/** @psalm-var array{publicKey: string, privateKey: string} */
+	/** @psalm-var array{publicKey: string, privateKey: string, subject: string} */
 	private array $vapid;
 
 	public function __construct(
@@ -62,10 +62,10 @@ private function getClient(): WebPush {
 
 	/**
 	 * @return array
-	 * @psalm-return array{publicKey: string, privateKey: string}
+	 * @psalm-return array{publicKey: string, privateKey: string, subject: string}
 	 */
 	private function getVapid(): array {
-		if (!empty($this->vapid) && array_key_exists('publicKey', $this->vapid) && array_key_exists('privateKey', $this->vapid)) {
+		if (array_key_exists('publicKey', $this->vapid) && array_key_exists('privateKey', $this->vapid) && array_key_exists('subject', $this->vapid) ) {
 			return $this->vapid;
 		}
 		$publicKey = $this->appConfig->getValueString(
@@ -79,7 +79,8 @@ private function getVapid(): array {
 			lazy: true
 		);
 		if ($publicKey === '' || $privateKey === '') {
-			$this->vapid = VAPID::createVapidKeys();
+			/** @var array{publicKey: string, privateKey: string} $vapid */
+			$vapid = VAPID::createVapidKeys();
 			$this->appConfig->setValueString(
 				Application::APP_ID,
 				'webpush_vapid_pubkey',
@@ -95,13 +96,13 @@ private function getVapid(): array {
 				sensitive: true
 			);
 		} else {
-			$this->vapid = [
+			$vapid = [
 				'publicKey' => $publicKey,
 				'privateKey' => $privateKey,
 			];
 		}
-		$this->vapid['subject'] = 'https://github.com/nextcloud/notifications';
-		return $this->vapid;
+		$vapid['subject'] = 'https://github.com/nextcloud/notifications';
+		return $this->vapid = $vapid;
 	}
 
 	/**

tests/psalm-baseline.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="6.12.0@cf420941d061a57050b6c468ef2c778faf40aee2">
+<files psalm-version="6.13.1@1e3b7f0a8ab32b23197b91107adc0a7ed8a05b51">
   <file src="lib/Controller/PushController.php">
     <UndefinedClass>
       <code><![CDATA[$this->identityProof]]></code>
@@ -9,29 +9,48 @@
       <code><![CDATA[protected]]></code>
     </UndefinedClass>
   </file>
+  <file src="lib/Controller/WebPushController.php">
+    <UndefinedClass>
+      <code><![CDATA[$this->tokenProvider]]></code>
+      <code><![CDATA[$this->tokenProvider]]></code>
+      <code><![CDATA[$this->tokenProvider]]></code>
+      <code><![CDATA[Uuid]]></code>
+      <code><![CDATA[protected]]></code>
+      <code><![CDATA[protected]]></code>
+    </UndefinedClass>
+  </file>
   <file src="lib/Push.php">
     <LessSpecificReturnStatement>
+      <code><![CDATA[$devices]]></code>
       <code><![CDATA[$devices]]></code>
       <code><![CDATA[$otherDevices]]></code>
       <code><![CDATA[$otherDevices]]></code>
       <code><![CDATA[$talkDevices]]></code>
+      <code><![CDATA[array_filter($devices, function ($device) use ($app) {
+			$apptypes = explode(',', $device['apptypes']);
+			return $device['activated'] && (\in_array($app, $apptypes)
+				|| (\in_array('all', $apptypes) && !\in_array('-' . $app, $apptypes)));
+		})]]></code>
     </LessSpecificReturnStatement>
     <MoreSpecificReturnType>
       <code><![CDATA[list<array{id: int, uid: string, token: int, deviceidentifier: string, devicepublickey: string, devicepublickeyhash: string, pushtokenhash: string, proxyserver: string, apptype: string}>]]></code>
       <code><![CDATA[list<array{id: int, uid: string, token: int, deviceidentifier: string, devicepublickey: string, devicepublickeyhash: string, pushtokenhash: string, proxyserver: string, apptype: string}>]]></code>
+      <code><![CDATA[list<array{id: int, uid: string, token: int, endpoint: string, p256dh: string, auth: string, apptypes: string, activated: bool, activation_token: string}>]]></code>
+      <code><![CDATA[list<array{id: int, uid: string, token: int, endpoint: string, p256dh: string, auth: string, apptypes: string, activated: bool, activation_token: string}>]]></code>
     </MoreSpecificReturnType>
     <UndefinedClass>
-      <code><![CDATA[$e]]></code>
-      <code><![CDATA[$e]]></code>
       <code><![CDATA[$this->keyManager]]></code>
       <code><![CDATA[$this->keyManager]]></code>
       <code><![CDATA[$this->tokenProvider]]></code>
-      <code><![CDATA[ClientException]]></code>
       <code><![CDATA[Key]]></code>
       <code><![CDATA[Key]]></code>
-      <code><![CDATA[ServerException]]></code>
       <code><![CDATA[protected]]></code>
       <code><![CDATA[protected]]></code>
     </UndefinedClass>
   </file>
+  <file src="lib/WebPushClient.php">
+    <RedundantPropertyInitializationCheck>
+      <code><![CDATA[isset($this->client)]]></code>
+    </RedundantPropertyInitializationCheck>
+  </file>
 </files>