From d4ef27afa0fa1f3c912a24317218f9d41aae1789 Mon Sep 17 00:00:00 2001
From: Sattvik Chakravarthy <sattvik@gmail.com>
Date: Mon, 5 Aug 2024 17:30:41 +0530
Subject: [PATCH] fix: test server

---
 test/test-server/src/accountlinking.ts |  9 +++------
 test/test-server/src/passwordless.ts   | 20 ++++----------------
 test/test-server/src/thirdparty.ts     |  8 ++------
 3 files changed, 9 insertions(+), 28 deletions(-)

diff --git a/test/test-server/src/accountlinking.ts b/test/test-server/src/accountlinking.ts
index 280e47ccc..6763deaac 100644
--- a/test/test-server/src/accountlinking.ts
+++ b/test/test-server/src/accountlinking.ts
@@ -4,7 +4,7 @@ import AccountLinkingRecipe from "../../../lib/build/recipe/accountlinking/recip
 import AccountLinking from "../../../recipe/accountlinking";
 import * as supertokens from "../../../lib/build";
 import { logger } from "./logger";
-import { serializeUser } from "./utils";
+import { serializeResponse, serializeUser } from "./utils";
 
 const namespace = "com.supertokens:node-test-server:accountlinking";
 const { logDebugMessage } = logger(namespace);
@@ -15,7 +15,7 @@ const router = Router()
             logDebugMessage("AccountLinking:createPrimaryUser %j", req.body);
             const recipeUserId = supertokens.convertToRecipeUserId(req.body.recipeUserId);
             const response = await AccountLinking.createPrimaryUser(recipeUserId, req.body.userContext);
-            res.json({ ...response, ...serializeUser(response) });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
@@ -29,10 +29,7 @@ const router = Router()
                 req.body.primaryUserId,
                 req.body.userContext
             );
-            res.json({
-                ...response,
-                ...serializeUser(response),
-            });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
diff --git a/test/test-server/src/passwordless.ts b/test/test-server/src/passwordless.ts
index cc8c7fd99..6815eb2b9 100644
--- a/test/test-server/src/passwordless.ts
+++ b/test/test-server/src/passwordless.ts
@@ -1,7 +1,7 @@
 import { Router } from "express";
 import SuperTokens from "../../..";
 import Passwordless from "../../../recipe/passwordless";
-import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeUser } from "./utils";
+import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeResponse, serializeUser } from "./utils";
 import { logger } from "./logger";
 
 const namespace = "com.supertokens:node-test-server:passwordless";
@@ -23,11 +23,7 @@ const router = Router()
                 session: req.body.session && (await convertRequestSessionToSessionObject(req.body.session)),
                 userContext: req.body.userContext,
             });
-            res.json({
-                ...response,
-                ...serializeUser(response),
-                ...serializeRecipeUserId(response),
-            });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
@@ -60,11 +56,7 @@ const router = Router()
                 session: req.body.session && (await convertRequestSessionToSessionObject(req.body.session)),
                 userContext: req.body.userContext,
             });
-            res.json({
-                ...response,
-                ...serializeUser(response),
-                ...serializeRecipeUserId(response),
-            });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
@@ -78,11 +70,7 @@ const router = Router()
                 phoneNumber: req.body.phoneNumber,
                 userContext: req.body.userContext,
             });
-            res.json({
-                ...response,
-                ...serializeUser(response),
-                ...serializeRecipeUserId(response),
-            });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
diff --git a/test/test-server/src/thirdparty.ts b/test/test-server/src/thirdparty.ts
index a1e574356..53fcdfbaa 100644
--- a/test/test-server/src/thirdparty.ts
+++ b/test/test-server/src/thirdparty.ts
@@ -1,6 +1,6 @@
 import { Router } from "express";
 import ThirdParty from "../../../recipe/thirdparty";
-import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeUser } from "./utils";
+import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeResponse, serializeUser } from "./utils";
 import { logger } from "./logger";
 
 const namespace = "com.supertokens:node-test-server:thirdparty";
@@ -19,11 +19,7 @@ const router = Router().post("/manuallycreateorupdateuser", async (req, res, nex
             session,
             req.body.userContext
         );
-        res.json({
-            ...response,
-            ...serializeUser(response),
-            ...serializeRecipeUserId(response),
-        });
+        await serializeResponse(req, res, response);
     } catch (e) {
         next(e);
     }