From 6a6efd5a23e89f2cee9f36619ae87988ec265b6a Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Fri, 16 Jun 2023 12:38:13 +0200
Subject: [PATCH] override user._id with user.id to not expose internal db id

---
 backend/src/schema/resolvers/rooms.spec.ts |  8 ++++----
 backend/src/schema/resolvers/rooms.ts      | 12 +++++++++++-
 2 files changed, 15 insertions(+), 5 deletions(-)

diff --git a/backend/src/schema/resolvers/rooms.spec.ts b/backend/src/schema/resolvers/rooms.spec.ts
index 0f324b27b..8b5e87fd1 100644
--- a/backend/src/schema/resolvers/rooms.spec.ts
+++ b/backend/src/schema/resolvers/rooms.spec.ts
@@ -143,11 +143,11 @@ describe('Room', () => {
                   roomId: result.data.Room[0].id,
                   users: expect.arrayContaining([
                     {
-                      _id: expect.any(String),
+                      _id: 'chatting-user',
                       id: 'chatting-user',
                     },
                     {
-                      _id: expect.any(String),
+                      _id: 'other-chatting-user',
                       id: 'other-chatting-user',
                     },
                   ]),
@@ -174,11 +174,11 @@ describe('Room', () => {
                   roomId: result.data.Room[0].id,
                   users: expect.arrayContaining([
                     {
-                      _id: expect.any(String),
+                      _id: 'chatting-user',
                       id: 'chatting-user',
                     },
                     {
-                      _id: expect.any(String),
+                      _id: 'other-chatting-user',
                       id: 'other-chatting-user',
                     },
                   ]),
diff --git a/backend/src/schema/resolvers/rooms.ts b/backend/src/schema/resolvers/rooms.ts
index 9080a87ed..aa165b35f 100644
--- a/backend/src/schema/resolvers/rooms.ts
+++ b/backend/src/schema/resolvers/rooms.ts
@@ -9,7 +9,17 @@ export default {
       params.filter.users_some = {
         id: context.user.id,
       }
-      return neo4jgraphql(object, params, context, resolveInfo)
+      const resolved = await neo4jgraphql(object, params, context, resolveInfo)
+      if (resolved) {
+        resolved.forEach((room) => {
+          if (room.users) {
+            room.users.forEach((user) => {
+              user._id = user.id
+            })
+          }
+        })
+      }
+      return resolved
     },
   },
   Mutation: {