frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2023-10-10 13:36:53 +02:00
Code Issues Releases Wiki Activity

Allow access_token to be provided in url

Browse Source
This commit is contained in:
Nick O'Leary 2015-03-17 15:15:24 +00:00
parent dd4cec84bf
commit b202c73708
1 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
public/red/settings.js
View File

@ -68,13 +68,20 @@ RED.settings = (function () {
}; };
var init = function (done) { var init = function (done) {
var accessTokenMatch = /[?&]access_token=(.*?)(?:$|&)/.exec(window.location.search);
if (accessTokenMatch) {
var accessToken = accessTokenMatch[1];
RED.settings.set("auth-tokens",{access_token: accessToken});
window.location.search = "";
}
$.ajaxSetup({ $.ajaxSetup({
beforeSend: function(jqXHR,settings) { beforeSend: function(jqXHR,settings) {
// Only attach auth header for requests to relative paths // Only attach auth header for requests to relative paths
if (!/^\s*(https?:|\/|\.)/.test(settings.url)) { if (!/^\s*(https?:|\/|\.)/.test(settings.url)) {
var auth_tokens = RED.settings.get("auth-tokens"); var auth_tokens = RED.settings.get("auth-tokens");
if (auth_tokens) { if (auth_tokens) {
jqXHR.setRequestHeader("authorization","bearer "+auth_tokens.access_token); jqXHR.setRequestHeader("Authorization","Bearer "+auth_tokens.access_token);
} }
} }
} }
@ -84,7 +91,6 @@ RED.settings = (function () {
} }
var load = function(done) { var load = function(done) {
$.ajax({ $.ajax({
headers: { headers: {
"Accept": "application/json" "Accept": "application/json"
@ -102,6 +108,9 @@ RED.settings = (function () {
}, },
error: function(jqXHR,textStatus,errorThrown) { error: function(jqXHR,textStatus,errorThrown) {
if (jqXHR.status === 401) { if (jqXHR.status === 401) {
if (/[?&]access_token=(.*?)(?:$|&)/.test(window.location.search)) {
window.location.search = "";
}
RED.user.login(function() { load(done); }); RED.user.login(function() { load(done); });
} else { } else {
console.log("Unexpected error:",jqXHR.status,textStatus); console.log("Unexpected error:",jqXHR.status,textStatus);