Use async/await in controllers

1 files changed, 21 insertions, 20 deletions

diff --git a/server/controllers/api/pods.ts b/server/controllers/api/pods.ts
index 804aa0659..bf1b744e5 100644
--- a/server/controllers/api/pods.ts
+++ b/server/controllers/api/pods.ts
@@ -16,7 +16,8 @@ import {
   paginationValidator,
   setPagination,
   setPodsSort,
-  podsSortValidator
+  podsSortValidator,
+  asyncMiddleware
 } from '../../middlewares'
 import { PodInstance } from '../../models'
 
@@ -27,25 +28,25 @@ podsRouter.get('/',
   podsSortValidator,
   setPodsSort,
   setPagination,
-  listPods
+  asyncMiddleware(listPods)
 )
 podsRouter.post('/make-friends',
   authenticate,
   ensureIsAdmin,
   makeFriendsValidator,
   setBodyHostsPort,
-  makeFriendsController
+  asyncMiddleware(makeFriendsController)
 )
 podsRouter.get('/quit-friends',
   authenticate,
   ensureIsAdmin,
-  quitFriendsController
+  asyncMiddleware(quitFriendsController)
 )
 podsRouter.delete('/:id',
   authenticate,
   ensureIsAdmin,
   podRemoveValidator,
-  removeFriendController
+  asyncMiddleware(removeFriendController)
 )
 
 // ---------------------------------------------------------------------------
@@ -56,33 +57,33 @@ export {
 
 // ---------------------------------------------------------------------------
 
-function listPods (req: express.Request, res: express.Response, next: express.NextFunction) {
-  db.Pod.listForApi(req.query.start, req.query.count, req.query.sort)
-    .then(resultList => res.json(getFormattedObjects(resultList.data, resultList.total)))
-    .catch(err => next(err))
+async function listPods (req: express.Request, res: express.Response, next: express.NextFunction) {
+  const resultList = await db.Pod.listForApi(req.query.start, req.query.count, req.query.sort)
+
+  return res.json(getFormattedObjects(resultList.data, resultList.total))
 }
 
-function makeFriendsController (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function makeFriendsController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const hosts = req.body.hosts as string[]
 
+  // Don't wait the process that could be long
   makeFriends(hosts)
     .then(() => logger.info('Made friends!'))
     .catch(err => logger.error('Could not make friends.', err))
 
-  // Don't wait the process that could be long
-  res.type('json').status(204).end()
+  return res.type('json').status(204).end()
 }
 
-function quitFriendsController (req: express.Request, res: express.Response, next: express.NextFunction) {
-  quitFriends()
-    .then(() => res.type('json').status(204).end())
-    .catch(err => next(err))
+async function quitFriendsController (req: express.Request, res: express.Response, next: express.NextFunction) {
+  await quitFriends()
+
+  return res.type('json').status(204).end()
 }
 
-function removeFriendController (req: express.Request, res: express.Response, next: express.NextFunction) {
+async function removeFriendController (req: express.Request, res: express.Response, next: express.NextFunction) {
   const pod = res.locals.pod as PodInstance
 
-  removeFriend(pod)
-    .then(() => res.type('json').status(204).end())
-    .catch(err => next(err))
+  await removeFriend(pod)
+
+  return res.type('json').status(204).end()
 }