PR changes

Author: Bhupesh-mfsi

packages/backend/src/notifications.test.ts

@@ -21,7 +21,7 @@ const keysA = {
 
 describe('Notifications', () => {
     describe('get NotificationChannels', () => {
-        it('Returns 500 as global notification is turned off', async () => {
+        it('Returns empty array as global notification is turned off', async () => {
             const app = express();
             app.use(bodyParser.json());
             app.use(notifications());
@@ -47,6 +47,8 @@ describe('Notifications', () => {
                     return {};
                 },
                 getIdEnsName: async (ensName: string) => ensName,
+                getGlobalNotification: async (ensName: string) =>
+                    Promise.resolve({ isEnabled: false }),
                 getUsersNotificationChannels: async (ensName: string) =>
                     Promise.resolve([]),
             };
@@ -62,7 +64,10 @@ describe('Notifications', () => {
                 })
                 .send();
 
-            expect(status).toBe(500);
+            expect(status).toBe(200);
+            expect(body).toEqual({
+                notificationChannels: [],
+            });
         });
 
         it('Returns 200 with empty notification channels as global notification is turned on', async () => {
@@ -196,7 +201,7 @@ describe('Notifications', () => {
             expect(status).toBe(400);
         });
 
-        it('Returns 500 on setup email notifications as globalNotifications is turned off', async () => {
+        it('Returns 400 on setup email notifications as globalNotifications is turned off', async () => {
             const app = express();
             app.use(bodyParser.json());
             app.use(notifications());
@@ -235,7 +240,7 @@ describe('Notifications', () => {
                     notificationChannelType: NotificationChannelType.EMAIL,
                 });
 
-            expect(status).toBe(500);
+            expect(status).toBe(400);
         });
 
         it('User can setup email notifications', async () => {

packages/backend/src/notifications.ts

@@ -87,19 +87,21 @@ export default () => {
 
             // Throw error if global notification is turned off
             if (!globalNotification.isEnabled) {
-                throw new Error('Global notifications is off');
-            }
-
-            // Adding a user's notification channel to the database
-            await req.app.locals.db.addUsersNotificationChannel(account, {
-                type: notificationChannelType,
-                config: {
-                    recipientValue: recipientValue,
-                },
-            });
+                res.sendStatus(400).json({
+                    error: 'Global notifications is off',
+                });
+            } else {
+                // Adding a user's notification channel to the database
+                await req.app.locals.db.addUsersNotificationChannel(account, {
+                    type: notificationChannelType,
+                    config: {
+                        recipientValue: recipientValue,
+                    },
+                });
 
-            // Sending a success response
-            res.sendStatus(200);
+                // Sending a success response
+                res.sendStatus(200);
+            }
         } catch (e) {
             // Passing the error to the next middleware
             next(e);
@@ -115,17 +117,19 @@ export default () => {
             const globalNotification =
                 await req.app.locals.db.getGlobalNotification(account);
 
-            // Throw error if global notification is turned off
+            // if global notification is turned off
             if (!globalNotification.isEnabled) {
-                throw new Error('Global notifications is off');
+                res.status(200).json({ notificationChannels: [] });
+            } else {
+                // Getting notification channels for a user from the database
+                const notificationChannels =
+                    await req.app.locals.db.getUsersNotificationChannels(
+                        account,
+                    );
+
+                // Sending the fetched notification channels as a JSON response
+                res.status(200).json({ notificationChannels });
             }
-
-            // Getting notification channels for a user from the database
-            const notificationChannels =
-                await req.app.locals.db.getUsersNotificationChannels(account);
-
-            // Sending the fetched notification channels as a JSON response
-            res.json({ notificationChannels });
         } catch (e) {
             // Passing the error to the next middleware
             next(e);

packages/backend/src/validation/notification/regexValidation.ts

@@ -1,21 +1,22 @@
 import { NotificationChannelType } from '@dm3-org/dm3-lib-delivery';
 
 /* eslint-disable max-len */
+const EMAIL_REGEX =
+    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
+
 // checks regex pattern for recipient value
 export const checkRegexPattern = (
     notificationChannelType: string,
     recipientValue: string,
-): boolean => {
+) => {
     switch (notificationChannelType) {
         case NotificationChannelType.EMAIL:
             // checks regex pattern of email ID
             const patternCheck = String(recipientValue)
                 .toLowerCase()
-                .match(
-                    /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/,
-                );
-            return patternCheck ? true : false;
+                .match(EMAIL_REGEX);
+            return patternCheck;
         default:
-            return false;
+            return null;
     }
 };