minor fixes

Author: rwieruch

src/components/Firebase/firebase.js

@@ -25,7 +25,7 @@ class Firebase {
 
     this.auth = app.auth();
     this.db = app.firestore();
-    this.db.settings({ timestampsInSnapshots: true});
+    this.db.settings({ timestampsInSnapshots: true });
 
     /* Social Sign In Method Provider */
 
@@ -71,7 +71,7 @@ class Firebase {
         this.user(authUser.uid)
           .get()
           .then(snapshot => {
-            const dbUser = snapshot.data() || {};
+            const dbUser = snapshot.data();
 
             // default empty roles
             if (!dbUser.roles) {

src/components/Home/index.js

@@ -12,7 +12,6 @@ class HomePage extends Component {
     this.state = {
       users: null,
     };
-    this.unsubscribe = null;
   }
 
   componentDidMount() {

src/components/Messages/Messages.js

@@ -14,7 +14,6 @@ class Messages extends Component {
       messages: [],
       limit: 5,
     };
-    this.unsubscribe = null;
   }
 
   componentDidMount() {
@@ -27,21 +26,21 @@ class Messages extends Component {
     this.unsubscribe = this.props.firebase
       .messages()
       .orderBy('createdAt', 'desc')
-      .limit(this.state.limit) // firestore doesn't have limitLast, so we use combination of order desc and limit
+      .limit(this.state.limit)
       .onSnapshot(snapshot => {
-        let messages;
-
         if (snapshot.size) {
-          messages = [];
+          let messages = [];
           snapshot.forEach(doc =>
             messages.push({ ...doc.data(), uid: doc.id }),
           );
-        }
 
-        this.setState({
-          messages,
-          loading: false,
-        });
+          this.setState({
+            messages: messages.reverse(),
+            loading: false,
+          });
+        } else {
+          this.setState({ messages: null, loading: false });
+        }
       });
   };
 
@@ -105,7 +104,7 @@ class Messages extends Component {
                 messages={messages.map(message => ({
                   ...message,
                   user: users
-                    ? users[message.userId] || {}
+                    ? users[message.userId]
                     : { userId: message.userId },
                 }))}
                 onEditMessage={this.onEditMessage}

src/components/SignIn/index.js

@@ -105,11 +105,14 @@ class SignInGoogleBase extends Component {
       .doSignInWithGoogle()
       .then(socialAuthUser => {
         // Create a user in your Firebase Realtime Database too
-        return this.props.firebase.user(socialAuthUser.user.uid).update({
-          username: socialAuthUser.user.displayName,
-          email: socialAuthUser.user.email,
-          roles: [],
-        });
+        return this.props.firebase.user(socialAuthUser.user.uid).set(
+          {
+            username: socialAuthUser.user.displayName,
+            email: socialAuthUser.user.email,
+            roles: [],
+          },
+          { merge: true },
+        );
       })
       .then(() => {
         this.setState({ error: null });
@@ -151,11 +154,14 @@ class SignInFacebookBase extends Component {
       .doSignInWithFacebook()
       .then(socialAuthUser => {
         // Create a user in your Firebase Realtime Database too
-        return this.props.firebase.user(socialAuthUser.user.uid).update({
-          username: socialAuthUser.additionalUserInfo.profile.name,
-          email: socialAuthUser.additionalUserInfo.profile.email,
-          roles: [],
-        });
+        return this.props.firebase.user(socialAuthUser.user.uid).set(
+          {
+            username: socialAuthUser.additionalUserInfo.profile.name,
+            email: socialAuthUser.additionalUserInfo.profile.email,
+            roles: [],
+          },
+          { merge: true },
+        );
       })
       .then(() => {
         this.setState({ error: null });
@@ -197,11 +203,14 @@ class SignInTwitterBase extends Component {
       .doSignInWithTwitter()
       .then(socialAuthUser => {
         // Create a user in your Firebase Realtime Database too
-        return this.props.firebase.user(socialAuthUser.user.uid).update({
-          username: socialAuthUser.additionalUserInfo.profile.name,
-          email: socialAuthUser.additionalUserInfo.profile.email,
-          roles: [],
-        });
+        return this.props.firebase.user(socialAuthUser.user.uid).set(
+          {
+            username: socialAuthUser.additionalUserInfo.profile.name,
+            email: socialAuthUser.additionalUserInfo.profile.email,
+            roles: [],
+          },
+          { merge: true },
+        );
       })
       .then(() => {
         this.setState({ error: null });

src/components/SignUp/index.js

@@ -50,11 +50,14 @@ class SignUpFormBase extends Component {
       .doCreateUserWithEmailAndPassword(email, passwordOne)
       .then(authUser => {
         // Create a user in your Firebase realtime database
-        return this.props.firebase.user(authUser.user.uid).update({
-          username,
-          email,
-          roles,
-        });
+        return this.props.firebase.user(authUser.user.uid).set(
+          {
+            username,
+            email,
+            roles,
+          },
+          { merge: true },
+        );
       })
       .then(() => {
         return this.props.firebase.doSendEmailVerification();

src/components/Users/UserItem.js

@@ -11,7 +11,6 @@ class UserItem extends Component {
       user: null,
       ...props.location.state,
     };
-    this.unsubscribe = null;
   }
 
   componentDidMount() {
@@ -32,7 +31,7 @@ class UserItem extends Component {
   }
 
   componentWillUnmount() {
-    this.unsubscribe();
+    this.unsubscribe && this.unsubscribe();
   }
 
   onSendPasswordResetEmail = () => {

src/components/Users/UserList.js

@@ -12,7 +12,6 @@ class UserList extends Component {
       loading: false,
       users: [],
     };
-    this.unsubscribe = null;
   }
 
   componentDidMount() {