Skip to content

Commit

Permalink
fix: pr comments
Browse files Browse the repository at this point in the history
  • Loading branch information
sattvikc committed Jul 26, 2024
1 parent b99c077 commit 1b76f5c
Show file tree
Hide file tree
Showing 2 changed files with 13 additions and 13 deletions.
16 changes: 3 additions & 13 deletions test/test-server/src/emailpassword.ts
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
import { Router } from "express";
import EmailPassword from "../../../recipe/emailpassword";
import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeUser } from "./utils";
import { convertRequestSessionToSessionObject, serializeRecipeUserId, serializeResponse, serializeUser } from "./utils";
import * as supertokens from "../../../lib/build";
import { logger } from "./logger";

Expand All @@ -9,8 +9,6 @@ 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));
Expand All @@ -21,11 +19,7 @@ const router = Router()
session,
req.body.userContext
);
res.json({
...response,
...serializeUser(response, fdiVersion),
...serializeRecipeUserId(response, fdiVersion),
});
await serializeResponse(req, res, response);
} catch (e) {
next(e);
}
Expand All @@ -41,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);
}
Expand Down
10 changes: 10 additions & 0 deletions test/test-server/src/utils.ts
Original file line number Diff line number Diff line change
Expand Up @@ -137,6 +137,16 @@ export async function convertRequestSessionToSessionObject(
return tokens;
}

export async function serializeResponse(req, res, response) {
const fdiVersion: string = req.headers["fdi-version"] as string;

await res.json({
...response,
...serializeUser(response, fdiVersion),
...serializeRecipeUserId(response, fdiVersion),
});
}

export function serializeUser(response, fdiVersion: string) {
if (["1.17", "2.0"].includes(fdiVersion)) {
return {
Expand Down

0 comments on commit 1b76f5c

Please sign in to comment.