From a6b7d7654408d08915b7d65bdf29bb5bf611f99b Mon Sep 17 00:00:00 2001
From: Kevin Jahns <kevin.jahns@rwth-aachen.de>
Date: Fri, 21 Jul 2017 23:55:11 +0200
Subject: [PATCH] bugfix: unable to deliver message. fixes receiving message
 before authentication

---
 src/Connector.js | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/src/Connector.js b/src/Connector.js
index c04e53f7..b062f528 100644
--- a/src/Connector.js
+++ b/src/Connector.js
@@ -141,7 +141,9 @@ export default function extendConnector (Y/* :any */) {
       this.log('User joined: %s', user)
       this.connections[user] = {
         isSynced: false,
-        role: role
+        role: role,
+        waitingMessages: [],
+        auth: null
       }
       let defer = {}
       defer.promise = new Promise(function (resolve) { defer.resolve = resolve })
@@ -267,11 +269,17 @@ export default function extendConnector (Y/* :any */) {
         })
         return Promise.reject(new Error('Incompatible protocol version'))
       }
-      if (message.auth != null && this.connections[sender] != null) {
+      if (message.type === 'sync step 1' && this.connections[sender] != null && this.connections[sender].auth == null) {
         // authenticate using auth in message
         var auth = this.checkAuth(message.auth, this.y)
         this.connections[sender].auth = auth
         auth.then(auth => {
+          // in case operations were received before sender was received
+          // we apply the messages after authentication
+          this.connections[sender].waitingMessages.forEach(msg => {
+            this.receiveMessage(sender, msg)
+          })
+          this.connections[sender].waitingMessages = null
           for (var f of this.userEventListeners) {
             f({
               action: 'userAuthenticated',
@@ -280,9 +288,6 @@ export default function extendConnector (Y/* :any */) {
             })
           }
         })
-      } else if (this.connections[sender] != null && this.connections[sender].auth == null) {
-        // authenticate without otherwise
-        this.connections[sender].auth = this.checkAuth(null, this.y)
       }
       if (this.connections[sender] != null && this.connections[sender].auth != null) {
         return this.connections[sender].auth.then((auth) => {
@@ -382,8 +387,13 @@ export default function extendConnector (Y/* :any */) {
             this.y.db.apply(message.ops)
           }
         })
+      } else if (this.connections[sender] != null) {
+        // wait for authentication
+        let senderConn = this.connection[sender]
+        senderConn.waitingMessages = senderConn.waitingMessages || []
+        senderConn.waitingMessages.push(message)
       } else {
-        return Promise.reject(new Error('Unable to deliver message'))
+        return Promise.reject(new Error('Unknown user - Unable to deliver message'))
       }
     }
     _setSyncedWith (user) {