From da9337a50bc0672b14e88528d53093f4ac15cc23 Mon Sep 17 00:00:00 2001 From: aronmal Date: Mon, 13 Feb 2023 23:21:38 +0100 Subject: [PATCH] Fix req.body with JSON.parse() --- leaky-ships/lib/backend/components/getTokenFromBody.ts | 2 +- leaky-ships/pages/api/login.ts | 7 ++++--- leaky-ships/pages/api/register.ts | 2 +- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/leaky-ships/lib/backend/components/getTokenFromBody.ts b/leaky-ships/lib/backend/components/getTokenFromBody.ts index 2e12e0a..445823e 100644 --- a/leaky-ships/lib/backend/components/getTokenFromBody.ts +++ b/leaky-ships/lib/backend/components/getTokenFromBody.ts @@ -2,7 +2,7 @@ import { NextApiRequest } from "next" async function getTokenFromBody(payload: T & { req: NextApiRequest }) { const { req } = payload - const token: string = req.body.token + const token: string = JSON.parse(req.body).token // Checking for cookie presens, because it is necessary if (!token) { diff --git a/leaky-ships/pages/api/login.ts b/leaky-ships/pages/api/login.ts index 7662533..85bad8a 100644 --- a/leaky-ships/pages/api/login.ts +++ b/leaky-ships/pages/api/login.ts @@ -17,14 +17,15 @@ export default async function login( req: NextApiRequest, res: NextApiResponse ) { - const { username, password } = req.body - return preCheck({ + const { username, password } = JSON.parse(req.body) + const payload = { req, res, username, password, newTokenType: "REFRESH" as Token["type"], - }) + } + return preCheck(payload) .then(getPlayerByNameDB) .then(checkPasswordIsValid) .then(createTokenDB) diff --git a/leaky-ships/pages/api/register.ts b/leaky-ships/pages/api/register.ts index d5e45e9..af282ee 100644 --- a/leaky-ships/pages/api/register.ts +++ b/leaky-ships/pages/api/register.ts @@ -13,7 +13,7 @@ export default async function register( req: NextApiRequest, res: NextApiResponse ) { - const { username, password } = req.body + const { username, password } = JSON.parse(req.body) return createPlayerDB({ req, res, username, password }) .then(registerResponse) .then(sendResponse)