github/overleaf
1
0
Fork 0
mirror of https://github.com/overleaf/overleaf.git synced 2024-11-07 20:31:06 -05:00
Code Issues Projects Releases Packages Wiki Activity

Improve error handling

Browse source
This commit is contained in:
Alberto Fernández Capel 2018-05-31 16:42:09 +01:00
parent d262de14d6
commit 1c485c1884
1 changed files with 12 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
services/web/app/coffee/Features/Subscription/TeamInvitesController.coffee
View file

@ -11,7 +11,7 @@ module.exports =
email = req.body.email email = req.body.email
TeamInvitesHandler.createInvite teamManagerId, email, (err, invite) -> TeamInvitesHandler.createInvite teamManagerId, email, (err, invite) ->
next(err) if err? return handleError(err, req, res, next) if err?
inviteView = { user: inviteView = { user:
{ email: invite.email, sentAt: invite.sentAt, holdingAccount: true } { email: invite.email, sentAt: invite.sentAt, holdingAccount: true }
} }
@ -22,13 +22,13 @@ module.exports =
userId = AuthenticationController.getLoggedInUserId(req) userId = AuthenticationController.getLoggedInUserId(req)
TeamInvitesHandler.getInvite token, (err, invite, teamSubscription) -> TeamInvitesHandler.getInvite token, (err, invite, teamSubscription) ->
next(err) if err? return handleError(err, req, res, next) if err?
unless invite? if !invite
return ErrorController.notFound(req, res, next) return ErrorController.notFound(req, res, next)
SubscriptionLocator.getUsersSubscription userId, (err, personalSubscription) -> SubscriptionLocator.getUsersSubscription userId, (err, personalSubscription) ->
return callback(err) if err? return handleError(err, req, res, next) if err?
res.render "subscriptions/team/invite", res.render "subscriptions/team/invite",
inviterName: invite.inviterName inviterName: invite.inviterName
@ -36,13 +36,12 @@ module.exports =
hasPersonalSubscription: personalSubscription? hasPersonalSubscription: personalSubscription?
appName: settings.appName appName: settings.appName
acceptInvite: (req, res, next) -> acceptInvite: (req, res, next) ->
token = req.params.token token = req.params.token
userId = AuthenticationController.getLoggedInUserId(req) userId = AuthenticationController.getLoggedInUserId(req)
TeamInvitesHandler.acceptInvite token, userId, (err, results) -> TeamInvitesHandler.acceptInvite token, userId, (err, results) ->
next(err) if err? return handleError(err, req, res, next) if err?
res.sendStatus 204 res.sendStatus 204
@ -51,6 +50,12 @@ module.exports =
teamManagerId = AuthenticationController.getLoggedInUserId(req) teamManagerId = AuthenticationController.getLoggedInUserId(req)
TeamInvitesHandler.revokeInvite teamManagerId, email, (err, results) -> TeamInvitesHandler.revokeInvite teamManagerId, email, (err, results) ->
next(err) if err? return handleError(err, req, res, next) if err?
res.sendStatus 204 res.sendStatus 204
handleError = (err, req, res, next) ->
if err.teamNotFound or err.inviteNoLongerValid
ErrorController.notFound(req, res, next)
else
next(err)