Merge pull request #23 from pdsinterop/fix/trustedApps-merge

fix merge of trusted apps

Author: ylebre

lib/Routes/SolidStorage.php

@@ -48,10 +48,16 @@ public static function respondToStorage() {
 			$origin = $rawRequest->getHeaderLine("Origin");
 
 			// FIXME: Read allowed clients from the profile instead;
-			// $owner = StorageServer::getOwner();
-			$ownerWebId = StorageServer::getOwnerWebId();
+
+      $ownerWebId = StorageServer::getOwnerWebId();
 			$owner = User::getUserByWebId($ownerWebId);
-			$allowedOrigins = ($owner['allowedOrigins'] ?? []) + (TRUSTED_APPS ?? []);
+
+			$allowedClients = $owner['allowedClients'] ?? [];
+			$allowedOrigins = array_merge(
+				($owner['allowedOrigins'] ?? []),
+				(TRUSTED_APPS ?? [])
+			);
+			$allowedOrigins = array_unique($allowedOrigins);
 
 			if (!isset($origin) || ($origin === "")) {
 				$allowedOrigins[] = "app://unset"; // FIXME: this should not be here.

lib/Routes/SolidUserProfile.php

@@ -46,7 +46,11 @@ public static function respondToProfile() {
 			$owner = ProfileServer::getOwner();
 
 			$allowedClients = $owner['allowedClients'] ?? [];
-			$allowedOrigins = ($owner['allowedOrigins'] ?? []) + (TRUSTED_APPS ?? []);
+			$allowedOrigins = array_merge(
+				($owner['allowedOrigins'] ?? []),
+				(TRUSTED_APPS ?? [])
+			);
+			$allowedOrigins = array_unique($allowedOrigins);
 			if (!isset($origin) || ($origin === "")) {
 				$allowedOrigins[] = "app://unset"; // FIXME: this should not be here.
 				$origin = "app://unset";