@optimiser/common 1.0.360 → 1.0.362

package/dist/lib/event.js

@@ -129,7 +129,7 @@ var Event = /** @class */ (function () {
                                     return [3 /*break*/, 6];
                                 case 6: return [3 /*break*/, 8];
                                 case 7:
-                                    console.log('Not able to INITIALISE THE FIREBASE ADMIN APP--');
+                                    console.log('Attention!!-- We are not sending mobile notifications due to lack of FIREBASE ADMIN APP configurations.\n Please provide firebaseSet-up.JSON file.');
                                     _a.label = 8;
                                 case 8:
                                     // if (userId && data.SocketObj && !data.SocketObj.userId) {
@@ -228,14 +228,19 @@ var Event = /** @class */ (function () {
             accessKeyId: eventConfig.SQS_ACCESSKEY_ID,
             secretAccessKey: eventConfig.SQS_SECRET_KEY
         });
-        this.FCMMobileServiceAccountKey = eventConfig.FCM_NOTIFICATION_SERVICE_ACCOUNT_KEY;
-        try {
-            admin.initializeApp({
-                credential: admin.credential.cert(this.FCMMobileServiceAccountKey)
-            });
+        this.FCMMobileServiceAccountKey = eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.FCM_NOTIFICATION_SERVICE_ACCOUNT_KEY;
+        if (eventConfig === null || eventConfig === void 0 ? void 0 : eventConfig.FCM_NOTIFICATION_SERVICE_ACCOUNT_KEY) { // scope added by komal, to handle the firebase warning,
+            try {
+                admin.initializeApp({
+                    credential: admin.credential.cert(this.FCMMobileServiceAccountKey)
+                });
+            }
+            catch (error) {
+                console.log('Error while INITIALIZING FIREBASE ADMIN APP\n Please check firebaseSet-up.JSON file.\n This will impact mobile app notifications  -----', error);
+            }
         }
-        catch (error) {
-            console.log('Error while INITIALIZING FIREBASE ADMIN APP\n Please check service-accountKey.JSON file.\n This will impact mobile app notifications  -----', error);
+        else {
+            console.log('We are not INITIALIZING mobile notifications due to lack of FIREBASE ADMIN APP configurations.\n Please provide firebaseSet-up.JSON file.');
         }
     }
     return Event;

package/dist/lib/utility.js

@@ -4544,7 +4544,7 @@ function CapitalizeFirstLetter(str) {
     return str.charAt(0).toUpperCase() + str.slice(1);
 }
 function EmailValidation(elmValue) {
-    var filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+    var filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@(([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})$/;
     if (filter.test(elmValue)) {
         return true;
     }
@@ -4854,7 +4854,7 @@ function ValidateUserInput(options) {
                                     return [3 /*break*/, 54];
                                 case 7:
                                     {
-                                        filter = /^([a-zA-Z0-9_\.\-])+\@(([a-zA-Z0-9\-])+\.)+([a-zA-Z0-9]{2,4})+$/;
+                                        filter = /^(([^<>()\[\]\\.,;:\s@"]+(\.[^<>()\[\]\\.,;:\s@"]+)*)|(".+"))@(([a-zA-Z0-9-]+\.)+[a-zA-Z]{2,})$/;
                                         if (!filter.test(fieldData)) {
                                             msg = fieldData + ' is invalid email for ' + field.DisplayName + '!';
                                         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@optimiser/common",
-  "version": "1.0.360",
+  "version": "1.0.362",
   "description": "",
   "main": "dist/index.js",
   "scripts": {