Merge pull request #657 from Ronak-23/develop

fix: make packages/medusa/src/api/routes/admin/users pass eslint

.eslintignore

@@ -35,7 +35,6 @@
 /packages/medusa/src/api/routes/admin/returns
 /packages/medusa/src/api/routes/admin/shipping-profiles
 /packages/medusa/src/api/routes/admin/store
-/packages/medusa/src/api/routes/admin/users
 /packages/medusa/src/api/routes/store/carts
 /packages/medusa/src/api/routes/store/return-reasons
 /packages/medusa/src/api/routes/store/returns

.prettierrc

@@ -1,5 +1,5 @@
 {
-  "endOfLine": "lf",
+  "endOfLine": "auto",
   "semi": false,
   "singleQuote": false,
   "tabWidth": 2,

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 })
 }

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 })
 }

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 })
 }

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)
 }

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 })
 }

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 })
 }