From a8e5b573637016df9d6b968e5068d74308dffad4 Mon Sep 17 00:00:00 2001 From: aronmal Date: Mon, 10 Apr 2023 17:06:38 +0200 Subject: [PATCH] Return next() function --- leaky-ships/lib/backend/components/checkPasswordIsValid.ts | 2 +- leaky-ships/lib/backend/components/createPlayerDB.ts | 4 +++- leaky-ships/lib/backend/components/getPlayerByIdDB.ts | 2 +- leaky-ships/lib/backend/components/getPlayerByNameDB.ts | 2 +- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/leaky-ships/lib/backend/components/checkPasswordIsValid.ts b/leaky-ships/lib/backend/components/checkPasswordIsValid.ts index 6a92d95..b4615f9 100644 --- a/leaky-ships/lib/backend/components/checkPasswordIsValid.ts +++ b/leaky-ships/lib/backend/components/checkPasswordIsValid.ts @@ -15,5 +15,5 @@ export default async function checkPasswordIsValid( const result = await bcrypt.compare(password, player.passwordHash) if (!result) return sendError(req, res, errors.wrongPassword) - next() + return next() } diff --git a/leaky-ships/lib/backend/components/createPlayerDB.ts b/leaky-ships/lib/backend/components/createPlayerDB.ts index 23d8bc0..674075d 100644 --- a/leaky-ships/lib/backend/components/createPlayerDB.ts +++ b/leaky-ships/lib/backend/components/createPlayerDB.ts @@ -7,13 +7,15 @@ async function createPlayerDB( password: string, next: (player: Player) => void ) { - return await prisma.player.create({ + const player = await prisma.player.create({ data: { username, passwordHash: await bcrypt.hash(password, 10), anonymous: false, }, }) + + return next(player) } export default createPlayerDB diff --git a/leaky-ships/lib/backend/components/getPlayerByIdDB.ts b/leaky-ships/lib/backend/components/getPlayerByIdDB.ts index 9b1fe4d..3a084b4 100644 --- a/leaky-ships/lib/backend/components/getPlayerByIdDB.ts +++ b/leaky-ships/lib/backend/components/getPlayerByIdDB.ts @@ -20,5 +20,5 @@ export default async function getPlayerByIdDB( return sendError(req, res, errors.playerNotFound) } - next(player) + return next(player) } diff --git a/leaky-ships/lib/backend/components/getPlayerByNameDB.ts b/leaky-ships/lib/backend/components/getPlayerByNameDB.ts index d03612c..63df418 100644 --- a/leaky-ships/lib/backend/components/getPlayerByNameDB.ts +++ b/leaky-ships/lib/backend/components/getPlayerByNameDB.ts @@ -25,5 +25,5 @@ export default async function getPlayerByNameDB( ]).catch(() => null) if (player === null) return sendError(req, res, errors.playerNotFound) - next(player) + return next(player) }