github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-09-16 02:52:31 -04:00
Code Issues Projects Releases Packages Wiki Activity

Move AccountMergeEmailController to integration module

Browse source
This commit is contained in:
Shane Kilkelly 2018-09-13 09:26:16 +01:00
parent 54a5c563fb
commit 843f1c6b35
2 changed files with 33 additions and 43 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
services/web/app/coffee/Features/AccountMerge/AccountMergeEmailController.coffee
View file

@ -1,36 +1,36 @@
UserGetter = require '../User/UserGetter' # UserGetter = require '../User/UserGetter'
UserUpdater = require '../User/UserUpdater' # UserUpdater = require '../User/UserUpdater'
OneTimeTokenHandler = require '../Security/OneTimeTokenHandler' # OneTimeTokenHandler = require '../Security/OneTimeTokenHandler'
logger = require 'logger-sharelatex' # logger = require 'logger-sharelatex'
Settings = require 'settings-sharelatex' # Settings = require 'settings-sharelatex'
module.exports = AccountMergeEmailController = # module.exports = AccountMergeEmailController =
confirmMergeFromEmail: (req, res, next) -> # confirmMergeFromEmail: (req, res, next) ->
token = req.query.token # token = req.query.token
if !token # if !token
return res.status(400).send() # return res.status(400).send()
OneTimeTokenHandler.getValueFromTokenAndExpire 'account-merge-email-to-ol', token, (err, data) -> # OneTimeTokenHandler.getValueFromTokenAndExpire 'account-merge-email-to-ol', token, (err, data) ->
return next(err) if err? # return next(err) if err?
if !data # if !data
return res.status(404).send() # return res.status(404).send()
if data.origin != 'sl' # if data.origin != 'sl'
logger.log {}, "Only sharelatex origin supported" # logger.log {}, "Only sharelatex origin supported"
return res.status(501).send() # return res.status(501).send()
{ sl_id, v1_id, final_email } = data # { sl_id, v1_id, final_email } = data
UserGetter.getUser sl_id, {_id: 1, overleaf: 1}, (err, user) -> # UserGetter.getUser sl_id, {_id: 1, overleaf: 1}, (err, user) ->
return next(err) if err? # return next(err) if err?
if !user? # if !user?
logger.err {userId: sl_id}, 'SL user not found for account-merge' # logger.err {userId: sl_id}, 'SL user not found for account-merge'
return res.status(400).send() # return res.status(400).send()
if user?.overleaf?.id? # if user?.overleaf?.id?
logger.err {userId: sl_id}, 'SL user is already linked to overleaf' # logger.err {userId: sl_id}, 'SL user is already linked to overleaf'
return res.status(400).send() # return res.status(400).send()
logger.log {sl_id, v1_id, final_email, origin: data.origin}, # logger.log {sl_id, v1_id, final_email, origin: data.origin},
"[AccountMergeEmailController] about to merge sharelatex and overleaf-v1 accounts" # "[AccountMergeEmailController] about to merge sharelatex and overleaf-v1 accounts"
UserUpdater.mergeSharelatexAndV1Accounts sl_id, v1_id, final_email, (err) -> # UserUpdater.mergeSharelatexAndV1Accounts sl_id, v1_id, final_email, (err) ->
return next(err) if err? # return next(err) if err?
res.render 'account_merge/finish', { # res.render 'account_merge/finish', {
finalEmail: final_email # finalEmail: final_email
} # }

10
services/web/app/coffee/router.coffee
View file

@ -50,7 +50,6 @@ TokenAccessController = require('./Features/TokenAccess/TokenAccessController')
Features = require('./infrastructure/Features') Features = require('./infrastructure/Features')
LinkedFilesRouter = require './Features/LinkedFiles/LinkedFilesRouter' LinkedFilesRouter = require './Features/LinkedFiles/LinkedFilesRouter'
TemplatesRouter = require './Features/Templates/TemplatesRouter' TemplatesRouter = require './Features/Templates/TemplatesRouter'
AccountMergeEmailController = require './Features/AccountMerge/AccountMergeEmailController'
logger = require("logger-sharelatex") logger = require("logger-sharelatex")
_ = require("underscore") _ = require("underscore")
@ -344,15 +343,6 @@ module.exports = class Router
webRouter.post '/admin/messages', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.createMessage webRouter.post '/admin/messages', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.createMessage
webRouter.post '/admin/messages/clear', AuthorizationMiddlewear.ensureUserIsSiteAdmin, AdminController.clearMessages 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)-> privateApiRouter.get '/perfTest', (req,res)->
res.send("hello") res.send("hello")