frodovdr/node-red
1
0
Fork 0
mirror of https://github.com/node-red/node-red.git synced 2025-03-01 10:36:34 +00:00
Code Issues Packages Projects Releases Wiki Activity

Move log and i18n to their own utils module

Browse Source
This commit is contained in:
Nick O'Leary
2018-04-19 11:23:08 +01:00
parent 7409cb3abb
commit 1cdb039ea2
24 changed files with 101 additions and 72 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
red/api/auth/index.js
View File

@@ -25,7 +25,7 @@ var permissions = require("./permissions");
var theme = require("../editor/theme");
var settings = null;
var log = null
var log = require("../../util").log; // TODO: separate module
passport.use(strategies.bearerStrategy.BearerStrategy);
@@ -36,13 +36,11 @@ var server = oauth2orize.createServer();
server.exchange(oauth2orize.exchange.password(strategies.passwordTokenExchange));
function init(runtime) {
settings = runtime.settings;
log = runtime.log;
function init(_settings,storage) {
settings = _settings;
if (settings.adminAuth) {
Users.init(settings.adminAuth);
Tokens.init(settings.adminAuth,runtime.storage);
strategies.init(runtime);
Tokens.init(settings.adminAuth,storage);
}
}

5
red/api/auth/strategies.js
View File

@@ -26,7 +26,7 @@ var Users = require("./users");
var Clients = require("./clients");
var permissions = require("./permissions");
var log;
var log = require("../../util").log; // TODO: separate module
var bearerStrategy = function (accessToken, done) {
// is this a valid token?
@@ -124,9 +124,6 @@ AnonymousStrategy.prototype.authenticate = function(req) {
}
module.exports = {
init: function(runtime) {
log = runtime.log;
},
bearerStrategy: bearerStrategy,
clientPasswordStrategy: clientPasswordStrategy,
passwordTokenExchange: passwordTokenExchange,