Revise server code + a few fixes in trnalsations and ComputerGame

[vchess.git] / server / routes / games.js

diff --git a/server/routes/games.js b/server/routes/games.js
index f130f78..8bd9131 100644 (file)
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -2,100 +2,84 @@ let router = require("express").Router();
 const UserModel = require("../models/User");
 const ChallengeModel = require('../models/Challenge');
 const GameModel = require('../models/Game');
-const VariantModel = require('../models/Variant');
 const access = require("../utils/access");
 const params = require("../config/parameters");
 
 // From main hall, start game between players 0 and 1
 router.post("/games", access.logged, access.ajax, (req,res) => {
   const gameInfo = req.body.gameInfo;
-  if (!Array.isArray(gameInfo.players) ||
-    gameInfo.players.every(p => p.id != req.userId))
-  {
-    return res.json({errmsg: "Cannot start someone else's game"});
-  }
   const cid = req.body.cid;
-  // Check all entries of gameInfo + cid:
-  let error = GameModel.checkGameInfo(gameInfo);
-  if (!error)
-  {
-    if (!cid.toString().match(/^[0-9]+$/))
-      error = "Wrong challenge ID";
-  }
-  if (!!error)
-    return res.json({errmsg:error});
-  ChallengeModel.remove(cid);
-  GameModel.create(
-    gameInfo.vid, gameInfo.fen, gameInfo.cadence, gameInfo.players,
-    (err,ret) => {
-      access.checkRequest(res, err, ret, "Cannot create game", () => {
+  if (
+    Array.isArray(gameInfo.players) &&
+    gameInfo.players.some(p => p.id == req.userId) &&
+    cid.toString().match(/^[0-9]+$/) &&
+    GameModel.checkGameInfo(gameInfo)
+  ) {
+    ChallengeModel.remove(cid);
+    GameModel.create(
+      gameInfo.vid, gameInfo.fen, gameInfo.cadence, gameInfo.players,
+      (err,ret) => {
         const oppIdx = (gameInfo.players[0].id == req.userId ? 1 : 0);
         const oppId = gameInfo.players[oppIdx].id;
         UserModel.tryNotify(oppId,
           "Game started: " + params.siteURL + "/#/game/" + ret.gid);
         res.json({gameId: ret.gid});
-      });
-    }
-  );
+      }
+    );
+  }
 });
 
 router.get("/games", access.ajax, (req,res) => {
   const gameId = req.query["gid"];
-  if (!!gameId)
+  if (gameId)
   {
-    if (!gameId.match(/^[0-9]+$/))
-      return res.json({errmsg: "Wrong game ID"});
-    GameModel.getOne(gameId, false, (err,game) => {
-      access.checkRequest(res, err, game, "Game not found", () => {
+    if (gameId.match(/^[0-9]+$/))
+    {
+      GameModel.getOne(gameId, false, (err,game) => {
         res.json({game: game});
       });
-    });
+    }
   }
   else
   {
     // Get by (non-)user ID:
     const userId = req.query["uid"];
-    if (!userId.match(/^[0-9]+$/))
-      return res.json({errmsg: "Wrong user ID"});
-    const excluded = !!req.query["excluded"];
-    GameModel.getByUser(userId, excluded, (err,games) => {
-      if (!!err)
-        return res.json({errmsg: err.errmsg || err.toString()});
-      res.json({games: games});
-    });
+    if (userId.match(/^[0-9]+$/))
+    {
+      const excluded = !!req.query["excluded"];
+      GameModel.getByUser(userId, excluded, (err,games) => {
+        res.json({games: games});
+      });
+    }
   }
 });
 
-// New move + fen update + score, potentially
-// TODO: if newmove fail, takeback in GUI
+// New move + fen update + score + chats...
 router.put("/games", access.logged, access.ajax, (req,res) => {
   const gid = req.body.gid;
-  let error = "";
-  if (!gid.toString().match(/^[0-9]+$/))
-    error = "Wrong game ID";
   const obj = req.body.newObj;
-  error = GameModel.checkGameUpdate(obj);
-  if (!!error)
-    return res.json({errmsg: error});
-  GameModel.update(gid, obj); //no callback here (several operations)
-  if (!!obj.move || !!obj.score)
+  if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj))
   {
-    // Notify opponent if he enabled notifications:
     GameModel.getPlayers(gid, (err,players) => {
-      if (!err)
+      if (players.some(p => p.id == req.userId))
       {
-        const oppid = (players[0].uid == req.userId
-          ? players[1].uid
-          : players[0].uid);
-        const messagePrefix = (!!obj.move
-          ? "New move in game: "
-          : "Game ended: ");
-        UserModel.tryNotify(oppid,
-          messagePrefix + params.siteURL + "/#/game/" + gid);
+        GameModel.update(gid, obj);
+        if (obj.move || obj.score)
+        {
+          // Notify opponent if he enabled notifications:
+          const oppid = players[0].uid == req.userId
+            ? players[1].uid
+            : players[0].uid;
+          const messagePrefix = obj.move
+            ? "New move in game: "
+            : "Game ended: ";
+          UserModel.tryNotify(oppid,
+            messagePrefix + params.siteURL + "/#/game/" + gid);
+        }
+        res.json({});
       }
     });
   }
-  res.json({}); //TODO: what if some update action fails?
 });
 
 module.exports = router;