full

middlewares/blockCheck.js

@@ -28,6 +28,14 @@ module.exports = async (req, res, next) => {
     }
 
     let user = await UserModel.findById(decodedToken.id)
+    if (!user) {
+      return res.status(401).send({
+        status: 'error',
+        code: 401,
+        message: 'User not found!'
+      })
+    }
+
     user = await expireBlockSuspensionIfNeeded(user)
 
     const blockResponse = getBlockedAccountResponse(user)
@@ -39,6 +47,18 @@ module.exports = async (req, res, next) => {
     next()
   } catch (error) {
     console.error('Error in blockCheck middleware:', error)
+
+    if (
+      error?.name === 'JsonWebTokenError' ||
+      error?.name === 'TokenExpiredError'
+    ) {
+      return res.status(401).send({
+        status: 'error',
+        code: 401,
+        message: 'Your token is not valid!'
+      })
+    }
+
     res.status(500).send({
       status: 'error',
       code: 500,