X-Git-Url: https://git.auder.net/?a=blobdiff_plain;f=server%2Froutes%2Fgames.js;h=8bd9131ef5574b22cd2aaf8aa173af3fb0dffb06;hb=866842c3c310524c034922870234120ed2a16cbf;hp=128d9eeb0a1d4a950f89fe4712de1992e807e057;hpb=f41ce5806b989c06091a403d7e26ff3c457650c9;p=vchess.git

diff --git a/server/routes/games.js b/server/routes/games.js
index 128d9eeb..8bd9131e 100644
--- a/server/routes/games.js
+++ b/server/routes/games.js
@@ -1,74 +1,85 @@
-var router = require("express").Router();
-var UserModel = require("../models/User");
-var ChallengeModel = require('../models/Challenge');
-var GameModel = require('../models/Game');
-var VariantModel = require('../models/Variant');
-var access = require("../utils/access");
-var params = require("../config/parameters");
+let router = require("express").Router();
+const UserModel = require("../models/User");
+const ChallengeModel = require('../models/Challenge');
+const GameModel = require('../models/Game');
+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 (!gameInfo.players.some(p => p.id == req.userId))
-		return res.json({errmsg: "Cannot start someone else's game"});
   const cid = req.body.cid;
-  ChallengeModel.remove(cid);
-	const fen = req.body.fen;
-	GameModel.create(
-    gameInfo.vid, gameInfo.fen, gameInfo.timeControl, 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,
-          "New game: " + params.siteURL + "/game/" + ret.gid);
-				res.json({gameId: ret.gid});
-			});
-		}
-	);
+          "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)
+  const gameId = req.query["gid"];
+  if (gameId)
   {
-    GameModel.getOne(gameId, (err,game) => {
-		  access.checkRequest(res, err, game, "Game not found", () => {
-			  res.json({game: game});
-		  });
-	  });
+    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"];
-    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;
-	const obj = req.body.newObj;
-	GameModel.update(gid, obj, (err) => {
-		if (!!err)
-      return res.json(err);
-    // Notify opponent if he enabled notifications:
-    GameModel.getPlayers(gid, (err2,players) => {
-      if (!!err2)
-        return res.json(err);
-      const oppid = (players[0].id == req.userId ? players[1].id : players[0].id);
-      UserModel.tryNotify(oppid,
-        "New move in game: " + params.siteURL + "/game/" + gid);
+  const obj = req.body.newObj;
+  if (gid.toString().match(/^[0-9]+$/) && GameModel.checkGameUpdate(obj))
+  {
+    GameModel.getPlayers(gid, (err,players) => {
+      if (players.some(p => p.id == req.userId))
+      {
+        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({});
-	});
+  }
 });
 
 module.exports = router;