updated how configs pass

helpers/authHelpers.js

@@ -1,4 +1,3 @@
-// const db = require('../models'); // require our models for syncing
 const logger = require('winston');
 
 module.exports = {

helpers/configVarCheck.js

@@ -1,9 +1,7 @@
-const config = require('../config/speechConfig.js');
 const logger = require('winston');
 
-module.exports = function () {
+module.exports = (config) => {
   // get the config file
-
   for (let configCategoryKey in config) {
     if (config.hasOwnProperty(configCategoryKey)) {
       // get the final variables for each config category

helpers/lbryApi.js

@@ -1,7 +1,6 @@
 const axios = require('axios');
 const logger = require('winston');
-const config = require('../config/speechConfig.js');
-const { apiHost, apiPort } = config.api;
+const { api: { apiHost, apiPort } } = require('../config/speechConfig.js');
 const lbryApiUri = 'http://' + apiHost + ':' + apiPort;
 const { chooseGaLbrynetPublishLabel, sendGATimingEvent } = require('./googleAnalytics.js');
 

passport/local-login.js

@@ -1,8 +1,8 @@
 const PassportLocalStrategy = require('passport-local').Strategy;
-const db = require('../models');
 const logger = require('winston');
 
-function returnUserAndChannelInfo (userInstance) {
+module.exports = (db) => {
+  const returnUserAndChannelInfo = (userInstance) => {
     return new Promise((resolve, reject) => {
       let userInfo = {};
       userInfo['id'] = userInstance.id;
@@ -22,9 +22,9 @@ function returnUserAndChannelInfo (userInstance) {
           reject(error);
         });
     });
-}
+  }
 
-module.exports = new PassportLocalStrategy(
+  return new PassportLocalStrategy(
     {
       usernameField: 'username',
       passwordField: 'password',
@@ -61,5 +61,6 @@ module.exports = new PassportLocalStrategy(
         .catch(error => {
           return done(error);
         });
-  }
-);
+    },
+  );
+};

passport/local-signup.js

@@ -1,9 +1,9 @@
-const db = require('../models');
 const PassportLocalStrategy = require('passport-local').Strategy;
 const lbryApi = require('../helpers/lbryApi.js');
 const logger = require('winston');
 
-module.exports = new PassportLocalStrategy(
+module.exports = (db) => {
+  return new PassportLocalStrategy(
     {
       usernameField: 'username',
       passwordField: 'password',
@@ -61,4 +61,5 @@ module.exports = new PassportLocalStrategy(
           return done(error);
         });
     }
-);
+  );
+};

routes/api-routes.js

@@ -14,7 +14,7 @@ const { getChannelData, getChannelClaims, getClaimId } = require('../controllers
 const NO_CHANNEL = 'NO_CHANNEL';
 const NO_CLAIM = 'NO_CLAIM';
 
-module.exports = (app) => {
+module.exports = (app, siteConfig) => {
   // route to check whether site has published to a channel
   app.get('/api/channel/availability/:name', ({ ip, originalUrl, params }, res) => {
     checkChannelAvailability(params.name)

server.js

@@ -4,7 +4,7 @@ const bodyParser = require('body-parser');
 const expressHandlebars = require('express-handlebars');
 const Handlebars = require('handlebars');
 const { populateLocalsDotUser, serializeSpeechUser, deserializeSpeechUser } = require('./helpers/authHelpers.js');
-const config = require('./config/speechConfig.js');
+const { logging: { logLevel } } = require('./config/speechConfig.js');
 const logger = require('winston');
 const helmet = require('helmet');
 const PORT = 3000; // set port
@@ -13,67 +13,77 @@ const passport = require('passport');
 const cookieSession = require('cookie-session');
 
 // configure logging
-const logLevel = config.logging.logLevel;
 require('./config/loggerConfig.js')(logger, logLevel);
 require('./config/slackConfig.js')(logger);
 
-// check for global config variables
-require('./helpers/configVarCheck.js')();
+module.exports = {
+  speak (something) {
+    console.log(something);
+  },
+  start (config) {
+    // parse config parameter
+    const { mysqlConfig, siteConfig, lbrynetConfig } = config;
 
-// trust the proxy to get ip address for us
-app.enable('trust proxy');
+    // get models
+    const db = require('./models')(mysqlConfig);
 
-// add middleware
-app.use(helmet()); // set HTTP headers to protect against well-known web vulnerabilties
-app.use(express.static(`${__dirname}/public`)); // 'express.static' to serve static files from public directory
-app.use(bodyParser.json()); // 'body parser' for parsing application/json
-app.use(bodyParser.urlencoded({ extended: true })); // 'body parser' for parsing application/x-www-form-urlencoded
-app.use((req, res, next) => {  // custom logging middleware to log all incoming http requests
+    // check for global config variables
+    require('./helpers/configVarCheck.js')(config);
+
+    // trust the proxy to get ip address for us
+    app.enable('trust proxy');
+
+    // add middleware
+    app.use(helmet()); // set HTTP headers to protect against well-known web vulnerabilties
+    app.use(express.static(`${__dirname}/public`)); // 'express.static' to serve static files from public directory
+    app.use(bodyParser.json()); // 'body parser' for parsing application/json
+    app.use(bodyParser.urlencoded({ extended: true })); // 'body parser' for parsing application/x-www-form-urlencoded
+    app.use((req, res, next) => {  // custom logging middleware to log all incoming http requests
       logger.verbose(`Request on ${req.originalUrl} from ${req.ip}`);
       next();
-});
+    });
 
-// configure passport
-passport.serializeUser(serializeSpeechUser);
-passport.deserializeUser(deserializeSpeechUser);
-const localSignupStrategy = require('./passport/local-signup.js');
-const localLoginStrategy = require('./passport/local-login.js');
-passport.use('local-signup', localSignupStrategy);
-passport.use('local-login', localLoginStrategy);
-// initialize passport
-app.use(cookieSession({
+    // configure passport
+    passport.serializeUser(serializeSpeechUser);
+    passport.deserializeUser(deserializeSpeechUser);
+    const localSignupStrategy = require('./passport/local-signup.js')(db);
+    const localLoginStrategy = require('./passport/local-login.js')(db);
+    passport.use('local-signup', localSignupStrategy);
+    passport.use('local-login', localLoginStrategy);
+    // initialize passport
+    app.use(cookieSession({
       name  : 'session',
-  keys  : [config.session.sessionKey],
-  maxAge: 24 * 60 * 60 * 1000, // 24 hours
-}));
-app.use(passport.initialize());
-app.use(passport.session());
+      keys  : [siteConfig.session.sessionKey],
+      maxAge: 24 * 60 * 60 * 1000, // i.e. 24 hours
+    }));
+    app.use(passport.initialize());
+    app.use(passport.session());
 
-// configure handlebars & register it with express app
-const hbs = expressHandlebars.create({
-  defaultLayout: 'embed', // sets the default layout
-  handlebars   : Handlebars, // includes basic handlebars for access to that library
-});
-app.engine('handlebars', hbs.engine);
-app.set('view engine', 'handlebars');
+    // configure handlebars & register it with express app
+    const hbs = expressHandlebars.create({
+      defaultLayout: 'embed',
+      handlebars   : Handlebars,
+    });
+    app.engine('handlebars', hbs.engine);
+    app.set('view engine', 'handlebars');
 
-// middleware to pass user info back to client (for handlebars access), if user is logged in
-app.use(populateLocalsDotUser);
+    // middleware to pass user info back to client (for handlebars access), if user is logged in
+    app.use(populateLocalsDotUser);  // note: I don't think I need this any more?
 
-// start the server
-const start = (config) => {
-  const { mysqlConfig } = config;
-  const db = require('./models')(mysqlConfig); // require our models for syncing
+    // start the server
+    module.exports.startServer(db, app, siteConfig, lbrynetConfig);
+  },
+  startServer (db, app, siteConfig, lbrynetConfig) {
     db.sequelize
     // sync sequelize
       .sync()
       // require routes
       .then(() => {
-      require('./routes/auth-routes.js')(app);
-      require('./routes/api-routes.js')(app);
-      require('./routes/page-routes.js')(app);
-      require('./routes/serve-routes.js')(app);
-      require('./routes/fallback-routes.js')(app);
+        require('./routes/auth-routes.js')(app, siteConfig, lbrynetConfig);
+        require('./routes/api-routes.js')(app, siteConfig, lbrynetConfig);
+        require('./routes/page-routes.js')(app, siteConfig, lbrynetConfig);
+        require('./routes/serve-routes.js')(app, siteConfig, lbrynetConfig);
+        require('./routes/fallback-routes.js')(app, siteConfig, lbrynetConfig);
         const http = require('http');
         return http.Server(app);
       })
@@ -87,11 +97,5 @@ const start = (config) => {
       .catch((error) => {
         logger.error(`Startup Error:`, error);
       });
-};
-
-module.exports = {
-  speak (something) {
-    console.log(something);
   },
-  start,
 };