From 843f1c6b350d622c13e37481e038976e7b707ea8 Mon Sep 17 00:00:00 2001
From: Shane Kilkelly <shane@kilkelly.me>
Date: Thu, 13 Sep 2018 09:26:16 +0100
Subject: [PATCH] Move AccountMergeEmailController to integration module

---
 .../AccountMergeEmailController.coffee        | 66 +++++++++----------
 services/web/app/coffee/router.coffee         | 10 ---
 2 files changed, 33 insertions(+), 43 deletions(-)

diff --git a/services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee b/services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee
index 7f0872f059..c63dda6958 100644
--- a/services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee
+++ b/services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee
@@ -1,36 +1,36 @@
-UserGetter = require '../User/UserGetter'
-UserUpdater = require '../User/UserUpdater'
-OneTimeTokenHandler = require '../Security/OneTimeTokenHandler'
-logger = require 'logger-sharelatex'
-Settings = require 'settings-sharelatex'
+# UserGetter = require '../User/UserGetter'
+# UserUpdater = require '../User/UserUpdater'
+# OneTimeTokenHandler = require '../Security/OneTimeTokenHandler'
+# logger = require 'logger-sharelatex'
+# Settings = require 'settings-sharelatex'
 
 
-module.exports = AccountMergeEmailController =
+# module.exports = AccountMergeEmailController =
 
-	confirmMergeFromEmail: (req, res, next) ->
-		token = req.query.token
-		if !token
-			return res.status(400).send()
-		OneTimeTokenHandler.getValueFromTokenAndExpire 'account-merge-email-to-ol', token, (err, data) ->
-			return next(err) if err?
-			if !data
-				return res.status(404).send()
-			if data.origin != 'sl'
-				logger.log {}, "Only sharelatex origin supported"
-				return res.status(501).send()
-			{ sl_id, v1_id, final_email } = data
-			UserGetter.getUser sl_id, {_id: 1, overleaf: 1}, (err, user) ->
-				return next(err) if err?
-				if !user?
-					logger.err {userId: sl_id}, 'SL user not found for account-merge'
-					return res.status(400).send()
-				if user?.overleaf?.id?
-					logger.err {userId: sl_id}, 'SL user is already linked to overleaf'
-					return res.status(400).send()
-				logger.log {sl_id, v1_id, final_email, origin: data.origin},
-					"[AccountMergeEmailController] about to merge sharelatex and overleaf-v1 accounts"
-				UserUpdater.mergeSharelatexAndV1Accounts sl_id, v1_id, final_email, (err) ->
-					return next(err) if err?
-					res.render 'account_merge/finish', {
-						finalEmail: final_email
-					}
+# 	confirmMergeFromEmail: (req, res, next) ->
+# 		token = req.query.token
+# 		if !token
+# 			return res.status(400).send()
+# 		OneTimeTokenHandler.getValueFromTokenAndExpire 'account-merge-email-to-ol', token, (err, data) ->
+# 			return next(err) if err?
+# 			if !data
+# 				return res.status(404).send()
+# 			if data.origin != 'sl'
+# 				logger.log {}, "Only sharelatex origin supported"
+# 				return res.status(501).send()
+# 			{ sl_id, v1_id, final_email } = data
+# 			UserGetter.getUser sl_id, {_id: 1, overleaf: 1}, (err, user) ->
+# 				return next(err) if err?
+# 				if !user?
+# 					logger.err {userId: sl_id}, 'SL user not found for account-merge'
+# 					return res.status(400).send()
+# 				if user?.overleaf?.id?
+# 					logger.err {userId: sl_id}, 'SL user is already linked to overleaf'
+# 					return res.status(400).send()
+# 				logger.log {sl_id, v1_id, final_email, origin: data.origin},
+# 					"[AccountMergeEmailController] about to merge sharelatex and overleaf-v1 accounts"
+# 				UserUpdater.mergeSharelatexAndV1Accounts sl_id, v1_id, final_email, (err) ->
+# 					return next(err) if err?
+# 					res.render 'account_merge/finish', {
+# 						finalEmail: final_email
+# 					}
diff --git a/services/web/app/coffee/router.coffee b/services/web/app/coffee/router.coffee
index 5bfc6b9e32..b02db419e4 100644
--- a/services/web/app/coffee/router.coffee
+++ b/services/web/app/coffee/router.coffee
@@ -50,7 +50,6 @@ TokenAccessController = require('./Features/TokenAccess/TokenAccessController')
 Features = require('./infrastructure/Features')
 LinkedFilesRouter = require './Features/LinkedFiles/LinkedFilesRouter'
 TemplatesRouter = require './Features/Templates/TemplatesRouter'
-AccountMergeEmailController = require './Features/AccountMerge/AccountMergeEmailController'
 
 logger = require("logger-sharelatex")
 _ = require("underscore")
@@ -344,15 +343,6 @@ module.exports = class Router
 		webRouter.post '/admin/messages', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.createMessage
 		webRouter.post '/admin/messages/clear', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.clearMessages
 
-		webRouter.get '/account-merge/email/confirm',
-			RateLimiterMiddlewear.rateLimit({
-				endpointName: "account-merge-email-confirm",
-				ipOnly: true,
-				maxRequests: 10
-				timeInterval: 60
-			}),
-			AccountMergeEmailController.confirmMergeFromEmail
-
 		privateApiRouter.get '/perfTest', (req,res)->
 			res.send("hello")