ft(Fixed):Renamed player model and controller to game model and contr…

…oller

app/controllers/game.js

@@ -9,20 +9,19 @@ const Game = mongoose.model('Game');
 const gameResult = (req, res) => {
   let gameId = req.params.id;
   gameId = parseInt(gameId, 10);
-  const { gameStarter, gameWinner, players } = req.body;
-  if (!gameStarter || !players) {
-    return res.status(4000).json({ message: 'Game have not started' });
+  const { gameWinner, players } = req.body;
+  if (!players) {
+    return res.status(401).json({ message: 'Players have not joined the game' });
   }
   const payload = {
-    gameStarter,
     gameWinner,
     players,
     gameId
   };
   const game = new Game(payload);
   game.save((err) => {
     if (err) {
-      return res.status(401).json({ message: 'Error saving game' });
+      return res.status(500).json({ message: 'Error saving game' });
     }
     return res.status(201).json(game);
   });

app/middleware/auth.js

@@ -2,9 +2,12 @@ import 'babel-polyfill';
 import jwt from 'jsonwebtoken';
 
 /**
- * @function verifyToken
+ * @function auth
  * @param {string} data - A token
  * @returns { null } returns Unauthorized Access if token is undfefined
+ * @returns { expired } returns Please login
+ * @description used to access authenticated route
+ * @description if token is valid, decode the payload and pass it controller
  */
 
 const auth = (req, res, next) => {
@@ -21,10 +24,20 @@ const auth = (req, res, next) => {
     next();
   });
 };
+
+/**
+ * @function verifyToken
+ * @param {string} data - A token
+ * @returns { null } returns Unauthorized Access if token is undfefined
+ * @returns { expired } returns Please login
+ * @returns { valid } returns the token and user info
+ * @description used to check if user seesion/token is expired
+ */
+
 const verifyToken = (req, res) => {
   const token = req.headers.authorization || req.headers['x-access-token'];
   if (!token) {
-    return res.status(401).json({ message: 'Unauthorized Access' });
+    return res.status(402).json({ message: 'Unauthorized Access' });
   }
 
   jwt.verify(token, process.env.SECRET_KEY, (err, result) => {

app/models/game.js

@@ -2,11 +2,11 @@
  * Module dependencies.
  */
 import mongoose from 'mongoose';
-// import config from '../../config/config';
+
 const { Schema } = mongoose;
 
 /**
- * Player Schema
+ * Game Schema
  */
 const GameSchema = new Schema({
   id: {
@@ -15,18 +15,13 @@ const GameSchema = new Schema({
   gameId: {
     type: Number
   },
-  gameStarter: {
-    type: String,
-    default: '',
-    trim: true
-  },
   gameWinner: {
     type: String,
     default: '',
     trim: true
   },
   players: {
-    type: [Number]
+    type: [String]
   }
 });
 

backend-test/startGame/startGame.js

@@ -7,7 +7,6 @@ import app from '../../server';
 const User = mongoose.model('User');
 
 const mockPlayers = {
-  gameStarter: 'Kevin',
   gameWinner: 'kevin',
   players: [1, 2, 3]
 };
@@ -48,7 +47,7 @@ describe('Player endpoints', () => {
         .end((err, res) => {
           if (err) return done(err);
           expect(res.statusCode).to.equal(201);
-          expect(res.body.gameStarter).to.equal('Kevin');
+          expect(res.body.gameWinner).to.equal('kevin');
           done();
         });
     } catch (err) {

config/routes.js

@@ -26,6 +26,7 @@ export default (router, passport, app) => {
 
   // Setting up the game api
   api.post('/game/:id/start', middleware.auth, game);
+
   // Donation Routes
   router.post('/donations', users.addDonation);
 

config/socket/game.js

@@ -61,7 +61,8 @@ Game.prototype.payload = function() {
       avatar: player.avatar,
       premium: player.premium,
       socketID: player.socket.id,
-      color: player.color
+      color: player.color,
+      userId: player.userId
     });
   });
   return {

config/socket/player.js

@@ -5,7 +5,7 @@ function Player(socket) {
   this.username = null;
   this.premium = 0;
   this.avatar = null;
-  this.userID = null;
+  this.userId = null;
   this.color = null;
 }
 

config/socket/socket.js

@@ -78,10 +78,10 @@ module.exports = function(io) {
   var joinGame = function(socket,data) {
     var player = new Player(socket);
     data = data || {};
-    player.userID = data.userID || 'unauthenticated';
-    if (data.userID !== 'unauthenticated') {
+    player.userId = data.userId || 'unauthenticated';
+    if (data.userId !== 'unauthenticated') {
       User.findOne({
-        _id: data.userID
+        _id: data.userId
       }).exec(function(err, user) {
         if (err) {
           console.log('err',err);
@@ -92,7 +92,7 @@ module.exports = function(io) {
           player.username = 'Guest';
           player.avatar = avatars[Math.floor(Math.random()*4)+12];
         } else {
-          player.userID = user.id;
+          player.userId = user.id;
           player.username = user.name;
           player.premium = user.premium || 0;
           player.avatar = user.avatar || avatars[Math.floor(Math.random()*4)+12];