chore: update the codebase with newer JS features

controllers/auth.js

@@ -5,7 +5,7 @@ const oauth = require('../lib/OAuth')
 const RSA = require('../lib/RSA')
 const Staticman = require('../lib/Staticman')
 
-module.exports = (req, res) => {
+module.exports = async (req, res) => {
   const staticman = new Staticman(req.params)
   staticman.setConfigPath()
 
@@ -31,34 +31,31 @@ module.exports = (req, res) => {
         )
   }
 
-  return staticman.getSiteConfig()
-    .then(requestAccessToken)
-    .then((accessToken) => {
-      const git = gitFactory.create(req.params.service, {
-        oauthToken: accessToken
-      })
+  try {
+    const siteConfig = await staticman.getSiteConfig()
+    const accessToken = await requestAccessToken(siteConfig)
+    const git = gitFactory.create(req.params.service, {
+      oauthToken: accessToken
+    })
 
-      // TODO: Simplify this when v2 support is dropped.
-      const getUser = req.params.version === '2' && req.params.service === 'github'
-        ? git.api.users.getAuthenticated({}).then(({data}) => data)
-        : git.getCurrentUser()
+    // TODO: Simplify this when v2 support is dropped.
+    const getUser = req.params.version === '2' && req.params.service === 'github'
+      ? git.api.users.getAuthenticated({}).then(({data}) => data)
+      : git.getCurrentUser()
 
-      return getUser
-        .then((user) => {
-          res.send({
-            accessToken: RSA.encrypt(accessToken),
-            user
-          })
-        })
+    const user = await getUser
+    res.send({
+      accessToken: RSA.encrypt(accessToken),
+      user
     })
-    .catch((err) => {
-      console.log('ERR:', err)
+  } catch (err) {
+    console.log('ERR:', err)
 
-      const statusCode = err.statusCode || 401
+    const statusCode = err.statusCode || 401
 
-      res.status(statusCode).send({
-        statusCode,
-        message: err.message
-      })
+    res.status(statusCode).send({
+      statusCode,
+      message: err.message
     })
+  }
 }

controllers/connect.js

@@ -4,7 +4,7 @@ const path = require('path')
 const config = require(path.join(__dirname, '/../config'))
 const GitHub = require(path.join(__dirname, '/../lib/GitHub'))
 
-module.exports = (req, res) => {
+module.exports = async (req, res) => {
   const ua = config.get('analytics.uaTrackingId')
     ? require('universal-analytics')(config.get('analytics.uaTrackingId'))
     : null
@@ -16,35 +16,28 @@ module.exports = (req, res) => {
     token: config.get('githubToken')
   })
 
-  return github.api.repos.listInvitationsForAuthenticatedUser({}).then(({data}) => {
-    let invitationId = null
+  try {
+    const { data } = await github.api.repos.listInvitationsForAuthenticatedUser({})
 
-    const invitation = Array.isArray(data) && data.some(invitation => {
-      if (invitation.repository.full_name === (req.params.username + '/' + req.params.repository)) {
-        invitationId = invitation.id
-
-        return true
-      }
-    })
+    const invitation = Array.isArray(data) && data.find(({ repository }) => repository.full_name === req.params.username + '/' + req.params.repository)
 
     if (!invitation) {
       return res.status(404).send('Invitation not found')
     }
 
-    return github.api.repos.acceptInvitation({
-      invitation_id: invitationId
-    }).then(response => {
-      res.send('OK!')
+    await github.api.repos.acceptInvitation({
+      invitation_id: invitation.id
+    })
+    res.send('OK!')
 
-      if (ua) {
-        ua.event('Repositories', 'Connect').send()
-      }
-    }).catch(err => { // eslint-disable-line handle-callback-err
-      res.status(500).send('Error')
+    if (ua) {
+      ua.event('Repositories', 'Connect').send()
+    }
+  } catch (err) {
+    res.status(500).send('Error')
 
-      if (ua) {
-        ua.event('Repositories', 'Connect error').send()
-      }
-    })
-  })
+    if (ua) {
+      ua.event('Repositories', 'Connect error').send()
+    }
+  }
 }

controllers/encrypt.js

@@ -1,7 +1,6 @@
 'use strict'
 
-const path = require('path')
-const RSA = require(path.join(__dirname, '/../lib/RSA'))
+const RSA = require('../lib/RSA')
 
 module.exports = (req, res) => {
   const encryptedText = RSA.encrypt(req.params.text)

controllers/handlePR.js

@@ -4,7 +4,7 @@ const config = require('../config')
 const GitHub = require('../lib/GitHub')
 const Staticman = require('../lib/Staticman')
 
-module.exports = (repo, data) => {
+module.exports = async (repo, data) => {
   const ua = config.get('analytics.uaTrackingId')
     ? require('universal-analytics')(config.get('analytics.uaTrackingId'))
     : null
@@ -19,7 +19,9 @@ module.exports = (repo, data) => {
     token: config.get('githubToken')
   })
 
-  return github.getReview(data.number).then((review) => {
+  try {
+    const review = await github.getReview(data.number)
+
     if (review.sourceBranch.indexOf('staticman_')) {
       return null
     }
@@ -32,33 +34,28 @@ module.exports = (repo, data) => {
       const bodyMatch = review.body.match(/(?:.*?)<!--staticman_notification:(.+?)-->(?:.*?)/i)
 
       if (bodyMatch && (bodyMatch.length === 2)) {
-        try {
-          const parsedBody = JSON.parse(bodyMatch[1])
-          const staticman = new Staticman(parsedBody.parameters)
+        const parsedBody = JSON.parse(bodyMatch[1])
+        const staticman = new Staticman(parsedBody.parameters)
 
-          staticman.setConfigPath(parsedBody.configPath)
-          staticman.processMerge(parsedBody.fields, parsedBody.options)
-            .catch(err => Promise.reject(err))
-        } catch (err) {
-          return Promise.reject(err)
-        }
+        staticman.setConfigPath(parsedBody.configPath)
+        await staticman.processMerge(parsedBody.fields, parsedBody.options)
       }
     }
 
-    return github.deleteBranch(review.sourceBranch)
-  }).then(response => {
+    const response = github.deleteBranch(review.sourceBranch)
+
     if (ua) {
       ua.event('Hooks', 'Delete branch').send()
     }
 
     return response
-  }).catch(err => {
+  } catch (err) {
     console.log(err.stack || err)
 
     if (ua) {
       ua.event('Hooks', 'Delete branch error').send()
     }
 
-    return Promise.reject(err)
-  })
+    throw err
+  }
 }

controllers/process.js

@@ -7,77 +7,70 @@ const reCaptcha = require('express-recaptcha')
 const Staticman = require('../lib/Staticman')
 const universalAnalytics = require('universal-analytics')
 
-function checkRecaptcha (staticman, req) {
-  return new Promise((resolve, reject) => {
-    staticman.getSiteConfig().then(siteConfig => {
-      if (!siteConfig.get('reCaptcha.enabled')) {
-        return resolve(false)
-      }
+async function checkRecaptcha (staticman, req) {
+  const siteConfig = await staticman.getSiteConfig()
 
-      const reCaptchaOptions = req.body.options && req.body.options.reCaptcha
+  if (!siteConfig.get('reCaptcha.enabled')) {
+    return false
+  }
 
-      if (!reCaptchaOptions || !reCaptchaOptions.siteKey || !reCaptchaOptions.secret) {
-        return reject(errorHandler('RECAPTCHA_MISSING_CREDENTIALS'))
-      }
+  const reCaptchaOptions = req.body.options && req.body.options.reCaptcha
 
-      let decryptedSecret
+  if (!reCaptchaOptions || !reCaptchaOptions.siteKey || !reCaptchaOptions.secret) {
+    throw errorHandler('RECAPTCHA_MISSING_CREDENTIALS')
+  }
 
-      try {
-        decryptedSecret = staticman.decrypt(reCaptchaOptions.secret)
-      } catch (err) {
-        return reject(errorHandler('RECAPTCHA_CONFIG_MISMATCH'))
-      }
+  let decryptedSecret
 
-      if (
-        reCaptchaOptions.siteKey !== siteConfig.get('reCaptcha.siteKey') ||
-        decryptedSecret !== siteConfig.get('reCaptcha.secret')
-      ) {
-        return reject(errorHandler('RECAPTCHA_CONFIG_MISMATCH'))
-      }
+  try {
+    decryptedSecret = staticman.decrypt(reCaptchaOptions.secret)
+  } catch (err) {
+    throw errorHandler('RECAPTCHA_CONFIG_MISMATCH')
+  }
+
+  if (
+    reCaptchaOptions.siteKey !== siteConfig.get('reCaptcha.siteKey') ||
+    decryptedSecret !== siteConfig.get('reCaptcha.secret')
+  ) {
+    throw errorHandler('RECAPTCHA_CONFIG_MISMATCH')
+  }
 
-      reCaptcha.init(reCaptchaOptions.siteKey, decryptedSecret)
-      reCaptcha.verify(req, err => {
-        if (err) {
-          return reject(errorHandler(err))
-        }
+  reCaptcha.init(reCaptchaOptions.siteKey, decryptedSecret)
+
+  return new Promise((resolve, reject) => {
+    reCaptcha.verify(req, err => {
+      if (err) {
+        return reject(errorHandler(err))
+      }
 
-        return resolve(true)
-      })
-    }).catch(err => reject(err))
+      return resolve(true)
+    })
   })
 }
 
 function createConfigObject (apiVersion, property) {
-  let remoteConfig = {}
-
-  if (apiVersion === '1') {
-    remoteConfig.file = '_config.yml'
-    remoteConfig.path = 'staticman'
-  } else {
-    remoteConfig.file = 'staticman.yml'
-    remoteConfig.path = property || ''
-  }
-
-  return remoteConfig
+  return apiVersion === '1'
+    ? { file: '_config.yml', path: 'staticman' }
+    : { file: 'staticman.yml', path: property || '' }
 }
 
-function process (staticman, req, res) {
+async function process (staticman, req, res) {
   const ua = config.get('analytics.uaTrackingId')
     ? universalAnalytics(config.get('analytics.uaTrackingId'))
     : null
   const fields = req.query.fields || req.body.fields
   const options = req.query.options || req.body.options || {}
 
-  return staticman.processEntry(fields, options).then(data => {
-    sendResponse(res, {
-      redirect: data.redirect,
-      fields: data.fields
-    })
+  const data = await staticman.processEntry(fields, options)
 
-    if (ua) {
-      ua.event('Entries', 'New entry').send()
-    }
+  sendResponse(res, {
+    redirect: data.redirect,
+    fields: data.fields
   })
+
+  if (ua) {
+    ua.event('Entries', 'New entry').send()
+  }
 }
 
 function sendResponse (res, data) {
@@ -120,20 +113,23 @@ function sendResponse (res, data) {
   res.status(statusCode).send(payload)
 }
 
-module.exports = (req, res, next) => {
+module.exports = async (req, res, next) => {
   const staticman = new Staticman(req.params)
 
   staticman.setConfigPath()
   staticman.setIp(req.headers['x-forwarded-for'] || req.connection.remoteAddress)
   staticman.setUserAgent(req.headers['user-agent'])
 
-  return checkRecaptcha(staticman, req)
-    .then(usedRecaptcha => process(staticman, req, res))
-    .catch(err => sendResponse(res, {
+  try {
+    await checkRecaptcha(staticman, req)
+    await process(staticman, req, res)
+  } catch (err) {
+    sendResponse(res, {
       err,
       redirect: req.body.options && req.body.options.redirect,
       redirectError: req.body.options && req.body.options.redirectError
-    }))
+    })
+  }
 }
 
 module.exports.checkRecaptcha = checkRecaptcha