fix: test server compatible with 1.17

supertokens · Jul 26, 2024 · b99c077 · b99c077
1 parent cbf5e02
commit b99c077
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 5 deletions.
diff --git a/test/test-server/src/emailpassword.ts b/test/test-server/src/emailpassword.ts
@@ -9,6 +9,8 @@ const { logDebugMessage } = logger(namespace);
 
 const router = Router()
     .post("/signup", async (req, res, next) => {
+        const fdiVersion: string = req.headers["fdi-version"] as string;
+
         try {
             logDebugMessage("EmailPassword:signup %j", req.body);
             let session = req.body.session && (await convertRequestSessionToSessionObject(req.body.session));
@@ -21,8 +23,8 @@ const router = Router()
             );
             res.json({
                 ...response,
-                ...serializeUser(response),
-                ...serializeRecipeUserId(response),
+                ...serializeUser(response, fdiVersion),
+                ...serializeRecipeUserId(response, fdiVersion),
             });
         } catch (e) {
             next(e);

diff --git a/test/test-server/src/session.ts b/test/test-server/src/session.ts
@@ -12,9 +12,16 @@ const { logDebugMessage } = logger(namespace);
 
 const router = Router()
     .post("/createnewsessionwithoutrequestresponse", async (req, res, next) => {
+        const fdiVersion = req.headers["fdi-version"] as string;
+
         try {
             logDebugMessage("Session.createNewSessionWithoutRequestResponse %j", req.body);
-            const recipeUserId = supertokens.convertToRecipeUserId(req.body.recipeUserId);
+            let recipeUserId;
+            if (["1.17", "2.0"].includes(fdiVersion)) {
+                recipeUserId = supertokens.convertToRecipeUserId(req.body.userId);
+            } else {
+                recipeUserId = supertokens.convertToRecipeUserId(req.body.recipeUserId);
+            }
             const response = await Session.createNewSessionWithoutRequestResponse(
                 req.body.tenantId || "public",
                 recipeUserId,

diff --git a/test/test-server/src/utils.ts b/test/test-server/src/utils.ts
@@ -137,7 +137,21 @@ export async function convertRequestSessionToSessionObject(
     return tokens;
 }
 
-export function serializeUser(response) {
+export function serializeUser(response, fdiVersion: string) {
+    if (["1.17", "2.0"].includes(fdiVersion)) {
+        return {
+            ...("user" in response && response.user instanceof supertokens.User
+                ? {
+                      user: {
+                          id: (response.user as supertokens.User).id,
+                          email: (response.user as supertokens.User).emails[0],
+                          timeJoined: (response.user as supertokens.User).timeJoined,
+                          tenantIds: (response.user as supertokens.User).tenantIds,
+                      },
+                  }
+                : {}),
+        };
+    }
     return {
         ...("user" in response && response.user instanceof supertokens.User
             ? {
@@ -147,7 +161,10 @@ export function serializeUser(response) {
     };
 }
 
-export function serializeRecipeUserId(response) {
+export function serializeRecipeUserId(response, fdiVersion: string) {
+    if (["1.17", "2.0"].includes(fdiVersion)) {
+        return {};
+    }
     return {
         ...("recipeUserId" in response && response.recipeUserId instanceof supertokens.RecipeUserId
             ? {