From 3eba4815c8a1b684188431e8f24b7d92e0543b60 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:04:52 +0400
Subject: [PATCH 1/2] Add __v and __id

---
 backend/src/server/routes/sanitizedSchemas.ts | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/backend/src/server/routes/sanitizedSchemas.ts b/backend/src/server/routes/sanitizedSchemas.ts
index afc12c081..03e48c247 100644
--- a/backend/src/server/routes/sanitizedSchemas.ts
+++ b/backend/src/server/routes/sanitizedSchemas.ts
@@ -38,7 +38,12 @@ export const sanitizedServiceTokenUserSchema = UsersSchema.pick({
   firstName: true,
   lastName: true,
   mfaMethods: true
-});
+}).merge(
+  z.object({
+    __v: z.number().default(0),
+    _id: z.string()
+  })
+);
 
 export const secretRawSchema = z.object({
   id: z.string(),

From 3702d411ca3d9d00bf674ce17c3dc5ae71a97143 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 29 Jan 2024 16:05:18 +0400
Subject: [PATCH 2/2] Added formatting

---
 .../src/server/routes/v2/service-token-router.ts    | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/backend/src/server/routes/v2/service-token-router.ts b/backend/src/server/routes/v2/service-token-router.ts
index 52e4d7334..cb285a8cc 100644
--- a/backend/src/server/routes/v2/service-token-router.ts
+++ b/backend/src/server/routes/v2/service-token-router.ts
@@ -36,8 +36,19 @@ export const registerServiceTokenRouter = async (server: FastifyZodProvider) =>
         actor: req.permission.type
       });
 
+      const formattedUser = {
+        ...user,
+        _id: user.id,
+        __v: 0
+      } as const;
+
+      const formattedServiceToken = {
+        ...serviceToken,
+        _id: serviceToken.id
+      } as const;
+
       // We return the user here because older versions of the deprecated Python SDK depend on it to properly parse the API response.
-      return { ...serviceToken, workspace: serviceToken.projectId, user };
+      return { ...formattedServiceToken, workspace: serviceToken.projectId, user: formattedUser };
     }
   });