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

Provide sender information in checkAuth. Related to #79

Browse Source
This commit is contained in:
Kevin Jahns 2017-07-19 18:50:18 +02:00
parent dd6c196135
commit 3a1c7a71d4
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/Connector.js
View File

@ -1,6 +1,3 @@
/* @flow */
'use strict'
function canRead (auth) { return auth === 'read' || auth === 'write' } function canRead (auth) { return auth === 'read' || auth === 'write' }
function canWrite (auth) { return auth === 'write' } function canWrite (auth) { return auth === 'write' }
@ -272,7 +269,7 @@ module.exports = function (Y/* :any */) {
} }
if (message.auth != null && this.connections[sender] != null) { if (message.auth != null && this.connections[sender] != 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, sender)
this.connections[sender].auth = auth this.connections[sender].auth = auth
auth.then(auth => { auth.then(auth => {
for (var f of this.userEventListeners) { for (var f of this.userEventListeners) {
@ -285,7 +282,7 @@ module.exports = function (Y/* :any */) {
}) })
} else if (this.connections[sender] != null && this.connections[sender].auth == null) { } else if (this.connections[sender] != null && this.connections[sender].auth == null) {
// authenticate without otherwise // authenticate without otherwise
this.connections[sender].auth = this.checkAuth(null, this.y) this.connections[sender].auth = this.checkAuth(null, this.y, sender)
} }
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) => {