Rewriting Promises into async/await-pattern

Author: megoth

lib/requests/delete-account-confirm-request.js

@@ -54,13 +54,15 @@ class DeleteAccountConfirmRequest extends AuthRequest {
    *
    * @return {Promise}
    */
-  static get (req, res) {
+  static async get (req, res) {
     const request = DeleteAccountConfirmRequest.fromParams(req, res)
 
-    return Promise.resolve()
-      .then(() => request.validateToken())
-      .then(() => request.renderForm())
-      .catch(error => request.error(error))
+    try {
+      await request.validateToken()
+      return request.renderForm()
+    } catch (error) {
+      return request.error(error)
+    }
   }
 
   /**
@@ -86,12 +88,14 @@ class DeleteAccountConfirmRequest extends AuthRequest {
    *
    * @return {Promise}
    */
-  static handlePost (request) {
-    return Promise.resolve()
-      .then(() => request.validateToken())
-      .then(tokenContents => request.deleteAccount(tokenContents))
-      .then(() => request.renderSuccess())
-      .catch(error => request.error(error))
+  static async handlePost (request) {
+    try {
+      const tokenContents = await request.validateToken()
+      await request.deleteAccount(tokenContents)
+      return request.renderSuccess()
+    } catch (error) {
+      return request.error(error)
+    }
   }
 
   /**
@@ -102,24 +106,20 @@ class DeleteAccountConfirmRequest extends AuthRequest {
    *
    * @return {Promise<Object|false>}
    */
-  validateToken () {
-    return Promise.resolve()
-      .then(() => {
-        if (!this.token) { return false }
-
-        return this.accountManager.validateDeleteToken(this.token)
-      })
-      .then(validToken => {
-        if (validToken) {
-          this.validToken = true
-        }
-
-        return validToken
-      })
-      .catch(error => {
-        this.token = null
-        throw error
-      })
+  async validateToken () {
+    try {
+      if (!this.token) {
+        return false
+      }
+      const validToken = await this.accountManager.validateDeleteToken(this.token)
+      if (validToken) {
+        this.validToken = true
+      }
+      return validToken
+    } catch (error) {
+      this.token = null
+      throw error
+    }
   }
 
   /**
@@ -129,17 +129,15 @@ class DeleteAccountConfirmRequest extends AuthRequest {
    *
    * @return {Promise}
    */
-  deleteAccount (tokenContents) {
+  async deleteAccount (tokenContents) {
     let user = this.accountManager.userAccountFrom(tokenContents)
     let accountDir = this.accountManager.accountDirFor(user.username)
 
     debug('Preparing removal of account for user:', user)
 
-    return Promise.resolve().then(() => {
-      this.userStore.deleteUser(user)
-        .then(() => fs.remove(accountDir))
-        .then(() => debug('Removed user ' + user.username))
-    })
+    await this.userStore.deleteUser(user)
+    await fs.remove(accountDir)
+    debug('Removed user' + user.username)
   }
 
   /**

lib/requests/delete-account-request.js

@@ -30,7 +30,7 @@ class DeleteAccountRequest extends AuthRequest {
    *
    * @returns {Promise<UserAccount>}
    */
-  loadUser () {
+  async loadUser () {
     let username = this.username
 
     return this.accountManager.accountExists(username)
@@ -70,17 +70,15 @@ class DeleteAccountRequest extends AuthRequest {
    *
    * @return {Promise}
    */
-  sendDeleteLink (userAccount) {
+  async sendDeleteLink (userAccount) {
     let accountManager = this.accountManager
 
-    return accountManager.loadAccountRecoveryEmail(userAccount)
-      .then(recoveryEmail => {
-        userAccount.email = recoveryEmail
+    const recoveryEmail = await accountManager.loadAccountRecoveryEmail(userAccount)
+    userAccount.email = recoveryEmail
 
-        debug('Preparing delete account email to:', recoveryEmail)
+    debug('Preparing delete account email to:', recoveryEmail)
 
-        return accountManager.sendDeleteAccountEmail(userAccount)
-      })
+    return accountManager.sendDeleteAccountEmail(userAccount)
   }
 
   /**
@@ -95,7 +93,7 @@ class DeleteAccountRequest extends AuthRequest {
     }
   }
 
-  static post (req, res) {
+  static async post (req, res) {
     const request = DeleteAccountRequest.fromParams(req, res)
 
     debug(`User '${request.username}' requested to be sent a delete account email`)
@@ -111,13 +109,15 @@ class DeleteAccountRequest extends AuthRequest {
    *
    * @return {Promise}
    */
-  static handlePost (request) {
-    return Promise.resolve()
-      .then(() => request.validate())
-      .then(() => request.loadUser())
-      .then(userAccount => request.sendDeleteLink(userAccount))
-      .then(() => request.renderSuccess())
-      .catch(error => request.error(error))
+  static async handlePost (request) {
+    try {
+      request.validate()
+      const userAccount = await request.loadUser()
+      await request.sendDeleteLink(userAccount)
+      return request.renderSuccess()
+    } catch (error) {
+      return request.error(error)
+    }
   }
 
   static get (req, res) {