Merge pull request #6812 from nextcloud/bugfix/6811/dont-force-signaling-mode-when-hpb-trial-is-used

Don't force signaling mode when HPB trial is used

lib/BackgroundJob/CheckHostedSignalingServer.php

@@ -93,7 +93,7 @@ class CheckHostedSignalingServer extends TimedJob {
 		if ($oldStatus !== $newStatus) {
 			if ($oldStatus === 'active') {
 				// remove signaling servers if account is not active anymore
-				$this->config->setAppValue('spreed', 'signaling_mode', 'internal');
+				$this->config->deleteAppValue('spreed', 'signaling_mode');
 				$this->config->deleteAppValue('spreed', 'signaling_servers');
 
 				$notificationSubject = 'removed';
@@ -101,7 +101,7 @@ class CheckHostedSignalingServer extends TimedJob {
 
 			if ($newStatus === 'active') {
 				// add signaling servers if account got active
-				$this->config->setAppValue('spreed', 'signaling_mode', 'external');
+				$this->config->deleteAppValue('spreed', 'signaling_mode');
 				$this->config->setAppValue('spreed', 'signaling_servers', json_encode([
 					'servers' => [
 						[
@@ -128,7 +128,6 @@ class CheckHostedSignalingServer extends TimedJob {
 			$oldAccountInfo['signaling']['url'] !== $accountInfo['signaling']['url'] ||
 			$oldAccountInfo['signaling']['secret'] !== $accountInfo['signaling']['secret'])
 		) {
-			$this->config->setAppValue('spreed', 'signaling_mode', 'external');
 			$this->config->setAppValue('spreed', 'signaling_servers', json_encode([
 				'servers' => [
 					[

lib/Controller/HostedSignalingServerController.php

@@ -121,7 +121,7 @@ class HostedSignalingServerController extends OCSController {
 			$this->config->deleteAppValue('spreed', 'hosted-signaling-server-account-id');
 
 			// remove signaling servers if account is not active anymore
-			$this->config->setAppValue('spreed', 'signaling_mode', 'internal');
+			$this->config->deleteAppValue('spreed', 'signaling_mode');
 			$this->config->deleteAppValue('spreed', 'signaling_servers');
 
 			$this->logger->info('Deleted hosted signaling server account with ID ' . $accountId);

tests/php/BackgroundJob/CheckHostedSignalingServerTest.php

@@ -114,10 +114,14 @@ class CheckHostedSignalingServerTest extends TestCase {
 				['spreed', 'hosted-signaling-server-account-id', '', 'my-account-id'],
 				['spreed', 'hosted-signaling-server-account', '{}', '{"status": "pending"}']
 			]));
-		$this->config->expects($this->exactly(4))
+		$this->config->expects($this->once())
+			->method('deleteAppValue')
+			->withConsecutive(
+				['spreed', 'signaling_mode'],
+			);
+		$this->config->expects($this->exactly(3))
 			->method('setAppValue')
 			->withConsecutive(
-				['spreed', 'signaling_mode', 'external'],
 				['spreed', 'signaling_servers', '{"servers":[{"server":"signaling-url","verify":true}],"secret":"signaling-secret"}'],
 				['spreed', 'hosted-signaling-server-account', json_encode($newStatus)],
 				['spreed', 'hosted-signaling-server-account-last-checked', null]