From f335101369c525835a31a8f4679629ef5b0edee3 Mon Sep 17 00:00:00 2001
From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com>
Date: Mon, 29 Jan 2024 14:33:59 +0400
Subject: [PATCH] Add user

---
 .../src/server/routes/v2/service-token-router.ts   | 14 +++++++++++---
 1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/backend/src/server/routes/v2/service-token-router.ts b/backend/src/server/routes/v2/service-token-router.ts
index 31f5c22d6..3ebce77dc 100644
--- a/backend/src/server/routes/v2/service-token-router.ts
+++ b/backend/src/server/routes/v2/service-token-router.ts
@@ -6,6 +6,8 @@ import { removeTrailingSlash } from "@app/lib/fn";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
 import { AuthMode } from "@app/services/auth/auth-type";
 
+import { sanitizedServiceTokenUserSchema } from "../sanitizedSchemas";
+
 export const sanitizedServiceTokenSchema = ServiceTokensSchema.omit({
   secretHash: true,
   encryptedKey: true,
@@ -20,15 +22,21 @@ export const registerServiceTokenRouter = async (server: FastifyZodProvider) =>
     onRequest: verifyAuth([AuthMode.SERVICE_TOKEN]),
     schema: {
       response: {
-        200: ServiceTokensSchema.merge(z.object({ workspace: z.string() }))
+        200: ServiceTokensSchema.merge(
+          z.object({
+            workspace: z.string(),
+            user: sanitizedServiceTokenUserSchema
+          })
+        )
       }
     },
     handler: async (req) => {
-      const serviceTokenData = await server.services.serviceToken.getServiceToken({
+      const { serviceToken, user } = await server.services.serviceToken.getServiceToken({
         actorId: req.permission.id,
         actor: req.permission.type
       });
-      return { ...serviceTokenData, workspace: serviceTokenData.projectId };
+
+      return { ...serviceToken, workspace: serviceToken.projectId, user };
     }
   });