From 7dfc38b9ca8eed84efec9448b2b22a9e9ad185bd Mon Sep 17 00:00:00 2001
From: m0n02hz <mohit.nagar@walmart.com>
Date: Wed, 9 Mar 2022 03:20:30 +0530
Subject: [PATCH] Added exception handling and check

---
 src/config/aws.js                 | 17 +++++++++++------
 src/controller/user.controller.js |  2 +-
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/config/aws.js b/src/config/aws.js
index a5f0306..faad1d4 100644
--- a/src/config/aws.js
+++ b/src/config/aws.js
@@ -33,12 +33,17 @@ module.exports = {
       }
     },
     generatePresignedUrl: (url) => {
-      const key = url.split(".com/")[1];
-      return S3.getSignedUrl("getObject", {
-        Bucket: AWS_S3_BUCKET,
-        Key: key,
-        Expires: 600,
-      });
+      try {
+        const key = url.split(".com/")[1];
+        return S3.getSignedUrl("getObject", {
+          Bucket: AWS_S3_BUCKET,
+          Key: key,
+          Expires: 600,
+        });
+      } catch (e) {
+        console.log("Something went wrong while trying to generate Presigned Image URL");
+        return "";
+      }
     }
   },
 };
diff --git a/src/controller/user.controller.js b/src/controller/user.controller.js
index f775a12..de9a92a 100644
--- a/src/controller/user.controller.js
+++ b/src/controller/user.controller.js
@@ -210,7 +210,7 @@ module.exports = {
         .populate("createdBy")
         .populate("updatedBy");
       for (const user of result) {
-        if (user.image_url) user.image_url = S3.generatePresignedUrl(user.image_url);
+        if (user.image_url && user.image_url !== 'false') user.image_url = S3.generatePresignedUrl(user.image_url);
       }
       res.send({ success: true, data: result });
     } catch (error) {