Merge branch 'master' into 0.17

This commit is contained in:
Nick O'Leary
2017-04-11 14:53:44 +01:00
6 changed files with 40 additions and 7 deletions

View File

@@ -132,14 +132,14 @@ function start() {
if (anonymousUser) {
log.audit({event: "comms.auth",user:anonymousUser});
completeConnection(anonymousUser.permissions,false);
//TODO: duplicated code - pull non-auth message handling out
if (msg.subscribe) {
handleRemoteSubscription(ws,msg.subscribe);
}
} else {
log.audit({event: "comms.auth.fail"});
completeConnection(null,false);
}
//TODO: duplicated code - pull non-auth message handling out
if (msg.subscribe) {
handleRemoteSubscription(ws,msg.subscribe);
}
}
}
});