Check if the SIP is configured

Signed-off-by: Joas Schilling <[email protected]>

lib/Config.php

@@ -71,6 +71,11 @@ public function getSIPGroups(): array {
 		return \is_array($groups) ? $groups : [];
 	}
 
+	public function isSIPConfigured(): bool {
+		return $this->getSIPSharedSecret() !== ''
+			&& $this->getDialInInfo() !== '';
+	}
+
 	public function getDialInInfo(): string {
 		return $this->config->getAppValue('spreed', 'sip_bridge_dial-in_info');
 	}

lib/Controller/WebinarController.php

@@ -25,6 +25,7 @@
 
 namespace OCA\Talk\Controller;
 
+use OCA\Talk\Config;
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Utility\ITimeFactory;
@@ -34,12 +35,16 @@ class WebinarController extends AEnvironmentAwareController {
 
 	/** @var ITimeFactory */
 	protected $timeFactory;
+	/** @var Config */
+	protected $talkConfig;
 
 	public function __construct(string $appName,
 								IRequest $request,
-								ITimeFactory $timeFactory) {
+								ITimeFactory $timeFactory,
+								Config $talkConfig) {
 		parent::__construct($appName, $request);
 		$this->timeFactory = $timeFactory;
+		$this->talkConfig = $talkConfig;
 	}
 
 	/**
@@ -76,8 +81,11 @@ public function setLobby(int $state, ?int $timer = null): DataResponse {
 	 * @return DataResponse
 	 */
 	public function setSIPEnabled(int $state): DataResponse {
-		// TODO Check if user is in "SIP groups"
+		if (!$this->talkConfig->isSIPConfigured()) {
+			return new DataResponse([], Http::STATUS_PRECONDITION_FAILED);
+		}
 
+		// TODO Check if user is in "SIP groups"
 		if (!$this->room->setSIPEnabled($state)) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}

lib/Manager.php

@@ -50,6 +50,8 @@ class Manager {
 	private $db;
 	/** @var IConfig */
 	private $config;
+	/** @var Config */
+	private $talkConfig;
 	/** @var ISecureRandom */
 	private $secureRandom;
 	/** @var IUserManager */
@@ -69,6 +71,7 @@ class Manager {
 
 	public function __construct(IDBConnection $db,
 								IConfig $config,
+								Config $talkConfig,
 								ISecureRandom $secureRandom,
 								IUserManager $userManager,
 								CommentsManager $commentsManager,
@@ -79,6 +82,7 @@ public function __construct(IDBConnection $db,
 								IL10N $l) {
 		$this->db = $db;
 		$this->config = $config;
+		$this->talkConfig = $talkConfig;
 		$this->secureRandom = $secureRandom;
 		$this->userManager = $userManager;
 		$this->commentsManager = $commentsManager;
@@ -806,10 +810,9 @@ protected function getRoomNameByParticipants(Room $room): string {
 	 * @return string
 	 */
 	protected function getNewToken(): string {
-		$sipConfig = $this->config->getAppValue('spreed', 'sip_config', ''); // FIXME adjust config name
 		$entropy = (int) $this->config->getAppValue('spreed', 'token_entropy', 8);
 		$entropy = max(8, $entropy); // For update cases
-		$digitsOnly = $sipConfig !== '';
+		$digitsOnly = $this->talkConfig->isSIPConfigured();
 		if ($digitsOnly) {
 			// Increase default token length as we only use numbers
 			$entropy = max(10, $entropy);

lib/Room.php

@@ -701,7 +701,9 @@ public function setSIPEnabled(int $newSipEnabled): bool {
 			return false;
 		}
 
-		$event = new ModifyRoomEvent($this, 'sipStatus', $newSipEnabled, $oldSipEnabled);
+		// FIXME check if SIP is enabled/configured
+
+		$event = new ModifyRoomEvent($this, 'sipEnabled', $newSipEnabled, $oldSipEnabled);
 		$this->dispatcher->dispatch(self::EVENT_BEFORE_SIP_ENABLED_SET, $event);
 
 		$query = $this->db->getQueryBuilder();