liz/wikijs-fork
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

feat: theming resolvers + config fixes

Browse Source
This commit is contained in:
NGPixel
2018-06-10 23:23:09 -04:00
parent 1d2d1c66c1
commit 197b6b4160
15 changed files with 221 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
server/core/auth.js
View File

@@ -41,10 +41,11 @@ module.exports = {
// Load enable strategies
const enabledStrategies = await WIKI.db.authentication.getEnabledStrategies()
console.info(enabledStrategies)
for (let idx in enabledStrategies) {
const stg = enabledStrategies[idx]
const strategy = require(`../modules/authentication/${stg.key}`)
stg.config.callbackURL = `${WIKI.config.site.host}/login/${stg.key}/callback`
stg.config.callbackURL = `${WIKI.config.host}/login/${stg.key}/callback` // TODO: config.host
strategy.init(passport, stg.config)
fs.readFile(path.join(WIKI.ROOTPATH, `assets/svg/auth-icon-${strategy.key}.svg`), 'utf8').then(iconData => {

18
server/core/logger.js
View File

@@ -1,4 +1,4 @@
const _ = require('lodash')
// const _ = require('lodash')
const winston = require('winston')
/* global WIKI */
@@ -16,11 +16,17 @@ module.exports = {
)
})
_.forOwn(_.omitBy(WIKI.config.logging.loggers, s => s.enabled === false), (loggerConfig, loggerKey) => {
let loggerModule = require(`../modules/logging/${loggerKey}`)
loggerModule.init(logger, loggerConfig)
this.loggers[logger.key] = loggerModule
})
// Init Console (default)
let loggerConsoleModule = require(`../modules/logging/console`)
loggerConsoleModule.init(logger)
this.loggers['console'] = loggerConsoleModule
// _.forOwn(_.omitBy(WIKI.config.logging.loggers, s => s.enabled === false), (loggerConfig, loggerKey) => {
// let loggerModule = require(`../modules/logging/${loggerKey}`)
// loggerModule.init(logger, loggerConfig)
// this.loggers[logger.key] = loggerModule
// })
return logger
}