diff options
author | Lauri Ojansivu <x@xet7.org> | 2018-11-17 16:58:27 +0200 |
---|---|---|
committer | Lauri Ojansivu <x@xet7.org> | 2018-11-17 16:58:27 +0200 |
commit | 871e229fae23c3b8eaac593c06ee8e030dfb3a8e (patch) | |
tree | 7c8dc823d930d56864c6e7f77332f468e2a39b26 /models/settings.js | |
parent | e1b3f3831531bbf0011bee4e90c18fd7f9f8b5f4 (diff) | |
parent | 21a8c7cc45e03dafd8ea3f255a7fc7106cd61ae0 (diff) | |
download | wekan-871e229fae23c3b8eaac593c06ee8e030dfb3a8e.tar.gz wekan-871e229fae23c3b8eaac593c06ee8e030dfb3a8e.tar.bz2 wekan-871e229fae23c3b8eaac593c06ee8e030dfb3a8e.zip |
Merge branch 'edge' into meteor-1.8
Diffstat (limited to 'models/settings.js')
-rw-r--r-- | models/settings.js | 31 |
1 files changed, 0 insertions, 31 deletions
diff --git a/models/settings.js b/models/settings.js index 6c9f5a53..c2a9bf01 100644 --- a/models/settings.js +++ b/models/settings.js @@ -76,7 +76,6 @@ if (Meteor.isServer) { }, createdAt: now, modifiedAt: now}; Settings.insert(defaultSetting); } - const newSetting = Settings.findOne(); if (!process.env.MAIL_URL && newSetting.mailUrl()) process.env.MAIL_URL = newSetting.mailUrl(); @@ -236,35 +235,5 @@ if (Meteor.isServer) { cas: isCasEnabled(), }; }, - - getDefaultAuthenticationMethod() { - return process.env.DEFAULT_AUTHENTICATION_METHOD; - }, - - // TODO: patch error : did not check all arguments during call - logoutWithTimer(userId) { - if (process.env.LOGOUT_WITH_TIMER) { - Jobs.run('logOut', userId, { - in: { - days: process.env.LOGOUT_IN, - }, - on: { - hour: process.env.LOGOUT_ON_HOURS, - minute: process.env.LOGOUT_ON_MINUTES, - }, - priority: 1, - }); - } - }, - }); - - Jobs.register({ - logOut(userId) { - Meteor.users.update( - {_id: userId}, - {$set: {'services.resume.loginTokens': []}} - ); - this.success(); - }, }); } |