Move log and i18n to their own utils module

red/api/auth/index.js

@@ -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);
     }
 }
 

red/api/auth/strategies.js

@@ -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,

red/api/editor/index.js

@@ -26,7 +26,9 @@ var nodes = require("../admin/nodes"); // TODO: move /icons into here
 var needsPermission;
 var runtime;
 var runtimeAPI;
-var log;
+var log = require("../../util").log; // TODO: separate module
+var i18n = require("../../util").i18n; // TODO: separate module
+
 var apiUtil = require("../util");
 
 var ensureRuntimeStarted = function(req,res,next) {
@@ -42,15 +44,16 @@ module.exports = {
     init: function(server, settings, _runtime, _runtimeAPI) {
         runtime = _runtime;
         runtimeAPI = _runtimeAPI;
-        log = runtime.log;
         needsPermission = auth.needsPermission;
         if (!settings.disableEditor) {
             info.init(runtimeAPI);
             comms.init(server,runtime);
 
             var ui = require("./ui");
-            // ui is passed runtime so it get access runtime.nodes.getNodeIconPath
+
+            // TODO: ui is passed runtime so it get access runtime.nodes.getNodeIconPath
             ui.init(runtime);
+
             var editorApp = express();
             if (settings.requireHttps === true) {
                 editorApp.enable('trust proxy');
@@ -112,7 +115,7 @@ module.exports = {
     },
     start: function() {
         var catalogPath = path.resolve(path.join(__dirname,"locales"));
-        return runtime.i18n.registerMessageCatalogs([
+        return i18n.registerMessageCatalogs([
             {namespace: "editor",   dir: catalogPath, file:"editor.json"},
             {namespace: "jsonata",  dir: catalogPath, file:"jsonata.json"},
             {namespace: "infotips", dir: catalogPath, file:"infotips.json"}

red/api/index.js

@@ -31,9 +31,8 @@ var editor;
 function init(_server,settings,runtime,runtimeAPI) {
     server = _server;
     if (settings.httpAdminRoot !== false) {
-        apiUtil.init(runtime);
         adminApp = express();
-        auth.init(runtime);
+        auth.init(settings,runtime.storage);
 
         var maxApiRequestSize = settings.apiMaxLength || '5mb';
         adminApp.use(bodyParser.json({limit:maxApiRequestSize}));

red/api/util.js

@@ -15,14 +15,11 @@
  **/
 
 
-var i18n;
-var log;
+var log = require("../util").log; // TODO: separate module
+var i18n = require("../util").i18n; // TODO: separate module
+
 
 module.exports = {
-    init: function(_runtime) {
-        log = _runtime.log;
-        i18n = _runtime.i18n;
-    },
     errorHandler: function(err,req,res,next) {
         console.error(err.stack);
         if (err.message === "request entity too large") {