Provide own groups if requesting own user data (#1582)

Author: ksuess

news/1581.feature

@@ -0,0 +1 @@
+Request of own user data provides joined groups @ksuess

src/plone/restapi/serializer/user.py

@@ -68,18 +68,19 @@ class SerializeUserToJson(BaseSerializer):
     def __call__(self):
         data = super().__call__()
         user = self.context
-        gtool = getToolByName(self.context, "portal_groups")
-        groupIds = user.getGroups()
-        groups = [gtool.getGroupById(grp) for grp in groupIds]
-        groups = [{"id": grp.id, "title": grp.title or grp.id} for grp in groups]
-        batch = HypermediaBatch(self.request, groups)
-        groups_data = {
-            "@id": batch.canonical_url,
-            "items_total": batch.items_total,
-            "items": sorted(batch, key=lambda x: x["title"]),
-        }
-        if batch.links:
-            groups_data["batching"] = batch.links
+        gtool = getToolByName(self.context, "portal_groups", None)
+        if gtool:
+            groupIds = user.getGroups()
+            groups = [gtool.getGroupById(grp) for grp in groupIds]
+            groups = [{"id": grp.id, "title": grp.title or grp.id} for grp in groups]
 
-        data["groups"] = groups_data
+            batch = HypermediaBatch(self.request, groups)
+            groups_data = {
+                "@id": batch.canonical_url,
+                "items_total": batch.items_total,
+                "items": sorted(batch, key=lambda x: x["title"]),
+            }
+            if batch.links:
+                groups_data["batching"] = batch.links
+            data["groups"] = groups_data
         return data

src/plone/restapi/services/users/get.py

@@ -4,7 +4,6 @@
 from plone.app.workflow.browser.sharing import merge_search_results
 from plone.namedfile.utils import stream_data
 from plone.restapi.interfaces import ISerializeToJson
-from plone.restapi.interfaces import ISerializeToJsonSummary
 from plone.restapi.services import Service
 from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.utils import normalizeString
@@ -210,9 +209,7 @@ def reply(self):
             if not user:
                 self.request.response.setStatus(404)
                 return
-            serializer = queryMultiAdapter(
-                (user, self.request), ISerializeToJsonSummary
-            )
+            serializer = queryMultiAdapter((user, self.request), ISerializeToJson)
             return serializer()
         else:
             self.request.response.setStatus(401)

src/plone/restapi/tests/http-examples/users_authorized_get.resp

@@ -6,6 +6,16 @@ Content-Type: application/json
     "description": "Professor of Linguistics",
     "email": "[email protected]",
     "fullname": "Noam Avram Chomsky",
+    "groups": {
+        "@id": "http://localhost:55001/plone/@users/noam",
+        "items": [
+            {
+                "id": "AuthenticatedUsers",
+                "title": "AuthenticatedUsers"
+            }
+        ],
+        "items_total": 1
+    },
     "home_page": "web.mit.edu/chomsky",
     "id": "noam",
     "location": "Cambridge, MA",

src/plone/restapi/tests/http-examples/users_get.resp

@@ -6,6 +6,16 @@ Content-Type: application/json
     "description": "Professor of Linguistics",
     "email": "[email protected]",
     "fullname": "Noam Avram Chomsky",
+    "groups": {
+        "@id": "http://localhost:55001/plone/@users/noam",
+        "items": [
+            {
+                "id": "AuthenticatedUsers",
+                "title": "AuthenticatedUsers"
+            }
+        ],
+        "items_total": 1
+    },
     "home_page": "web.mit.edu/chomsky",
     "id": "noam",
     "location": "Cambridge, MA",

src/plone/restapi/tests/http-examples/users_update_portrait_get.resp

@@ -6,6 +6,16 @@ Content-Type: application/json
     "description": null,
     "email": "[email protected]",
     "fullname": null,
+    "groups": {
+        "@id": "http://localhost:55001/plone/@users/noam",
+        "items": [
+            {
+                "id": "AuthenticatedUsers",
+                "title": "AuthenticatedUsers"
+            }
+        ],
+        "items_total": 1
+    },
     "home_page": null,
     "id": "noam",
     "location": null,