Merged join game update fix

src/components/GameView.js

@@ -23,8 +23,27 @@ export default class GameView extends React.Component {
 
   componentDidMount() {
     let gameId = new URL(window.location.href).searchParams.get("id");
+    this.getGameInfo(gameId);
+    this.getPlayerRole(gameId);
+  }
+
+  getPlayerRole(gameId) {
     let token = sessionStorage.getItem("token");
 
+    fetch(`${process.env.REACT_APP_API_URL}/faction/check-faction/${gameId}`, {
+      method: "GET",
+      headers: {
+        Authorization: "Bearer " + token
+      }
+    })
+      .then(res => res.json())
+      .then(res => {
+        this.setState({ role: res.role });
+      })
+      .catch(error => console.log(error));
+  }
+
+  getGameInfo(gameId) {
     fetch(`${process.env.REACT_APP_API_URL}/game/${gameId}`)
       .then(res => {
         if (!res.ok) {
@@ -42,19 +61,6 @@ export default class GameView extends React.Component {
         alert("Game not found");
         window.document.location.href = "/";
       });
-
-    // Get Role
-    fetch(`${process.env.REACT_APP_API_URL}/faction/check-faction/${gameId}`, {
-      method: "GET",
-      headers: {
-        Authorization: "Bearer " + token
-      }
-    })
-      .then(res => res.json())
-      .then(res => {
-        this.setState({ role: res.role });
-      })
-      .catch(error => console.log(error));
   }
 
   handleLeaveFaction = e => {
@@ -79,6 +85,7 @@ export default class GameView extends React.Component {
       })
       .then(res => {
         alert(res.message);
+        this.getPlayerRole(this.state.gameInfo.id);
       })
       .catch(error => console.log(error));
   };
@@ -182,7 +189,7 @@ export default class GameView extends React.Component {
                 gameId={this.state.gameInfo.id}
                 toggleView={() => this.setState({ form: "" })}
                 onEditSave={() => {
-                  this.getGameInfo();
+                  this.getGameInfo(this.state.gameInfo.id);
                 }}
               />
             )}
@@ -190,7 +197,7 @@ export default class GameView extends React.Component {
               <JoinGameForm
                 gameId={this.state.gameInfo.id}
                 toggleView={() => this.setState({ form: "" })}
-                onJoin={() => console.log("joinde")}
+                onJoin={() => this.getPlayerRole(this.state.gameInfo.id)}
               />
             )}
             {this.state.form === "players" && (

src/components/JoinGameForm.js

@@ -14,7 +14,7 @@ export default class JoinGameForm extends React.Component {
   }
 
   // Get game info
-  //TODO: from props
+  //TODO: gameinfo from props
   componentDidMount() {
     if (this.props.gameId === undefined) {
       alert("game not selected");