Merge pull request #76 from empiricaly/playerIdParam-no-consent

Fix bug where playerIdParam is ignored if ConsentComponent is not absent.
empiricaly · Oct 2, 2018 · ccf9faf · ccf9faf
2 parents e1c7c0f + 47e5832
commit ccf9faf
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/imports/core/ui/components/NewPlayer.jsx b/imports/core/ui/components/NewPlayer.jsx
@@ -9,7 +9,6 @@ import Centered from "./Centered.jsx";
 
 const { ConsentComponent } = config;
 import Loading from "./Loading.jsx";
-const { playerIdParam } = Meteor.settings.public;
 
 export default class NewPlayer extends React.Component {
   state = { id: "", consented: false };
@@ -25,6 +24,11 @@ export default class NewPlayer extends React.Component {
     }
   }
 
+  componentWillMount() {
+    if (!ConsentComponent) {
+      this.playerFromIdParam();
+    }
+  }
   componentWillUnmount() {
     if (this.timeout) {
       clearTimeout(this.timeout);
@@ -52,7 +56,10 @@ export default class NewPlayer extends React.Component {
 
   handleConsent = () => {
     this.setState({ consented: true });
+    this.playerFromIdParam();
+  };
 
+  playerFromIdParam() {
     const { playerIdParam } = Meteor.settings.public;
 
     if (playerIdParam) {
@@ -71,7 +78,7 @@ export default class NewPlayer extends React.Component {
         });
       }
     }
-  };
+  }
 
   render() {
     const { id, consented, attemptingAutoLogin } = this.state;