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

MAJOR: Updates for Authenticated Web UI and CLI #30

Open
coolaj86 wants to merge 77 commits from next into master
pull from: next
merge into: coolaj86:master
Conversation 0 Commits 77 Files Changed 28 +8 -5
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 075342920d - Show all commits

6
lib/admin/js/telebit-token.js
View File

@ -47,7 +47,7 @@ common.authorize = common.getToken = function getToken(state) {
state.config.pretoken = pretoken; state.config.pretoken = pretoken;
state._connecting = true; state._connecting = true;
return common.reqLocalAsync({ url: '/api/config', method: 'POST', data: state.config || {} }).then(function () { return common.reqLocalAsync({ url: '/api/config', method: 'POST', body: state.config }).then(function () {
console.info("waiting..."); console.info("waiting...");
return PromiseA.resolve(); return PromiseA.resolve();
}).catch(function (err) { }).catch(function (err) {
@ -77,7 +77,7 @@ common.authorize = common.getToken = function getToken(state) {
} catch(e) { } catch(e) {
console.warn("[warning] could not decode token"); console.warn("[warning] could not decode token");
} }
return common.reqLocalAsync({ url: '/api/config', method: 'POST', data: state.config }).then(function () { return common.reqLocalAsync({ url: '/api/config', method: 'POST', body: state.config }).then(function () {
//console.log("Pairing Enabled Locally"); //console.log("Pairing Enabled Locally");
return PromiseA.resolve(); return PromiseA.resolve();
}).catch(function (err) { }).catch(function (err) {
@ -92,7 +92,7 @@ common.authorize = common.getToken = function getToken(state) {
return PromiseA.resolve(); return PromiseA.resolve();
} }
, end: function () { , end: function () {
return common.reqLocalAsync({ url: '/api/enable', method: 'POST', data: [] }).then(function () { return common.reqLocalAsync({ url: '/api/enable', method: 'POST', body: [] }).then(function () {
console.info("Success"); console.info("Success");
// workaround for https://github.com/nodejs/node/issues/21319 // workaround for https://github.com/nodejs/node/issues/21319

7
lib/admin/js/telebit.js
View File

@ -226,9 +226,12 @@ common.api.token = function (state, handlers) {
, hostname: pairRequestUrl.hostname , hostname: pairRequestUrl.hostname
, href: pairRequestUrl.href , href: pairRequestUrl.href
, pathname: pairRequestUrl.pathname , pathname: pairRequestUrl.pathname
, port: pairRequestUrl.port // because why wouldn't node require 'path' on a json object and accept 'pathname' on a URL object...
// https://twitter.com/coolaj86/status/1053947919890403328
, path: pairRequestUrl.pathname
, port: pairRequestUrl.port || null
, protocol: pairRequestUrl.protocol , protocol: pairRequestUrl.protocol
, search: pairRequestUrl.search , search: pairRequestUrl.search || null
} }
, method: dir.pair_request.method , method: dir.pair_request.method
, json: authReq , json: authReq