Merge pull request #7726 from nextcloud/feat/hide-fields-in-json

fix(federation): hide not required json fields

Author: grnd-alt

lib/Db/Acl.php

@@ -65,4 +65,11 @@ public function getPermission(int $permission): bool {
 			default => false,
 		};
 	}
+
+	public function jsonSerialize(): array {
+		$json = parent::jsonSerialize();
+		unset($json['token']);
+
+		return $json;
+	}
 }

tests/data/deck.json

@@ -434,8 +434,7 @@
                     "permissionEdit": true,
                     "permissionShare": false,
                     "permissionManage": false,
-                    "owner": false,
-                    "token": null
+                    "owner": false
                 },
                 {
                     "id": 5,
@@ -450,8 +449,7 @@
                     "permissionEdit": false,
                     "permissionShare": true,
                     "permissionManage": false,
-                    "owner": false,
-                    "token": null
+                    "owner": false
                 },
                 {
                     "id": 6,
@@ -466,8 +464,7 @@
                     "permissionEdit": false,
                     "permissionShare": false,
                     "permissionManage": true,
-                    "owner": false,
-                    "token": null
+                    "owner": false
                 }
             ],
             "permissions": {

tests/unit/Db/AclTest.php

@@ -59,8 +59,7 @@ public function testJsonSerialize() {
 			'permissionEdit' => true,
 			'permissionShare' => true,
 			'permissionManage' => true,
-			'owner' => false,
-			'token' => null
+			'owner' => false
 		], $acl->jsonSerialize());
 		$acl = $this->createAclGroup();
 		$this->assertEquals([
@@ -71,8 +70,7 @@ public function testJsonSerialize() {
 			'permissionEdit' => true,
 			'permissionShare' => true,
 			'permissionManage' => true,
-			'owner' => false,
-			'token' => null
+			'owner' => false
 		], $acl->jsonSerialize());
 	}
 
@@ -87,8 +85,7 @@ public function testSetOwner() {
 			'permissionEdit' => true,
 			'permissionShare' => true,
 			'permissionManage' => true,
-			'owner' => true,
-			'token' => null
+			'owner' => true
 		], $acl->jsonSerialize());
 	}