coolaj86/telebit.js
1
2
Fork 1
Code Issues 48 Pull Requests 3 Releases Activity

don't show pairing when pairing is unavailable

Browse Source
This commit is contained in:
AJ ONeal 2018-06-21 19:24:09 +00:00
parent 5c28bff26b
commit bcdd3cd951
1 changed files with 28 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
bin/telebit.js
View File

@ -150,7 +150,13 @@ function askForConfig(answers, mainCb) {
return; return;
} }
if (200 !== resp.statusCode || (Buffer.isBuffer(body) || 'object' !== typeof body) || !body.api_host) { if (200 !== resp.statusCode || (Buffer.isBuffer(body) || 'object' !== typeof body) || !body.api_host) {
console.warn("[" + resp.statusCode + " Warning] '" + urlstr + "' does not describe a current telebit version."); console.warn("===================");
console.warn(" WARNING ");
console.warn("===================");
console.warn("");
console.warn("[" + resp.statusCode + "] '" + urlstr + "'");
console.warn("This server does not describe a current telebit version (but it may still work).");
console.warn("");
console.warn(body); console.warn(body);
} else if (body && body.pair_request) { } else if (body && body.pair_request) {
answers._can_pair = true; answers._can_pair = true;
@ -183,7 +189,7 @@ function askForConfig(answers, mainCb) {
}); });
} }
, function checkRelay(cb) { , function checkRelay(cb) {
if (!/\btelebit\.cloud\b/i.test(answers.relay)) { if (!answers._can_pair) {
standardSet = standardSet.concat(advancedSet); standardSet = standardSet.concat(advancedSet);
} }
nextSet = standardSet; nextSet = standardSet;
@ -275,7 +281,14 @@ function askForConfig(answers, mainCb) {
try { try {
answers.token = jwt.decode(resp); answers.token = jwt.decode(resp);
} catch(e) { } catch(e) {
// delete answers.token; // is not jwt
try {
if (JSON.parse(resp).subject) {
answers.token = resp;
}
} catch(e) {
// is not authRequest either
}
} }
if (!answers.token) { if (!answers.token) {
resp = resp.toLowerCase(); resp = resp.toLowerCase();
@ -478,16 +491,18 @@ function parseConfig(err, text) {
}); });
askForConfig(answers, function (err, answers) { askForConfig(answers, function (err, answers) {
answers._otp = common.otp(); if (!answers.token && answers._can_pair) {
console.log("=============================================="); answers._otp = common.otp();
console.log(" Hey, Listen! "); console.log("==============================================");
console.log("=============================================="); console.log(" Hey, Listen! ");
console.log(" "); console.log("==============================================");
console.log(" GO CHECK YOUR EMAIL! "); console.log(" ");
console.log(" "); console.log(" GO CHECK YOUR EMAIL! ");
console.log(" DEVICE PAIR CODE: 0000 ".replace(/0000/g, answers._otp)); console.log(" ");
console.log(" "); console.log(" DEVICE PAIR CODE: 0000 ".replace(/0000/g, answers._otp));
console.log("=============================================="); console.log(" ");
console.log("==============================================");
}
// TODO use php-style object querification // TODO use php-style object querification
putConfig('config', Object.keys(answers).map(function (key) { putConfig('config', Object.keys(answers).map(function (key) {
return key + ':' + answers[key]; return key + ':' + answers[key];