Send requesting player

src/utils.js

@@ -1,33 +1,42 @@
 import axios from "axios";
 
 function getUrl() {
-    let url = process.env.VUE_APP_BACKEND_URL + ":" + process.env.VUE_APP_BACKEND_PORT;
-    console.log(url);
-    return url;
+  let url = process.env.VUE_APP_BACKEND_URL + ":" + process.env.VUE_APP_BACKEND_PORT;
+  console.log(url);
+  return url;
 }
 
 const axiosClient = axios.create({
-    baseURL: getUrl(),
-    headers: {
-        'Accept': 'application/json',
-        'Content-Type': 'application/json'
-    }
+  baseURL: getUrl(),
+  headers: {
+    'Accept': 'application/json',
+    'Content-Type': 'application/json'
+  }
 });
 
-export function sendDraft(id, territoryName) {
-    return axiosClient.post("/api/games/" + id + "/turn/draft", { territory: territoryName });
+export function sendDraft(id, player, territoryName) {
+  const draftData = { 
+    requestingPlayer: player,
+    territory: territoryName 
+  }
+  return axiosClient.post("/api/games/" + id + "/turn/draft", draftData);
 }
 
-export function sendAttack(id, fromTerritory, toTerritory) {
-    const attack_data = {
-      from: fromTerritory,
-      to: toTerritory,
-    }
-    return axiosClient.post("/api/games/" + id + "/turn/attack", attack_data);
+export function sendAttack(id, player, fromTerritory, toTerritory) {
+  const attack_data = {
+    requestingPlayer: player,
+    from: fromTerritory,
+    to: toTerritory,
+  }
+  return axiosClient.post("/api/games/" + id + "/turn/attack", attack_data);
 }
 
-export function sendMove(id, unitsToMove) {
-    return axiosClient.post("/api/games/" + id + "/turn/move", { units: unitsToMove })
+export function sendMove(id, player, unitsToMove) {
+  const moveData = { 
+    requestingPlayer: player,
+    units: unitsToMove 
+  }
+  return axiosClient.post("/api/games/" + id + "/turn/move", moveData)
 }
 
 export { axiosClient }

src/views/GamePage.vue

@@ -60,7 +60,7 @@ const clicked = (territory) => {
   switch (store.model.phase) {
     case "DRAFT":
     case "ALLDRAFT":
-      sendDraft(route.params.id, territory.name);
+      sendDraft(route.params.id, store.playerName, territory.name);
       break;
     case "ATTACK":
       attack(territory);
@@ -83,7 +83,7 @@ const attack = (territory) => {
     store.lastSelected.player.name == currentPlayer &&
     territory.player.name != currentPlayer
   ) {
-    sendAttack(route.params.id, store.lastSelected.name, territory.name);
+    sendAttack(route.params.id, store.playerName, store.lastSelected.name, territory.name);
     store.lastSelected = null;
   } else if (territory.player.name == currentPlayer) {
     store.lastSelected = territory;
@@ -111,7 +111,7 @@ const fortify = (territory) => {
         trapFocus: true,
         events: {
           "move-units": (units) =>
-            fortifyWithUnits(store.lastSelected.name, territory.name, units),
+            fortifyWithUnits(store.playerName, store.lastSelected.name, territory.name, units),
         },
       });
     }
@@ -120,8 +120,9 @@ const fortify = (territory) => {
   }
 };
 
-const fortifyWithUnits = (from, to, units) => {
+const fortifyWithUnits = (player, from, to, units) => {
   const fortify_data = {
+    requestingPlayer: player,
     from: from,
     to: to,
     units: units,
@@ -138,7 +139,8 @@ const fortifyWithUnits = (from, to, units) => {
 };
 
 const move = (unitsToMove) => {
-  sendMove(route.params.id, unitsToMove)
+  const currentPlayer = store.model.currentPlayer;
+  sendMove(route.params.id, currentPlayer, unitsToMove)
     // .then((response) => {
     // store.model = response.data;
     // })
@@ -164,7 +166,7 @@ const modal = (modalVM) => {
 
 const endTurn = () => {
   axiosClient
-    .post("/api/games/" + route.params.id + "/turn/end")
+    .post("/api/games/" + route.params.id + "/turn/end", { requestingPlayer: store.playerName })
     .catch((error) => {
       console.log(error);
     });