fix(auth): Fix merge errors from rebase

common/models/user.js

@@ -177,9 +177,9 @@ module.exports = function(User) {
       to: user.email,
       from: 'team@freecodecamp.org',
       subject: 'Welcome to freeCodeCamp!',
-      protocol: isDev ? null : 'https',
-      host: isDev ? devHost : 'freecodecamp.org',
-      port: isDev ? null : 443,
+      protocol: getProtocol(),
+      host: getHost(),
+      port: getPort(),
       template: path.join(
         __dirname,
         '..',
@@ -603,6 +603,7 @@ module.exports = function(User) {
             from: getEmailSender(),
             subject: 'freeCodeCamp - Authentication Request!',
             text: renderAuthEmail({
+              host,
               loginEmail,
               loginToken
             })
@@ -621,11 +622,6 @@ module.exports = function(User) {
               `;
             });
           });
-
-          return dedent`
-            If you entered a valid email, a magic link is on its way.
-            Please follow that link to sign in.
-          `;
         });
       })
       .catch(err => {

server/boot/user.js

@@ -3,7 +3,6 @@ import moment from 'moment-timezone';
 import { Observable } from 'rx';
 import debugFactory from 'debug';
 import emoji from 'node-emoji';
-import uuid from 'node-uuid';
 
 import {
   frontEndChallengeId,
@@ -423,20 +422,6 @@ module.exports = function(app) {
     });
   }
 
-  function getEmailSignup(req, res) {
-    if (req.user) {
-      return res.redirect('/');
-    }
-    if (isSignUpDisabled) {
-      return res.render('account/beta', {
-        title: 'New sign ups are disabled'
-      });
-    }
-    return res.render('account/email-signup', {
-      title: 'Sign up for freeCodeCamp using your Email Address'
-    });
-  }
-
   function getAccount(req, res) {
     const { username } = req.user;
     return res.redirect('/' + username);