Merge branch 'main' into occ-commands

nextcloud · Apr 17, 2024 · c1cc5b0 · c1cc5b0
2 parents 74a5d22 + e391299
commit c1cc5b0
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/lib/Service/ExAppService.php b/lib/Service/ExAppService.php
@@ -278,7 +278,11 @@ public function getAppInfo(string $appId, ?string $infoXml, ?string $jsonInfo):
 			}
 			$appInfo = json_decode(json_encode((array)$xmlAppInfo), true);
 			if (isset($appInfo['external-app']['scopes']['value'])) {
-				$appInfo['external-app']['scopes'] = $appInfo['external-app']['scopes']['value'];
+				if (is_array($appInfo['external-app']['scopes']['value'])) {
+					$appInfo['external-app']['scopes'] = $appInfo['external-app']['scopes']['value'];
+				} else {
+					$appInfo['external-app']['scopes'] = [$appInfo['external-app']['scopes']['value']];
+				}
 			}
 			if ($extractedDir) {
 				if (file_exists($extractedDir . '/l10n')) {
@@ -287,10 +291,6 @@ public function getAppInfo(string $appId, ?string $infoXml, ?string $jsonInfo):
 					$this->logger->info(sprintf('Application %s does not support translations', $appId));
 				}
 			}
-			# TO-DO: remove this in AppAPI 2.3.0
-			if (isset($appInfo['external-app']['scopes']['required']['value'])) {
-				$appInfo['external-app']['scopes'] = $appInfo['external-app']['scopes']['required']['value'];
-			}
 		}
 		return $appInfo;
 	}