Merge branch 'master' into commercial
This commit is contained in:
commit
44cca52f50
|
@ -243,7 +243,7 @@ var Server = {
|
|||
, onAuth: function onAuth(state, srv, newAuth, grant) {
|
||||
console.log('\n[relay.js] onAuth');
|
||||
console.log(newAuth);
|
||||
console.log(grant);
|
||||
//console.log(grant);
|
||||
//var stringauth;
|
||||
var err;
|
||||
if (!grant || 'object' !== typeof grant) {
|
||||
|
@ -264,7 +264,7 @@ var Server = {
|
|||
}
|
||||
|
||||
console.log('[onAuth] check for upgrade token');
|
||||
console.log(grant);
|
||||
//console.log(grant);
|
||||
if (grant.jwt) {
|
||||
if (newAuth !== grant.jwt) {
|
||||
console.log('[onAuth] new token to send back');
|
||||
|
@ -311,7 +311,7 @@ var Server = {
|
|||
srv.domains = Object.keys(srv.domainsMap);
|
||||
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.srv = srv;
|
||||
//grant.srv = srv;
|
||||
//grant.ws = srv.ws;
|
||||
//grant.upgradeReq = srv.upgradeReq;
|
||||
grant.clients = {};
|
||||
|
|
Loading…
Reference in New Issue