summaryrefslogtreecommitdiff
path: root/ui/app/lib/bitmask.js
diff options
context:
space:
mode:
authorelijah <elijah@riseup.net>2016-12-26 18:25:58 -0800
committerKali Kaneko (leap communications) <kali@leap.se>2016-12-29 03:10:03 +0100
commit38fc7da2a9cff329c3b4975d9f01c16c10b572e9 (patch)
tree90acbc081a959eafac71c64c8cbb483d5b1d1b3c /ui/app/lib/bitmask.js
parent3461fb49985413bb578af511bf0d13efbc25b5b6 (diff)
[feature] add support for authenticated API to bitmask.js
Diffstat (limited to 'ui/app/lib/bitmask.js')
-rw-r--r--ui/app/lib/bitmask.js45
1 files changed, 32 insertions, 13 deletions
diff --git a/ui/app/lib/bitmask.js b/ui/app/lib/bitmask.js
index 9526cb0..a6cf8e5 100644
--- a/ui/app/lib/bitmask.js
+++ b/ui/app/lib/bitmask.js
@@ -36,8 +36,11 @@ catch (err) {}
var bitmask = function(){
var event_handlers = {};
-
var api_url = '/API/';
+ var api_token = null;
+ var last_uid = null;
+ var last_uuid = null;
+
if (window.location.protocol === "file:") {
api_url = 'http://localhost:7070/API/';
}
@@ -45,10 +48,18 @@ var bitmask = function(){
function call(command) {
var url = api_url + command.slice(0, 3).join('/');
var data = JSON.stringify(command.slice(3));
+ var auth_header = null
+ if (api_token) {
+ auth_header = "Token " + btoa(last_uid + ":" + api_token)
+ }
return new Promise(function(resolve, reject) {
var req = new XMLHttpRequest();
+
req.open('POST', url);
+ if (auth_header) {
+ req.setRequestHeader("Authorization", auth_header)
+ }
req.onload = function() {
if (req.status == 200) {
@@ -77,18 +88,20 @@ var bitmask = function(){
};
function event_polling() {
- call(['events', 'poll']).then(function(response) {
- if (response !== null) {
- var evnt = response[0];
- var content = response[1];
- if (evnt in event_handlers) {
- event_handlers[evnt](evnt, content);
+ if (api_token) {
+ call(['events', 'poll']).then(function(response) {
+ if (response !== null) {
+ var evnt = response[0];
+ var content = response[1];
+ if (evnt in event_handlers) {
+ event_handlers[evnt](evnt, content);
+ }
}
- }
- event_polling();
- }, function(error) {
- setTimeout(event_polling, 5000);
- });
+ event_polling();
+ }, function(error) {
+ setTimeout(event_polling, 5000);
+ });
+ }
};
event_polling();
@@ -100,6 +113,7 @@ var bitmask = function(){
};
return {
+ api_token: function() {return api_token},
bonafide: {
provider: {
create: function(domain) {
@@ -162,7 +176,12 @@ var bitmask = function(){
if (typeof autoconf !== 'boolean') {
autoconf = false;
}
- return call(['bonafide', 'user', 'authenticate', uid, password, autoconf]);
+ return call(['bonafide', 'user', 'authenticate', uid, password, autoconf]).then(function(response) {
+ api_token = response.lcl_token
+ last_uuid = response.uuid
+ last_uid = uid
+ return response;
+ });
},
/**