yonote/yjs
23
0
Fork 0
Code Pull Requests 1 Releases Activity

bugfix: unable to deliver message. fixes receiving message before authentication

Browse Source
This commit is contained in:
Kevin Jahns 2017-07-21 23:55:11 +02:00
parent 442ea7ec70
commit a6b7d76544
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/Connector.js
View File

@ -141,7 +141,9 @@ export default function extendConnector (Y/* :any */) {
this.log('User joined: %s', user) this.log('User joined: %s', user)
this.connections[user] = { this.connections[user] = {
isSynced: false, isSynced: false,
role: role role: role,
waitingMessages: [],
auth: null
} }
let defer = {} let defer = {}
defer.promise = new Promise(function (resolve) { defer.resolve = resolve }) 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')) 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 // authenticate using auth in message
var auth = this.checkAuth(message.auth, this.y) var auth = this.checkAuth(message.auth, this.y)
this.connections[sender].auth = auth this.connections[sender].auth = auth
auth.then(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) { for (var f of this.userEventListeners) {
f({ f({
action: 'userAuthenticated', 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) { if (this.connections[sender] != null && this.connections[sender].auth != null) {
return this.connections[sender].auth.then((auth) => { return this.connections[sender].auth.then((auth) => {
@ -382,8 +387,13 @@ export default function extendConnector (Y/* :any */) {
this.y.db.apply(message.ops) 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 { } else {
return Promise.reject(new Error('Unable to deliver message')) return Promise.reject(new Error('Unknown user - Unable to deliver message'))
} }
} }
_setSyncedWith (user) { _setSyncedWith (user) {