root
/
telebit-relay.js
mirror of https://git.coolaj86.com/coolaj86/telebit-relay.js.git
2
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' into commercial

This commit is contained in:
AJ ONeal 2018-06-29 11:02:55 +00:00
parent dc67bee735 a3b8cd6799
commit 40d54bcdad
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/relay.js
View File

@ -257,7 +257,7 @@ var Server = {
newAuth = JSON.stringify(newAuth); newAuth = JSON.stringify(newAuth);
} }
console.log('check for upgrade token'); console.log('[onAuth] check for upgrade token');
if (grant.jwt && newAuth !== grant.jwt) { if (grant.jwt && newAuth !== grant.jwt) {
console.log('new token to send back'); console.log('new token to send back');
// Access Token // Access Token
@ -288,7 +288,7 @@ var Server = {
return state.Promise.reject(err); return state.Promise.reject(err);
} }
console.log('strolling through pleasantries'); console.log('[onAuth] strolling through pleasantries');
// Add the custom properties we need to manage this remote, then add it to all the relevant // Add the custom properties we need to manage this remote, then add it to all the relevant
// domains and the list of all this websocket's grants. // domains and the list of all this websocket's grants.
grant.domains.forEach(function (domainname) { grant.domains.forEach(function (domainname) {
@ -417,7 +417,7 @@ var Server = {
}); });
} }
, addToken: function addToken(state, srv, newAuth) { , addToken: function addToken(state, srv, newAuth) {
console.log("addToken", newAuth); console.log("[addToken]", newAuth);
if (srv.grants[newAuth]) { if (srv.grants[newAuth]) {
console.log("addToken - duplicate"); console.log("addToken - duplicate");
// return { message: "token sent multiple times", code: "E_TOKEN_REPEAT" }; // return { message: "token sent multiple times", code: "E_TOKEN_REPEAT" };
@ -587,6 +587,7 @@ module.exports.create = function (state) {
}); });
if (initToken) { if (initToken) {
console.log('[wss.onConnection] token provided in http headers');
return Server.addToken(state, srv, initToken).then(function () { return Server.addToken(state, srv, initToken).then(function () {
Server.init(state, srv); Server.init(state, srv);
}).catch(function (err) { }).catch(function (err) {