Add basic auth to extension
diff --git a/build/UserALEWebExtension/background.js b/build/UserALEWebExtension/background.js
index d7d0bfc..8b47095 100644
--- a/build/UserALEWebExtension/background.js
+++ b/build/UserALEWebExtension/background.js
@@ -17,6 +17,7 @@
var prefix = 'USERALE_';
var CONFIG_CHANGE = prefix + 'CONFIG_CHANGE';
+var AUTH_CHANGE = prefix + 'AUTH_CHANGE';
var ADD_LOG = prefix + 'ADD_LOG';
function _typeof(o) {
@@ -1144,14 +1145,18 @@
}
browser.runtime.onMessage.addListener(function (message) {
switch (message.type) {
+ // Handles logs rerouted from content and option scripts
+ case ADD_LOG:
+ log(message.payload);
+ break;
case CONFIG_CHANGE:
options(message.payload);
dispatchTabMessage(message);
break;
-
- // Handles logs rerouted from content and option scripts
- case ADD_LOG:
- log(message.payload);
+ case AUTH_CHANGE:
+ options({
+ authHeader: message.payload
+ });
break;
default:
console.log('got unknown message type ', message);
diff --git a/build/UserALEWebExtension/content.js b/build/UserALEWebExtension/content.js
index ee92572..53e6c59 100644
--- a/build/UserALEWebExtension/content.js
+++ b/build/UserALEWebExtension/content.js
@@ -1100,7 +1100,6 @@
// browser is defined in firefox, but chrome uses the 'chrome' global.
var browser = browser || chrome;
function rerouteLog(log) {
- console.log(log);
browser.runtime.sendMessage({
type: ADD_LOG,
payload: log
diff --git a/build/UserALEWebExtension/options.js b/build/UserALEWebExtension/options.js
index 813a934..4add4cd 100644
--- a/build/UserALEWebExtension/options.js
+++ b/build/UserALEWebExtension/options.js
@@ -17,6 +17,7 @@
var prefix = 'USERALE_';
var CONFIG_CHANGE = prefix + 'CONFIG_CHANGE';
+var AUTH_CHANGE = prefix + 'AUTH_CHANGE';
var ADD_LOG = prefix + 'ADD_LOG';
var version = "2.4.0";
@@ -1100,7 +1101,6 @@
// browser is defined in firefox, but chrome uses the 'chrome' global.
var browser = browser || chrome;
function rerouteLog(log) {
- console.log(log);
browser.runtime.sendMessage({
type: ADD_LOG,
payload: log
@@ -1131,16 +1131,24 @@
reroute: rerouteLog
});
function setConfig(e) {
+ var user = document.getElementById("user").value;
+ var password = document.getElementById("password").value;
browser.storage.local.set({
useraleConfig: {
url: document.getElementById("url").value,
- userId: document.getElementById("user").value,
+ userId: user,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
}
}, function () {
getConfig();
});
+ if (user && password) {
+ browser.runtime.sendMessage({
+ type: AUTH_CHANGE,
+ payload: "Basic " + btoa("".concat(user, ":").concat(password))
+ });
+ }
}
function getConfig() {
browser.storage.local.get("useraleConfig", function (res) {
diff --git a/build/UserALEWebExtension/optionsPage.html b/build/UserALEWebExtension/optionsPage.html
index 6a49db3..ff92cf0 100644
--- a/build/UserALEWebExtension/optionsPage.html
+++ b/build/UserALEWebExtension/optionsPage.html
@@ -25,18 +25,18 @@
<body>
<h1>Options</h1>
<form>
- <label>User ALE Server Host:</label>
+ <label>Logging Endpoint URL:</label>
<input id="url"/>
<br/>
-
- <label>User ALE Client Script:</label>
- <input id="clientScript"/>
- <br/>
<label>User:</label>
<input id="user"/>
<br/>
+ <label>Password:</label>
+ <input type="password" id="password"/>
+ <br/>
+
<label>Tool Name:</label>
<input id="tool"/>
<br/>
diff --git a/src/UserALEWebExtension/background.js b/src/UserALEWebExtension/background.js
index d8aed77..382244e 100644
--- a/src/UserALEWebExtension/background.js
+++ b/src/UserALEWebExtension/background.js
@@ -45,14 +45,18 @@
browser.runtime.onMessage.addListener(function (message) {
switch (message.type) {
+ // Handles logs rerouted from content and option scripts
+ case MessageTypes.ADD_LOG:
+ userale.log(message.payload);
+ break;
+
case MessageTypes.CONFIG_CHANGE:
userale.options(message.payload)
dispatchTabMessage(message);
break;
- // Handles logs rerouted from content and option scripts
- case MessageTypes.ADD_LOG:
- userale.log(message.payload);
+ case MessageTypes.AUTH_CHANGE:
+ userale.options({authHeader: message.payload});
break;
default:
diff --git a/src/UserALEWebExtension/messageTypes.js b/src/UserALEWebExtension/messageTypes.js
index 8eaedbc..7f49c53 100644
--- a/src/UserALEWebExtension/messageTypes.js
+++ b/src/UserALEWebExtension/messageTypes.js
@@ -18,4 +18,5 @@
var prefix = 'USERALE_';
export var CONFIG_CHANGE = prefix + 'CONFIG_CHANGE';
+export var AUTH_CHANGE = prefix + 'AUTH_CHANGE';
export var ADD_LOG = prefix + 'ADD_LOG';
diff --git a/src/UserALEWebExtension/options.js b/src/UserALEWebExtension/options.js
index dbb06ea..8449959 100644
--- a/src/UserALEWebExtension/options.js
+++ b/src/UserALEWebExtension/options.js
@@ -23,15 +23,24 @@
userale.addCallbacks({reroute: rerouteLog});
function setConfig(e) {
+ let user = document.getElementById("user").value;
+ let password = document.getElementById("password").value;
+
browser.storage.local.set(
{useraleConfig: {
url: document.getElementById("url").value,
- userId: document.getElementById("user").value,
+ userId: user,
toolName: document.getElementById("tool").value,
version: document.getElementById("version").value
}},
() => {getConfig()}
);
+
+ if(user && password) {
+ browser.runtime.sendMessage({type: MessageTypes.AUTH_CHANGE,
+ payload: "Basic " + btoa(`${user}:${password}`)
+ });
+ }
}
function getConfig() {
diff --git a/src/UserALEWebExtension/optionsPage.html b/src/UserALEWebExtension/optionsPage.html
index 6a49db3..ff92cf0 100644
--- a/src/UserALEWebExtension/optionsPage.html
+++ b/src/UserALEWebExtension/optionsPage.html
@@ -25,18 +25,18 @@
<body>
<h1>Options</h1>
<form>
- <label>User ALE Server Host:</label>
+ <label>Logging Endpoint URL:</label>
<input id="url"/>
<br/>
-
- <label>User ALE Client Script:</label>
- <input id="clientScript"/>
- <br/>
<label>User:</label>
<input id="user"/>
<br/>
+ <label>Password:</label>
+ <input type="password" id="password"/>
+ <br/>
+
<label>Tool Name:</label>
<input id="tool"/>
<br/>
