From 6843b76ebfe933176eb3a0fcd2ac5e5705c44360 Mon Sep 17 00:00:00 2001 From: KGrzeg Date: Sun, 17 Oct 2021 22:53:33 +0200 Subject: [PATCH] Refactor arguments check --- game/src/api.ts | 4 ++-- server/server.js | 31 ++++++++++++++++--------------- 2 files changed, 18 insertions(+), 17 deletions(-) diff --git a/game/src/api.ts b/game/src/api.ts index 18e90d3..d3aa703 100644 --- a/game/src/api.ts +++ b/game/src/api.ts @@ -31,7 +31,7 @@ export default { return this.post("signup", { name }) }, - async login(password: string) { - return this.post("login", { password }) + async login(key: string) { + return this.post("login", { key }) } } diff --git a/server/server.js b/server/server.js index 4fb6fd9..fbf9d5e 100644 --- a/server/server.js +++ b/server/server.js @@ -26,6 +26,19 @@ const protect = (req, res, next) => { }) } +const neededArguments = (args) => { + return (req, res, next) => { + for (let i = 0; i < args.length; i++) { + const arg = args[i]; + if (!req.body[arg]) + return res.status(400).json({ + error: "missing argument " + arg + }) + } + next() + } +} + const app = express() app.use(morgan('combined')) app.use(express.json()) @@ -40,14 +53,7 @@ app.get("/secured", protect, (req, res) => { res.json({ message: "You can see it!", payload: req.user }) }) -app.post("/signup", async (req, res) => { - console.log("No co jest??", req.body) - - if (!req.body.name) - return res.status(400).json({ - error: "missing argument name" - }) - +app.post("/signup", neededArguments(['name']), async (req, res) => { const user = await auth.createAccount(req.body.name) if (user.error) @@ -58,13 +64,8 @@ app.post("/signup", async (req, res) => { res.json(user) }) -app.post("/login", async (req, res) => { - if (!req.body.password) - return res.status(400).json({ - error: "missing argument password" - }) - - const user = auth.login(req.body.password) +app.post("/login", neededArguments(['key']), async (req, res) => { + const user = auth.login(req.body.key) if (user.error) return res.status(400).json({