diff options
author | Lauri Ojansivu <x@xet7.org> | 2017-05-13 12:51:44 +0300 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2017-05-13 12:51:44 +0300 |
commit | 1c3551201a9d898183e57a67df71cf1ce1e26c84 (patch) | |
tree | 8014faca721b88f00939eeb7e8fdbcf1fd8872db /server | |
parent | 8267b5a01c1a8c2a00bb2464cb9860561985070d (diff) | |
parent | c0ddc89f21b6370ea58eee68c5c3696861b3e8f2 (diff) | |
download | wekan-1c3551201a9d898183e57a67df71cf1ce1e26c84.tar.gz wekan-1c3551201a9d898183e57a67df71cf1ce1e26c84.tar.bz2 wekan-1c3551201a9d898183e57a67df71cf1ce1e26c84.zip |
Merge branch 'huneau-meteor-1.4-RESTAPI' into devel
Diffstat (limited to 'server')
-rw-r--r-- | server/authentication.js | 21 | ||||
-rw-r--r-- | server/logger.js | 25 |
2 files changed, 37 insertions, 9 deletions
diff --git a/server/authentication.js b/server/authentication.js new file mode 100644 index 00000000..816c4d4c --- /dev/null +++ b/server/authentication.js @@ -0,0 +1,21 @@ +Meteor.startup(() => { + Authentication = {}; + + Authentication.checkUserId = function (userId) { + if (userId === undefined) { + const error = new Meteor.Error('Unauthorized', 'Unauthorized'); + error.statusCode = 401; + throw error; + } + const admin = Users.findOne({ _id: userId, isAdmin: true }); + + if (admin === undefined) { + const error = new Meteor.Error('Forbidden', 'Forbidden'); + error.statusCode = 403; + throw error; + } + + }; + +}); + diff --git a/server/logger.js b/server/logger.js index 376e30aa..70caa292 100644 --- a/server/logger.js +++ b/server/logger.js @@ -3,22 +3,21 @@ Meteor.startup(() => { require('winston-zulip'); const fs = require('fs'); - //remove default logger - Winston.remove(Winston.transports.Console); - - const loggerEnable = process.env.LOGGER_ENABLE || false; - console.log('here1'); - console.log(loggerEnable); if (loggerEnable) { - console.log('here2'); + + Winston.log('info', 'logger is enable'); const loggers = process.env.LOGGERS.split(',') || 'console'; + Winston.log('info', `Loggers selected : ${ process.env.LOGGERS }, if empty default is console`); if (loggers.includes('console')) { Winston.add(Winston.transports.Console, { json: true, timestamp: true, }); + } else { + //remove default logger + Winston.remove(Winston.transports.Console); } if (loggers.includes('file')) { @@ -45,15 +44,23 @@ Meteor.startup(() => { const loggerZulipTo = process.env.LOGGER_ZULIP_TO || 'logs'; const loggerZulipSubject = process.env.LOGGER_ZULIP_SUBJECT || 'wekan'; - Winston.add(Winston.transports.Zulip, { + const zulipConfig = { zulipUsername: loggerZulipUsername, zulipApikey: loggerZulipApikey, zulipRealm: loggerZulipRealm, zulipTo: loggerZulipTo, zulipSubject: loggerZulipSubject, - }); + }; + + Winston.add(Winston.transports.Zulip, zulipConfig); + + Winston.log('info', `zulipconfig ${zulipConfig}`); } + } else { + //remove default logger + Winston.remove(Winston.transports.Console); } + Winston.log('info', 'Logger is completly instanciate'); }); |