fix(push): Make testing the push server easier

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Oct 10, 2024 · 34eb497 · 34eb497
1 parent 2881c0c
commit 34eb497
Showing 1 changed file with 9 additions and 5 deletions.
diff --git a/lib/Push.php b/lib/Push.php
@@ -422,6 +422,13 @@ protected function sendNotificationsToProxies(): void {
 			return;
 		}
 
+		$subscriptionAwareServer = rtrim($this->config->getAppValue(Application::APP_ID, 'subscription_aware_server', 'https://push-notifications.nextcloud.com'), '/');
+		if ($subscriptionAwareServer === 'https://push-notifications.nextcloud.com') {
+			$subscriptionKey = $this->config->getAppValue('support', 'subscription_key');
+		} else {
+			$subscriptionKey = $this->config->getSystemValueString('instanceid');
+		}
+
 		$client = $this->clientService->newClient();
 		foreach ($pushNotifications as $proxyServer => $notifications) {
 			try {
@@ -431,11 +438,8 @@ protected function sendNotificationsToProxies(): void {
 					],
 				];
 
-				if ($proxyServer === 'https://push-notifications.nextcloud.com') {
-					$subscriptionKey = $this->config->getAppValue('support', 'subscription_key');
-					if ($subscriptionKey) {
-						$requestData['headers']['X-Nextcloud-Subscription-Key'] = $subscriptionKey;
-					}
+				if ($subscriptionKey !== '' && $proxyServer === $subscriptionAwareServer) {
+					$requestData['headers']['X-Nextcloud-Subscription-Key'] = $subscriptionKey;
 				}
 
 				$response = $client->post($proxyServer . '/notifications', $requestData);