Fixed merge auth and db user bug.

Author: mirastroie

meetsy/src/components/App/index.js

@@ -47,7 +47,8 @@ class App extends Component {
   }
   componentDidMount(){
     this.props.firebase.auth.onAuthStateChanged(authUser => {
-      console.log("Out here!");
+      this.setState({loading: true})
+      console.log("Out here!", this.state.loading);
        if (authUser) {
          console.log("In here!");
          this.props.firebase.user(authUser.uid)
@@ -67,10 +68,12 @@ class App extends Component {
                providerData: authUser.providerData,
                ...dbUser,
              };
+             console.log("Loading-ul este: " , this.state.loading)
              console.log(this.props.firebase.authUser);  
              this.setState({loading: false})      
            });
        } else {
+          console.log("Loading-ul este pe callback: ", this.state.loading)
           this.setState({loading:false})
        }
      });

meetsy/src/components/Firebase/firebase.js

@@ -44,7 +44,10 @@ class Firebase {
     doSignInWithEmailAndPassword = (email, password) =>
         this.auth.signInWithEmailAndPassword(email, password);
 
-  doSignOut = () => this.auth.signOut();
+  doSignOut = () => {
+    this.auth.signOut();
+    window.location.reload();
+  }
 
     doPasswordReset = email => this.auth.sendPasswordResetEmail(email);
 

meetsy/src/components/Session/withAuthorization.js

@@ -11,7 +11,12 @@ const withAuthorization = condition => Component => {
       this.listener = this.props.firebase.auth.onAuthStateChanged(
         authUser => {
           if (!condition(authUser)) {
+            if (!authUser) {
             this.props.history.push(ROUTES.SIGN_IN);
+            }
+            else {
+              this.props.history.push(ROUTES.HOME);
+            }
           }
         },
       );

meetsy/src/components/SignOut/index.js

@@ -20,9 +20,11 @@ const link = {
 
 
 const SignOutButton = ({ firebase }) => (
-    <button style={icon} type="button" onClick={firebase.doSignOut}>
-        <IconSignOut color='white'/>
+  <Link to={ROUTES.SIGN_IN} style={link} onClick={firebase.doSignOut}>
+    <button style={icon} type="button">
+      <IconSignOut color='white' />
     </button>
+  </Link>
 );
 
 export default withFirebase(SignOutButton);