From 2411dffa2ce997370a636ed56cc73bcc4661ec7f Mon Sep 17 00:00:00 2001
From: Sheogorath
Date: Wed, 7 Mar 2018 15:17:35 +0100
Subject: Change config to camel case with backwards compatibility

This refactors the configs a bit to now use camel case everywhere.
This change should help to clean up the config interface and make it
better understandable.

Signed-off-by: Sheogorath <sheogorath@shivering-isles.com>
---
 lib/web/auth/email/index.js | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

(limited to 'lib/web/auth/email')

diff --git a/lib/web/auth/email/index.js b/lib/web/auth/email/index.js
index 760075f8..f7e58d46 100644
--- a/lib/web/auth/email/index.js
+++ b/lib/web/auth/email/index.js
@@ -31,7 +31,7 @@ passport.use(new LocalStrategy({
   })
 }))
 
-if (config.allowemailregister) {
+if (config.allowEmailRegister) {
   emailAuth.post('/register', urlencodedParser, function (req, res, next) {
     if (!req.body.email || !req.body.password) return response.errorBadRequest(res)
     if (!validator.isEmail(req.body.email)) return response.errorBadRequest(res)
@@ -51,10 +51,10 @@ if (config.allowemailregister) {
           logger.debug('user found: ' + user.id)
           req.flash('error', 'This email has been used, please try another one.')
         }
-        return res.redirect(config.serverurl + '/')
+        return res.redirect(config.serverURL + '/')
       }
       req.flash('error', 'Failed to register your account, please try again.')
-      return res.redirect(config.serverurl + '/')
+      return res.redirect(config.serverURL + '/')
     }).catch(function (err) {
       logger.error('auth callback failed: ' + err)
       return response.errorInternalError(res)
@@ -67,8 +67,8 @@ emailAuth.post('/login', urlencodedParser, function (req, res, next) {
   if (!validator.isEmail(req.body.email)) return response.errorBadRequest(res)
   setReturnToFromReferer(req)
   passport.authenticate('local', {
-    successReturnToOrRedirect: config.serverurl + '/',
-    failureRedirect: config.serverurl + '/',
+    successReturnToOrRedirect: config.serverURL + '/',
+    failureRedirect: config.serverURL + '/',
     failureFlash: 'Invalid email or password.'
   })(req, res, next)
 })
-- 
cgit v1.2.3