12 files changed, 16 insertions, 36 deletions

diff --git a/lib/web/auth/dropbox/index.js b/lib/web/auth/dropbox/index.js
index 1cfabd29..aef011cb 100644
--- a/lib/web/auth/dropbox/index.js
+++ b/lib/web/auth/dropbox/index.js
@@ -4,7 +4,7 @@ const Router = require('express').Router
 const passport = require('passport')
 const DropboxStrategy = require('passport-dropbox-oauth2').Strategy
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let dropboxAuth = module.exports = Router()
 
@@ -16,7 +16,6 @@ passport.use(new DropboxStrategy({
 }, passportGeneralCallback))
 
 dropboxAuth.get('/auth/dropbox', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('dropbox-oauth2')(req, res, next)
 })
 
diff --git a/lib/web/auth/email/index.js b/lib/web/auth/email/index.js
index 32e21428..78ca933b 100644
--- a/lib/web/auth/email/index.js
+++ b/lib/web/auth/email/index.js
@@ -7,9 +7,8 @@ const LocalStrategy = require('passport-local').Strategy
 const config = require('../../../config')
 const models = require('../../../models')
 const logger = require('../../../logger')
-const { setReturnToFromReferer } = require('../utils')
 const { urlencodedParser } = require('../../utils')
-const response = require('../../../response')
+const errors = require('../../../errors')
 
 let emailAuth = module.exports = Router()
 
@@ -39,8 +38,8 @@ passport.use(new LocalStrategy({
 
 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)
+    if (!req.body.email || !req.body.password) return errors.errorBadRequest(res)
+    if (!validator.isEmail(req.body.email)) return errors.errorBadRequest(res)
     models.User.findOrCreate({
       where: {
         email: req.body.email
@@ -63,15 +62,14 @@ if (config.allowEmailRegister) {
       return res.redirect(config.serverURL + '/')
     }).catch(function (err) {
       logger.error('auth callback failed: ' + err)
-      return response.errorInternalError(res)
+      return errors.errorInternalError(res)
     })
   })
 }
 
 emailAuth.post('/login', 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)
-  setReturnToFromReferer(req)
+  if (!req.body.email || !req.body.password) return errors.errorBadRequest(res)
+  if (!validator.isEmail(req.body.email)) return errors.errorBadRequest(res)
   passport.authenticate('local', {
     successReturnToOrRedirect: config.serverURL + '/',
     failureRedirect: config.serverURL + '/',
diff --git a/lib/web/auth/facebook/index.js b/lib/web/auth/facebook/index.js
index 418ddeee..0ba948bb 100644
--- a/lib/web/auth/facebook/index.js
+++ b/lib/web/auth/facebook/index.js
@@ -5,7 +5,7 @@ const passport = require('passport')
 const FacebookStrategy = require('passport-facebook').Strategy
 
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let facebookAuth = module.exports = Router()
 
@@ -16,7 +16,6 @@ passport.use(new FacebookStrategy({
 }, passportGeneralCallback))
 
 facebookAuth.get('/auth/facebook', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('facebook')(req, res, next)
 })
 
diff --git a/lib/web/auth/github/index.js b/lib/web/auth/github/index.js
index afa5fa31..3a3a84c6 100644
--- a/lib/web/auth/github/index.js
+++ b/lib/web/auth/github/index.js
@@ -5,7 +5,7 @@ const passport = require('passport')
 const GithubStrategy = require('passport-github').Strategy
 const config = require('../../../config')
 const response = require('../../../response')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let githubAuth = module.exports = Router()
 
@@ -16,7 +16,6 @@ passport.use(new GithubStrategy({
 }, passportGeneralCallback))
 
 githubAuth.get('/auth/github', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('github')(req, res, next)
 })
 
diff --git a/lib/web/auth/gitlab/index.js b/lib/web/auth/gitlab/index.js
index 4cebbc10..1b628e81 100644
--- a/lib/web/auth/gitlab/index.js
+++ b/lib/web/auth/gitlab/index.js
@@ -5,7 +5,7 @@ const passport = require('passport')
 const GitlabStrategy = require('passport-gitlab2').Strategy
 const config = require('../../../config')
 const response = require('../../../response')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let gitlabAuth = module.exports = Router()
 
@@ -18,7 +18,6 @@ passport.use(new GitlabStrategy({
 }, passportGeneralCallback))
 
 gitlabAuth.get('/auth/gitlab', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('gitlab')(req, res, next)
 })
 
diff --git a/lib/web/auth/google/index.js b/lib/web/auth/google/index.js
index ad9bcd7a..feb83025 100644
--- a/lib/web/auth/google/index.js
+++ b/lib/web/auth/google/index.js
@@ -4,7 +4,7 @@ const Router = require('express').Router
 const passport = require('passport')
 var GoogleStrategy = require('passport-google-oauth20').Strategy
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let googleAuth = module.exports = Router()
 
@@ -16,7 +16,6 @@ passport.use(new GoogleStrategy({
 }, passportGeneralCallback))
 
 googleAuth.get('/auth/google', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('google', { scope: ['profile'] })(req, res, next)
 })
 // google auth callback
diff --git a/lib/web/auth/ldap/index.js b/lib/web/auth/ldap/index.js
index 96143664..b501106d 100644
--- a/lib/web/auth/ldap/index.js
+++ b/lib/web/auth/ldap/index.js
@@ -6,9 +6,8 @@ const LDAPStrategy = require('passport-ldapauth')
 const config = require('../../../config')
 const models = require('../../../models')
 const logger = require('../../../logger')
-const { setReturnToFromReferer } = require('../utils')
 const { urlencodedParser } = require('../../utils')
-const response = require('../../../response')
+const errors = require('../../../errors')
 
 let ldapAuth = module.exports = Router()
 
@@ -81,8 +80,7 @@ passport.use(new LDAPStrategy({
 }))
 
 ldapAuth.post('/auth/ldap', urlencodedParser, function (req, res, next) {
-  if (!req.body.username || !req.body.password) return response.errorBadRequest(res)
-  setReturnToFromReferer(req)
+  if (!req.body.username || !req.body.password) return errors.errorBadRequest(res)
   passport.authenticate('ldapauth', {
     successReturnToOrRedirect: config.serverURL + '/',
     failureRedirect: config.serverURL + '/',
diff --git a/lib/web/auth/mattermost/index.js b/lib/web/auth/mattermost/index.js
index 48d6d297..78eca2af 100644
--- a/lib/web/auth/mattermost/index.js
+++ b/lib/web/auth/mattermost/index.js
@@ -5,7 +5,7 @@ const passport = require('passport')
 const Mattermost = require('mattermost')
 const OAuthStrategy = require('passport-oauth2').Strategy
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 const mattermost = new Mattermost.Client()
 
@@ -36,7 +36,6 @@ mattermostStrategy.userProfile = (accessToken, done) => {
 passport.use(mattermostStrategy)
 
 mattermostAuth.get('/auth/mattermost', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('oauth2')(req, res, next)
 })
 
diff --git a/lib/web/auth/oauth2/index.js b/lib/web/auth/oauth2/index.js
index 78434271..2bd73196 100644
--- a/lib/web/auth/oauth2/index.js
+++ b/lib/web/auth/oauth2/index.js
@@ -4,7 +4,7 @@ const Router = require('express').Router
 const passport = require('passport')
 const { Strategy, InternalOAuthError } = require('passport-oauth2')
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let oauth2Auth = module.exports = Router()
 
@@ -93,7 +93,6 @@ passport.use(new OAuth2CustomStrategy({
 }, passportGeneralCallback))
 
 oauth2Auth.get('/auth/oauth2', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('oauth2')(req, res, next)
 })
 
diff --git a/lib/web/auth/openid/index.js b/lib/web/auth/openid/index.js
index b0a28bec..28e164f5 100644
--- a/lib/web/auth/openid/index.js
+++ b/lib/web/auth/openid/index.js
@@ -7,7 +7,6 @@ const config = require('../../../config')
 const models = require('../../../models')
 const logger = require('../../../logger')
 const { urlencodedParser } = require('../../utils')
-const { setReturnToFromReferer } = require('../utils')
 
 let openIDAuth = module.exports = Router()
 
@@ -48,7 +47,6 @@ passport.use(new OpenIDStrategy({
 }))
 
 openIDAuth.post('/auth/openid', urlencodedParser, function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('openid')(req, res, next)
 })
 
diff --git a/lib/web/auth/twitter/index.js b/lib/web/auth/twitter/index.js
index 5aba20ff..56389f84 100644
--- a/lib/web/auth/twitter/index.js
+++ b/lib/web/auth/twitter/index.js
@@ -5,7 +5,7 @@ const passport = require('passport')
 const TwitterStrategy = require('passport-twitter').Strategy
 
 const config = require('../../../config')
-const { setReturnToFromReferer, passportGeneralCallback } = require('../utils')
+const { passportGeneralCallback } = require('../utils')
 
 let twitterAuth = module.exports = Router()
 
@@ -16,7 +16,6 @@ passport.use(new TwitterStrategy({
 }, passportGeneralCallback))
 
 twitterAuth.get('/auth/twitter', function (req, res, next) {
-  setReturnToFromReferer(req)
   passport.authenticate('twitter')(req, res, next)
 })
 
diff --git a/lib/web/auth/utils.js b/lib/web/auth/utils.js
index 141a0d6f..fb69f08c 100644
--- a/lib/web/auth/utils.js
+++ b/lib/web/auth/utils.js
@@ -3,12 +3,6 @@
 const models = require('../../models')
 const logger = require('../../logger')
 
-exports.setReturnToFromReferer = function setReturnToFromReferer (req) {
-  var referer = req.get('referer')
-  if (!req.session) req.session = {}
-  req.session.returnTo = referer
-}
-
 exports.passportGeneralCallback = function callback (accessToken, refreshToken, profile, done) {
   var stringifiedProfile = JSON.stringify(profile)
   models.User.findOrCreate({