From a6a612c941924722c51e389359393436655cfc65 Mon Sep 17 00:00:00 2001
From: Ronak <ronakmohata@gmail.com>
Date: Mon, 25 Oct 2021 16:47:47 +0530
Subject: [PATCH] fix: make packages/medusa/src/api/routes/admin/users pass
 eslint

---
 .eslintignore                                 |  1 -
 .prettierrc                                   |  2 +-
 .../src/api/routes/admin/users/create-user.js | 12 +++------
 .../src/api/routes/admin/users/get-user.js    | 10 +++-----
 .../src/api/routes/admin/users/list-users.js  | 10 +++-----
 .../admin/users/reset-password-token.js       | 15 ++++-------
 .../api/routes/admin/users/reset-password.js  | 25 ++++++++-----------
 .../src/api/routes/admin/users/update-user.js | 10 +++-----
 8 files changed, 29 insertions(+), 56 deletions(-)

diff --git a/.eslintignore b/.eslintignore
index 5e104a0791..5a131029ce 100644
--- a/.eslintignore
+++ b/.eslintignore
@@ -43,7 +43,6 @@
 /packages/medusa/src/api/routes/admin/shipping-profiles
 /packages/medusa/src/api/routes/admin/store
 /packages/medusa/src/api/routes/admin/swaps
-/packages/medusa/src/api/routes/admin/users
 
 
 /packages/medusa/src/api/routes/store/auth
diff --git a/.prettierrc b/.prettierrc
index 70175ce150..5ed59d9a65 100644
--- a/.prettierrc
+++ b/.prettierrc
@@ -1,5 +1,5 @@
 {
-  "endOfLine": "lf",
+  "endOfLine": "auto",
   "semi": false,
   "singleQuote": false,
   "tabWidth": 2,
diff --git a/packages/medusa/src/api/routes/admin/users/create-user.js b/packages/medusa/src/api/routes/admin/users/create-user.js
index ba9751a945..96cae824cb 100644
--- a/packages/medusa/src/api/routes/admin/users/create-user.js
+++ b/packages/medusa/src/api/routes/admin/users/create-user.js
@@ -13,14 +13,10 @@ export default async (req, res) => {
     throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
   }
 
-  try {
-    const userService = req.scope.resolve("userService")
-    const data = _.pick(value, ["email", "name"])
+  const userService = req.scope.resolve("userService")
+  const data = _.pick(value, ["email", "name"])
 
-    const user = await userService.create(data, value.password)
+  const user = await userService.create(data, value.password)
 
-    res.status(200).json({ user })
-  } catch (err) {
-    throw err
-  }
+  res.status(200).json({ user })
 }
diff --git a/packages/medusa/src/api/routes/admin/users/get-user.js b/packages/medusa/src/api/routes/admin/users/get-user.js
index 1287442c39..d6cad144d7 100644
--- a/packages/medusa/src/api/routes/admin/users/get-user.js
+++ b/packages/medusa/src/api/routes/admin/users/get-user.js
@@ -1,12 +1,8 @@
 export default async (req, res) => {
   const { user_id } = req.params
 
-  try {
-    const userService = req.scope.resolve("userService")
+  const userService = req.scope.resolve("userService")
 
-    const user = await userService.retrieve(user_id)
-    res.json({ user })
-  } catch (error) {
-    throw error
-  }
+  const user = await userService.retrieve(user_id)
+  res.json({ user })
 }
diff --git a/packages/medusa/src/api/routes/admin/users/list-users.js b/packages/medusa/src/api/routes/admin/users/list-users.js
index 0cae57c936..d5ce97960f 100644
--- a/packages/medusa/src/api/routes/admin/users/list-users.js
+++ b/packages/medusa/src/api/routes/admin/users/list-users.js
@@ -1,10 +1,6 @@
 export default async (req, res) => {
-  try {
-    const userService = req.scope.resolve("userService")
-    const users = await userService.list({})
+  const userService = req.scope.resolve("userService")
+  const users = await userService.list({})
 
-    res.status(200).json({ users })
-  } catch (err) {
-    throw err
-  }
+  res.status(200).json({ users })
 }
diff --git a/packages/medusa/src/api/routes/admin/users/reset-password-token.js b/packages/medusa/src/api/routes/admin/users/reset-password-token.js
index ad9951350b..6b352f435f 100644
--- a/packages/medusa/src/api/routes/admin/users/reset-password-token.js
+++ b/packages/medusa/src/api/routes/admin/users/reset-password-token.js
@@ -9,16 +9,11 @@ export default async (req, res) => {
   if (error) {
     throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
   }
+  const userService = req.scope.resolve("userService")
+  const user = await userService.retrieveByEmail(value.email)
 
-  try {
-    const userService = req.scope.resolve("userService")
-    const user = await userService.retrieveByEmail(value.email)
+  // Should call a email service provider that sends the token to the user
+  await userService.generateResetPasswordToken(user.id)
 
-    // Should call a email service provider that sends the token to the user
-    await userService.generateResetPasswordToken(user.id)
-
-    res.sendStatus(204)
-  } catch (error) {
-    throw error
-  }
+  res.sendStatus(204)
 }
diff --git a/packages/medusa/src/api/routes/admin/users/reset-password.js b/packages/medusa/src/api/routes/admin/users/reset-password.js
index a241aa2cae..407297c5d2 100644
--- a/packages/medusa/src/api/routes/admin/users/reset-password.js
+++ b/packages/medusa/src/api/routes/admin/users/reset-password.js
@@ -12,21 +12,16 @@ export default async (req, res) => {
   if (error) {
     throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
   }
+  const userService = req.scope.resolve("userService")
+  const user = await userService.retrieveByEmail(value.email)
 
-  try {
-    const userService = req.scope.resolve("userService")
-    const user = await userService.retrieveByEmail(value.email)
-
-    const decodedToken = await jwt.verify(value.token, user.password_hash)
-    if (!decodedToken || decodedToken.user_id !== user.id) {
-      res.status(401).send("Invalid or expired password reset token")
-      return
-    }
-
-    const data = await userService.setPassword(user.id, value.password)
-
-    res.status(200).json({ user: data })
-  } catch (error) {
-    throw error
+  const decodedToken = await jwt.verify(value.token, user.password_hash)
+  if (!decodedToken || decodedToken.user_id !== user.id) {
+    res.status(401).send("Invalid or expired password reset token")
+    return
   }
+
+  const data = await userService.setPassword(user.id, value.password)
+
+  res.status(200).json({ user: data })
 }
diff --git a/packages/medusa/src/api/routes/admin/users/update-user.js b/packages/medusa/src/api/routes/admin/users/update-user.js
index 5d81d8e1c8..1887df155a 100644
--- a/packages/medusa/src/api/routes/admin/users/update-user.js
+++ b/packages/medusa/src/api/routes/admin/users/update-user.js
@@ -12,11 +12,7 @@ export default async (req, res) => {
     throw new MedusaError(MedusaError.Types.INVALID_DATA, error.details)
   }
 
-  try {
-    const userService = req.scope.resolve("userService")
-    const data = await userService.update(user_id, value)
-    res.status(200).json({ user: data })
-  } catch (err) {
-    throw err
-  }
+  const userService = req.scope.resolve("userService")
+  const data = await userService.update(user_id, value)
+  res.status(200).json({ user: data })
 }