test: backport test improvements

supertokens · Nov 27, 2024 · 17d3765 · 17d3765
1 parent 2182adb
commit 17d3765
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 33 deletions.
diff --git 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 } 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/emailpassword.ts b/test/test-server/src/emailpassword.ts
@@ -1,6 +1,6 @@
 import { Router } from "express";
 import EmailPassword from "../../../recipe/emailpassword";
-import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeUser } from "./utils";
+import { convertRequestSessionToSessionObject, serializeResponse } from "./utils";
 import * as supertokens from "../../../lib/build";
 import { logger } from "./logger";
 
@@ -19,11 +19,7 @@ const router = Router()
                 session,
                 req.body.userContext
             );
-            res.json({
-                ...response,
-                ...serializeUser(response),
-                ...serializeRecipeUserId(response),
-            });
+            await serializeResponse(req, res, response);
         } catch (e) {
             next(e);
         }
@@ -39,11 +35,7 @@ const router = Router()
                 session,
                 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/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, serializeResponse } from "./utils";
 import { logger } from "./logger";
 
 const namespace = "com.supertokens:node-test-server:passwordless";
@@ -23,11 +23,8 @@ 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 +57,8 @@ 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 +72,8 @@ 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);
         }