coolaj86
/
telebit-relay.js
1
1
Fork 0
Code Issues 4 Pull Requests Releases Activity

Merge branch 'master' into commercial

This commit is contained in:
AJ ONeal 2018-06-29 21:40:18 +00:00
parent 5deefa9832 cda10951d8
commit 44cca52f50
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/relay.js
View File

@ -243,7 +243,7 @@ var Server = {
, onAuth: function onAuth(state, srv, newAuth, grant) { , onAuth: function onAuth(state, srv, newAuth, grant) {
console.log('\n[relay.js] onAuth'); console.log('\n[relay.js] onAuth');
console.log(newAuth); console.log(newAuth);
console.log(grant); //console.log(grant);
//var stringauth; //var stringauth;
var err; var err;
if (!grant || 'object' !== typeof grant) { if (!grant || 'object' !== typeof grant) {
@ -264,7 +264,7 @@ var Server = {
} }
console.log('[onAuth] check for upgrade token'); console.log('[onAuth] check for upgrade token');
console.log(grant); //console.log(grant);
if (grant.jwt) { if (grant.jwt) {
if (newAuth !== grant.jwt) { if (newAuth !== grant.jwt) {
console.log('[onAuth] new token to send back'); console.log('[onAuth] new token to send back');
@ -311,7 +311,7 @@ var Server = {
srv.domains = Object.keys(srv.domainsMap); srv.domains = Object.keys(srv.domainsMap);
srv.currentDesc = (grant.device && (grant.device.id || grant.device.hostname)) || srv.domains.join(','); srv.currentDesc = (grant.device && (grant.device.id || grant.device.hostname)) || srv.domains.join(',');
grant.currentDesc = (grant.device && (grant.device.id || grant.device.hostname)) || grant.domains.join(','); grant.currentDesc = (grant.device && (grant.device.id || grant.device.hostname)) || grant.domains.join(',');
grant.srv = srv; //grant.srv = srv;
//grant.ws = srv.ws; //grant.ws = srv.ws;
//grant.upgradeReq = srv.upgradeReq; //grant.upgradeReq = srv.upgradeReq;
grant.clients = {}; grant.clients = {};