Show a warning when the HPB does not support dialout

Signed-off-by: Joas Schilling <coding@schilljs.com>
nextcloud · Oct 30, 2023 · 76ebcb2 · 76ebcb2
1 parent 7c3d9f3
commit 76ebcb2
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 3 deletions.
diff --git a/lib/Controller/SignalingController.php b/lib/Controller/SignalingController.php
@@ -291,6 +291,15 @@ public function getWelcomeMessage(int $serverId): DataResponse {
 				], Http::STATUS_INTERNAL_SERVER_ERROR);
 			}
 
+			$missingFeatures = $this->signalingManager->getSignalingServerMissingFeatures($response);
+			if (!empty($missingFeatures)) {
+				return new DataResponse([
+					'warning' => 'UPDATE_OPTIONAL',
+					'features' => $missingFeatures,
+					'version' => $data['version'] ?? '',
+				]);
+			}
+
 			return new DataResponse($data);
 		} catch (ConnectException $e) {
 			return new DataResponse(['error' => 'CAN_NOT_CONNECT'], Http::STATUS_INTERNAL_SERVER_ERROR);

diff --git a/lib/Signaling/Manager.php b/lib/Signaling/Manager.php
@@ -55,6 +55,16 @@ public function isCompatibleSignalingServer(IResponse $response): bool {
 			&& in_array('switchto', $features, true);
 	}
 
+	public function getSignalingServerMissingFeatures(IResponse $response): array {
+		$featureHeader = $response->getHeader(self::FEATURE_HEADER);
+		$features = explode(',', $featureHeader);
+		$features = array_map('trim', $features);
+
+		return array_values(array_diff([
+			'dialout',
+		], $features));
+	}
+
 	public function getSignalingServerLinkForConversation(?Room $room): string {
 		if ($this->talkConfig->getSignalingMode() === Config::SIGNALING_INTERNAL) {
 			return '';

diff --git a/src/components/AdminSettings/SignalingServer.vue b/src/components/AdminSettings/SignalingServer.vue
@@ -48,15 +48,17 @@
 
 		<span v-if="server" class="test-connection">
 			<NcLoadingIcon v-if="!checked" :size="20" />
-			<AlertCircle v-else-if="errorMessage" :size="20" :fill-color="'#E9322D'" />
-			<Check v-else :size="20" :fill-color="'#46BA61'" />
+			<AlertCircle v-else-if="errorMessage" :size="20" :fill-color="'#D91812'" />
+			<AlertCircleOutline v-else-if="warningMessage" :size="20" :fill-color="'#C28900'" />
+			<Check v-else :size="20" :fill-color="'#2D7B41'" />
 			{{ connectionState }}
 		</span>
 	</li>
 </template>
 
 <script>
 import AlertCircle from 'vue-material-design-icons/AlertCircle.vue'
+import AlertCircleOutline from 'vue-material-design-icons/AlertCircleOutline.vue'
 import Check from 'vue-material-design-icons/Check.vue'
 import Delete from 'vue-material-design-icons/Delete.vue'
 
@@ -72,6 +74,7 @@ export default {
 
 	components: {
 		AlertCircle,
+		AlertCircleOutline,
 		Check,
 		Delete,
 		NcButton,
@@ -108,6 +111,7 @@ export default {
 		return {
 			checked: false,
 			errorMessage: '',
+			warningMessage: '',
 			versionFound: '',
 		}
 	},
@@ -120,6 +124,9 @@ export default {
 			if (this.errorMessage) {
 				return this.errorMessage
 			}
+			if (this.warningMessage) {
+				return this.warningMessage
+			}
 			return t('spreed', 'OK: Running version: {version}', {
 				version: this.versionFound,
 			})
@@ -155,12 +162,20 @@ export default {
 			this.checked = false
 
 			this.errorMessage = ''
+			this.warningMessage = ''
 			this.versionFound = ''
 
 			try {
 				const response = await getWelcomeMessage(this.index)
 				this.checked = true
-				this.versionFound = response.data.ocs.data.version
+				const data = response.data.ocs.data
+				this.versionFound = data.version
+				if (data.warning === 'UPDATE_OPTIONAL') {
+					this.warningMessage = t('spreed', 'Warning: Running version: {version}; Server does not support all features of this Talk version, missing features: {features}', {
+						version: this.versionFound,
+						features: data.features.join(', '),
+					})
+				}
 			} catch (exception) {
 				this.checked = true
 				const data = exception.response.data.ocs.data