feat: modular auth + logging changes

server/authentication/azure.js

@@ -8,16 +8,15 @@
 
 const AzureAdOAuth2Strategy = require('passport-azure-ad-oauth2').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.azure && wiki.config.auth.azure.enabled) {
   const jwt = require('jsonwebtoken')
   passport.use('azure_ad_oauth2',
     new AzureAdOAuth2Strategy({
-        clientID: wiki.config.auth.azure.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.azure.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/azure/callback',
+      callbackURL: conf.callbackURL,
-        resource: wiki.config.auth.azure.resource,
+      resource: conf.resource,
-        tenant: wiki.config.auth.azure.tenant
+      tenant: conf.tenant
     }, (accessToken, refreshToken, params, profile, cb) => {
       let waadProfile = jwt.decode(params.id_token)
       waadProfile.id = waadProfile.oid
@@ -30,4 +29,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/facebook.js

@@ -8,13 +8,12 @@
 
 const FacebookStrategy = require('passport-facebook').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.facebook && wiki.config.auth.facebook.enabled) {
   passport.use('facebook',
     new FacebookStrategy({
-        clientID: wiki.config.auth.facebook.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.facebook.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/facebook/callback',
+      callbackURL: conf.callbackURL,
       profileFields: ['id', 'displayName', 'email']
     }, function (accessToken, refreshToken, profile, cb) {
       wiki.db.User.processProfile(profile).then((user) => {
@@ -25,4 +24,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/github.js

@@ -8,13 +8,12 @@
 
 const GitHubStrategy = require('passport-github2').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.github && wiki.config.auth.github.enabled) {
   passport.use('github',
     new GitHubStrategy({
-        clientID: wiki.config.auth.github.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.github.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/github/callback',
+      callbackURL: conf.callbackURL,
       scope: ['user:email']
     }, (accessToken, refreshToken, profile, cb) => {
       wiki.db.User.processProfile(profile).then((user) => {
@@ -25,4 +24,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/google.js

@@ -8,13 +8,12 @@
 
 const GoogleStrategy = require('passport-google-oauth20').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.google && wiki.config.auth.google.enabled) {
   passport.use('google',
     new GoogleStrategy({
-        clientID: wiki.config.auth.google.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.google.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/google/callback'
+      callbackURL: conf.callbackURL
     }, (accessToken, refreshToken, profile, cb) => {
       wiki.db.User.processProfile(profile).then((user) => {
         return cb(null, user) || true
@@ -24,4 +23,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/ldap.js

@@ -7,21 +7,21 @@
 // ------------------------------------
 
 const LdapStrategy = require('passport-ldapauth').Strategy
+const fs = require('fs')
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.ldap && wiki.config.auth.ldap.enabled) {
   passport.use('ldapauth',
     new LdapStrategy({
       server: {
-          url: wiki.config.auth.ldap.url,
+        url: conf.url,
-          bindDn: wiki.config.auth.ldap.bindDn,
+        bindDn: conf.bindDn,
-          bindCredentials: wiki.config.auth.ldap.bindCredentials,
+        bindCredentials: conf.bindCredentials,
-          searchBase: wiki.config.auth.ldap.searchBase,
+        searchBase: conf.searchBase,
-          searchFilter: wiki.config.auth.ldap.searchFilter,
+        searchFilter: conf.searchFilter,
         searchAttributes: ['displayName', 'name', 'cn', 'mail'],
-          tlsOptions: (wiki.config.auth.ldap.tlsEnabled) ? {
+        tlsOptions: (conf.tlsEnabled) ? {
           ca: [
-              fs.readFileSync(wiki.config.auth.ldap.tlsCertPath)
+            fs.readFileSync(conf.tlsCertPath)
           ]
         } : {}
       },
@@ -38,4 +38,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/local.js

@@ -8,8 +8,7 @@
 
 const LocalStrategy = require('passport-local').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.local && wiki.config.auth.local.enabled) {
   passport.use('local',
     new LocalStrategy({
       usernameField: 'email',
@@ -31,4 +30,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/microsoft.js

@@ -8,13 +8,12 @@
 
 const WindowsLiveStrategy = require('passport-windowslive').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.microsoft && wiki.config.auth.microsoft.enabled) {
   passport.use('windowslive',
     new WindowsLiveStrategy({
-        clientID: wiki.config.auth.microsoft.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.microsoft.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/ms/callback'
+      callbackURL: conf.callbackURL
     }, function (accessToken, refreshToken, profile, cb) {
       wiki.db.User.processProfile(profile).then((user) => {
         return cb(null, user) || true
@@ -24,4 +23,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/authentication/slack.js

@@ -8,13 +8,12 @@
 
 const SlackStrategy = require('passport-slack').Strategy
 
-module.exports = (passport) => {
+module.exports = (passport, conf) => {
-  if (wiki.config.auth.slack && wiki.config.auth.slack.enabled) {
   passport.use('slack',
     new SlackStrategy({
-        clientID: wiki.config.auth.slack.clientId,
+      clientID: conf.clientId,
-        clientSecret: wiki.config.auth.slack.clientSecret,
+      clientSecret: conf.clientSecret,
-        callbackURL: wiki.config.host + '/login/slack/callback'
+      callbackURL: conf.callbackURL
     }, (accessToken, refreshToken, profile, cb) => {
       wiki.db.User.processProfile(profile).then((user) => {
         return cb(null, user) || true
@@ -24,4 +23,3 @@ module.exports = (passport) => {
     }
     ))
 }
-}

server/controllers/uploads.js

@@ -2,6 +2,9 @@
 
 /* global wiki */
 
+module.exports = false
+return
+
 const express = require('express')
 const router = express.Router()
 

server/master.js

@@ -147,7 +147,7 @@ module.exports = Promise.join(
 
   app.use('/graphql', graphqlApollo.graphqlExpress({ schema: graphqlSchema }))
   app.use('/graphiql', graphqlApollo.graphiqlExpress({ endpointURL: '/graphql' }))
-  app.use('/uploads', mw.auth, ctrl.uploads)
+  // app.use('/uploads', mw.auth, ctrl.uploads)
   app.use('/admin', mw.auth, ctrl.admin)
   app.use('/', mw.auth, ctrl.pages)
 
@@ -173,7 +173,7 @@ module.exports = Promise.join(
   // Start HTTP server
   // ----------------------------------------
 
-  wiki.logger.info('Starting HTTP/WS server on port ' + wiki.config.port + '...')
+  wiki.logger.info(`HTTP/WS Server on port: ${wiki.config.port}`)
 
   app.set('port', wiki.config.port)
   var server = http.createServer(app)
@@ -199,7 +199,7 @@ module.exports = Promise.join(
   })
 
   server.on('listening', () => {
-    wiki.logger.info('HTTP/WS server started successfully! [RUNNING]')
+    wiki.logger.info('HTTP/WS Server: RUNNING')
   })
 
   // ----------------------------------------

server/modules/auth.js

@@ -2,9 +2,9 @@
 
 /* global wiki */
 
-const fs = require('fs')
+const _ = require('lodash')
 
-module.exports = function (passport) {
+module.exports = (passport) => {
   // Serialization user methods
 
   passport.serializeUser(function (user, done) {
@@ -24,12 +24,28 @@ module.exports = function (passport) {
     })
   })
 
-  // Create users for first-time
+  // Load authentication strategies
 
-  return wiki.db.User.findOne({ provider: 'local', email: 'guest@example.com' }).then((c) => {
+  wiki.config.authStrategies = {
-    if (c < 1) {
+    list: _.pickBy(wiki.config.auth, strategy => strategy.enabled),
-      // Create guest account
+    socialEnabled: (_.chain(wiki.config.auth).omit('local').filter(['enabled', true]).value().length > 0)
+  }
+
+  _.forOwn(wiki.config.authStrategies.list, (strategyConfig, strategyName) => {
+    strategyConfig.callbackURL = `${wiki.config.site.host}/login/${strategyName}/callback`
+    require(`../authentication/${strategyName}`)(passport, strategyConfig)
+    wiki.logger.info(`Authentication Provider ${_.upperFirst(strategyName)}: OK`)
+  })
 
+  // Create Guest account for first-time
+
+  return wiki.db.User.findOne({
+    where: {
+      provider: 'local',
+      email: 'guest@example.com'
+    }
+  }).then((c) => {
+    if (c < 1) {
       return wiki.db.User.create({
         provider: 'local',
         email: 'guest@example.com',

server/modules/config.js

@@ -57,17 +57,6 @@ module.exports = {
   // List authentication strategies
     wiki.config = appconfig
     wiki.data = appdata
-
-    // List authentication strategies
-
-    // appconfig.authStrategies = {
-    //   list: _.filter(appconfig.auth, ['enabled', true]),
-    //   socialEnabled: (_.chain(appconfig.auth).omit('local').filter(['enabled', true]).value().length > 0)
-    // }
-    // if (appconfig.authStrategies.list.length < 1) {
-    //   console.error(new Error('You must enable at least 1 authentication strategy!'))
-    //   process.exit(1)
-    // }
   },
 
   /**

server/modules/db.js

@@ -41,7 +41,7 @@ module.exports = {
     // Attempt to connect and authenticate to DB
 
     self.inst.authenticate().then(() => {
-      wiki.logger.info('Connected to PostgreSQL database.')
+      wiki.logger.info('Database (PostgreSQL) connection: OK')
     }).catch(err => {
       wiki.logger.error('Failed to connect to MongoDB instance.')
       return err

server/modules/disk.js

@@ -94,8 +94,6 @@ module.exports = {
    * Creates a base directories (Synchronous).
    */
   createBaseDirectories () {
-    wiki.logger.info('Checking data directories...')
-
     try {
       fs.ensureDirSync(path.resolve(wiki.ROOTPATH, wiki.config.paths.data))
       fs.emptyDirSync(path.resolve(wiki.ROOTPATH, wiki.config.paths.data))
@@ -117,7 +115,7 @@ module.exports = {
       wiki.logger.error(err)
     }
 
-    wiki.logger.info('Data and Repository directories are OK.')
+    wiki.logger.info('Disk Data Paths: OK')
   },
 
   /**

server/modules/git.js

@@ -71,8 +71,6 @@ module.exports = {
   _initRepo() {
     let self = this
 
-    wiki.logger.info('Checking Git repository...')
-
     // -> Check if path is accessible
 
     return fs.mkdirAsync(self._repo.path).catch((err) => {
@@ -92,7 +90,7 @@ module.exports = {
       })
     }).then(() => {
       if (wiki.config.git === false) {
-        wiki.logger.info('Remote Git syncing is disabled. Not recommended!')
+        wiki.logger.warn('Remote Git syncing is disabled. Not recommended!')
         return Promise.resolve(true)
       }
 
@@ -132,7 +130,7 @@ module.exports = {
       wiki.logger.error('Git remote error!')
       throw err
     }).then(() => {
-      wiki.logger.info('Git repository is OK.')
+      wiki.logger.info('Git Repository: OK')
       return true
     })
   },