Regex from eiffel-commons to validate subscription (#216)

* taking regEx from common for subscription validation
* putting regexes code in global-variables.js as methods

Author: saif-ericsson

pom.xml

@@ -175,7 +175,7 @@
         <dependency>
             <groupId>com.github.eiffel-community</groupId>
             <artifactId>eiffel-commons</artifactId>
-            <version>0.0.6</version>
+            <version>0.0.9</version>
         </dependency>
     </dependencies>
 

src/main/java/com/ericsson/ei/frontend/WebController.java

@@ -24,16 +24,20 @@
 import org.springframework.web.bind.annotation.RequestMapping;
 
 import com.ericsson.ei.frontend.utils.WebControllerUtils;
+import com.ericsson.eiffelcommons.utils.RegExProvider;
 
 @Controller
 public class WebController {
 
     @Autowired
     private WebControllerUtils frontEndUtils;
 
+
     @RequestMapping("/")
     public String greeting(Model model) {
         model.addAttribute("frontendServiceUrl", frontEndUtils.getFrontEndServiceUrl());
+        model.addAttribute("subscriptionNameRegex", RegExProvider.SUBSCRIPTION_NAME);
+        model.addAttribute("notificationMetaRegex", RegExProvider.NOTIFICATION_META);
         String eiffelDocumentationUrlLinks = String.format("%s", frontEndUtils.getEiffelDocumentationUrls());
         model.addAttribute("eiffelDocumentationUrlLinks", eiffelDocumentationUrlLinks);
         return "index";

src/main/java/com/ericsson/ei/frontend/utils/WebControllerUtils.java

@@ -112,5 +112,4 @@ public String getBackEndServiceUrl(HttpSession httpSession) {
 
         return backEndInformation.getUrlAsString();
     }
-
 }

src/main/resources/static/js/global-variables.js

@@ -3,6 +3,8 @@ var frontendServiceUrl = $('#frontendServiceUrl').text();
 var frontendServiceBackEndPath = "/backend";
 var ldapEnabled = true;
 var table;
+var subscriptionNameRegex = $('#subscriptionNameRegex').text();
+var notificationMetaRegex = $('#notificationMetaRegex').text();
 
 var backendEndpoints = {
     AUTH: "/auth",
@@ -100,4 +102,12 @@ function getWhiteListedPages() {
     return String(PAGES_FOR_STATUS_INDICATION);
 }
 
+function getSubscriptionNameRegex() {
+    return subscriptionNameRegex;
+}
+
+function getNotificationMetaRegex() {
+    return notificationMetaRegex;
+}
+
 // End   ## getters and setters status handling

src/main/resources/static/js/subscription.js

@@ -6,7 +6,7 @@ var defaultFormKeyValuePairAuth = { "formkey": "Authorization", "formvalue": ""
 jQuery(document).ready(function () {
 
     $('.modal-dialog').draggable({ handle: ".modal-header", cursor: 'move' });
-
+    
     checkBackendStatus();
 
     function loadSubButtons() {
@@ -754,16 +754,10 @@ jQuery(document).ready(function () {
             $('#invalidSubscriptionName').text("SubscriptionName must not be empty");
             $('#subscriptionNameInput').addClass("is-invalid");
             error = true;
-        }
-        
-        // When this regExp need to be changed then remember to change the one in the
-        // back-end (invalidSubscriptionNameRegex in SubscriptionValidator.java), which do the same
-        // invalid subscription name check. The two
-        // regEx always need to be the same for ensuring the same check.
-        // /(\W)/ Is a regex that matches anything that is not [A-Z,a-z,0-8] and _.
-        var invalidSubscriptionNameRegex = "(\W)";
+        }        
+        // This regular expression is fetched from the Eiffel-Commons. It is same for both front-end and back-end
         var regExpressionFlag = "g";
-        var regExpression =  new RegExp(invalidSubscriptionNameRegex, regExpressionFlag);
+        var regExpression =  new RegExp(getSubscriptionNameRegex(), regExpressionFlag);
         if ((regExpression.test(subscriptionName))) {
             var invalidLetters = subscriptionName.match(regExpression);
             $('#invalidSubscriptionName').text(
@@ -796,11 +790,8 @@ jQuery(document).ready(function () {
             var emails = notificationMeta.split(",");
             emails.forEach(function(email){
                 email = email.trim();
-                // When this regExp need to be changed then remember to change the one in the
-                // back-end (validEmailRegExpression in SubscriptionValidator.java), which do the same
-                // email validation check. The two
-                // regEx always need to be the same for ensuring the same check.
-                var validEmailRegExpression = /^(([^<>()\[\]\\.,;:\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,}))$/;
+                // This regular expression is fetched from the Eiffel-Commons. It is same for both front-end and back-end
+                var validEmailRegExpression = new RegExp(getNotificationMetaRegex());
                 var isValidEmailAddress = validEmailRegExpression.test(email);
                 if (!isValidEmailAddress) {
                     $('#invalidNotificationMeta').text(email + " not a valid email.");

src/main/resources/templates/index.html

@@ -22,6 +22,8 @@
 <body>
   <div class="d-none" id="eiffelDocumentationUrlLinks" th:text="${eiffelDocumentationUrlLinks}"></div>
   <div class="d-none" id="frontendServiceUrl" th:text="${frontendServiceUrl}"></div>
+  <div class="d-none" id="subscriptionNameRegex" th:text="${subscriptionNameRegex}"></div>
+  <div class="d-none" id="notificationMetaRegex" th:text="${notificationMetaRegex}"></div>
   <header class="app-header">
     <a class="navbar-logo" href="#">
       <img src="assets/images/favicon-32x32.png" width="32" height="32" alt="EI Logo">

src/test/java/com/ericsson/ei/frontend/WebControllerUtilsTest.java

@@ -38,5 +38,4 @@ public void testGetFrontEndServiceUrl() throws Exception {
       controllerUtils = new WebControllerUtils(HOST, PORT, CONTEXT_PATH, false, null, null, null, null, null);
       assertEquals(expectedUrl, controllerUtils.getFrontEndServiceUrl());
     }
-
 }