Fix ldap check (#212)

* Fix bug now working in explorer, better handling of ldap satus
- HTML code fixed invalid end tags
- Website now works in explorer
- handling of ldap status is made in common.js and may be accessed
  via getters and setters
* fix undefined security when switching back-end in test
* Add errormessage when failure to login, getter - setter for logged in user
- When user fails to login a red message should appear indicating what
  was wrong
- Always on buttons for subscriptions got a darker blue, the light blue
  color looked like they where disabled always
- Getter and setter for logged in user has been added, making it easier
  to get username when needed
- String/username validation is made through a function in common
  making it easier to validate is a username/string exist

Author: Anders Breid

src/functionaltest/java/com/ericsson/ei/frontend/TestSwitchBackend.java

@@ -93,6 +93,9 @@ public static void setUpMocks() throws IOException {
         mockClient2.when(request().withMethod("GET").withPath("/auth/checkStatus"))
                 .respond(response().withStatusCode(200).withBody(""));
 
+        mockClient2.when(request().withMethod("GET").withPath("/auth"))
+                .respond(response().withStatusCode(200).withBody("{\"security\":false}"));
+
         String newInstanceSubscriptionResponse = getJSONStringFromFile(NEW_INSTANCE_SUBSCRIPTION_RESPONSE_FILEPATH);
         mockClient2.when(request().withMethod("GET").withPath("/subscriptions"))
                 .respond(response().withStatusCode(200).withBody(newInstanceSubscriptionResponse));
@@ -101,6 +104,12 @@ public static void setUpMocks() throws IOException {
                 DEFAULT_INSTANCE_SUBSCRIPTION_RESPONSE_FILEPATH);
         mockClient1.when(request().withMethod("GET").withPath("/subscriptions"))
                 .respond(response().withStatusCode(200).withBody(defaultInstanceSubscriptionResponse));
+
+        mockClient1.when(request().withMethod("GET").withPath("/auth/checkStatus"))
+                .respond(response().withStatusCode(200).withBody(""));
+
+        mockClient1.when(request().withMethod("GET").withPath("/auth"))
+                .respond(response().withStatusCode(200).withBody("{\"security\":false}"));
     }
 
     @AfterClass

src/main/resources/application.properties

@@ -32,4 +32,4 @@ ei.eiffel.documentation.urls={ "EI Frontend GitHub": "https://github.com/eiffel-
 #### LOGGING #########
 logging.level.root: INFO
 logging.level.org.springframework.web: INFO
-logging.level.com.ericsson.ei: INFO
+logging.level.com.ericsson.ei: INFO

src/main/resources/static/js/common.js

@@ -2,19 +2,47 @@ var router = new Navigo(null, true, '#');
 var frontendServiceUrl = $('#frontendServiceUrl').text();
 var frontendServiceBackEndPath = "/backend";
 var timerInterval;
+var ldapEnabled = true;
+
+// Start ## getters and setters
+
+function isLdapEnabled(){
+    return Boolean(ldapEnabled);
+}
+
+function setLdapEnabled(value){
+    ldapEnabled = Boolean(value);
+}
+
+function getCurrentUser() {
+    return sessionStorage.getItem("currentUser");
+}
+
+function setCurrentUser(user) {
+    sessionStorage.removeItem("currentUser");
+    sessionStorage.setItem("currentUser", user);
+}
+
+// End   ## getters and setters
+
+function stringContainsSubstring(string, substring) {
+    var isSubstring = string.indexOf(substring) !== -1;
+    return isSubstring;
+}
 
 function addBackendParameter(url) {
+    var parameterKey = "backendname";
+
     if (!sessionStorage.selectedActive) {
         return url;
     }
-    var delimiter = "";
-    var parameterKey = "backendname";
 
-    if (url.includes("?")) {
+    var delimiter = "?";
+    if (stringContainsSubstring(url, delimiter)) {
+        // url has delimeter ?, then delimeter should be &
         delimiter = "&";
-    } else {
-        delimiter = "?";
     }
+
     url = url + delimiter + parameterKey + "=" + sessionStorage.selectedActive;
     return url;
 }
@@ -32,7 +60,7 @@ AjaxHttpSender.prototype.sendAjax = function (contextPath, type, data, callback,
     if (!dataType) {
         dataType = "json";
     }
-    url = addBackendParameter(frontendServiceUrl+contextPath)
+    url = addBackendParameter(frontendServiceUrl+contextPath);
     $.ajax({
         url: url,
         type: type,
@@ -61,9 +89,10 @@ AjaxHttpSender.prototype.sendAjax = function (contextPath, type, data, callback,
             }
         }
     });
-}
+};
 // /Stop ## Global AJAX Sender function ##################################
 
+// Start ## Common functions ##
 function formatUrl(host, port, useHttps, contextPath) {
     var protocol = "http";
     if (useHttps) {
@@ -87,6 +116,21 @@ function formatUrl(host, port, useHttps, contextPath) {
     return protocol + "://" + host + port + contextPath;
 }
 
+function isString(value) {
+    var isString = typeof value === 'string' || value instanceof String;
+    return isString;
+}
+
+function isStringDefined(value) {
+    var isDefined = false;
+    if (isString(value)) {
+        isDefined = value.length != 0;
+    }
+    return isDefined;
+}
+
+// /Stop ## Common functions ##################################
+
 // Start ## Routing ##
 var routes = {};
 routes["subscriptions"] = function () {
@@ -164,20 +208,19 @@ function updateBackEndInstanceList() {
     });
 }
 
-function singleInstanceModel(name, host, port, contextPath, https, active) {
-    this.name = ko.observable(name),
-        this.host = ko.observable(host),
-        this.port = ko.observable(port),
-        this.contextPath = ko.observable(contextPath),
-        this.https = ko.observable(https),
-        this.active = ko.observable(active),
-        this.information = name.toUpperCase() + " - " + host + " " + port + "/" + contextPath;
+function singleInstanceModel(name, host, port, contextPath, https, active, defaultBackend) {
+    this.name = ko.observable(name);
+    this.host = ko.observable(host);
+    this.port = ko.observable(port);
+    this.contextPath = ko.observable(contextPath);
+    this.https = ko.observable(https);
+    this.active = ko.observable(active);
+    this.defaultBackend = ko.observable(defaultBackend);
+    this.information = name.toUpperCase() + " - " + host + " " + port + "/" + contextPath;
 }
 
-function viewModel(backendInstanceData) {
-    var self = this;
-    self.instances = ko.observableArray();
-    var jsonBackendInstanceData = JSON.parse(ko.toJSON(backendInstanceData));
+function getInstanceModels(jsonBackendInstanceData) {
+    instanceModels = [];
 
     for (var i = 0; i < jsonBackendInstanceData.length; i++) {
         var instanceData = jsonBackendInstanceData[i];
@@ -187,9 +230,10 @@ function viewModel(backendInstanceData) {
         var port = instanceData.port;
         var https = instanceData.https;
         var contextPath = instanceData.contextPath;
+        var defaultBackend = instanceData.defaultBackend;
 
         var thisInstanceShouldBeSelectedAsActive =
-            instanceData.defaultBackend == true && !sessionStorage.selectedActive ||
+            defaultBackend == true && !sessionStorage.selectedActive ||
             sessionStorage.selectedActive && sessionStorage.selectedActive == name;
 
         if (thisInstanceShouldBeSelectedAsActive) {
@@ -198,27 +242,38 @@ function viewModel(backendInstanceData) {
         }
 
         sessionStorage.setItem(name, formatUrl(host, port, https, contextPath));
-        var singleInstance = new singleInstanceModel(name, host, port, contextPath, https, isActive);
-        self.instances.push(singleInstance);
+        var singleInstance = new singleInstanceModel(name, host, port, contextPath, https, isActive, defaultBackend);
+        instanceModels.push(singleInstance);
     }
+    return instanceModels;
+}
+
+function viewModel(backendInstanceData) {
+    var self = this;
 
+    var jsonBackendInstanceData = JSON.parse(ko.toJSON(backendInstanceData));
+    var instanceModels = getInstanceModels(jsonBackendInstanceData);
     self.selectedActive = ko.observable(sessionStorage.selectedActive);
 
+    self.instances = ko.observableArray();
+    instanceModels.forEach(function (instanceModel) {
+        self.instances.push(instanceModel);
+    });
+
     self.onChange = function () {
         if (typeof self.selectedActive() !== "undefined") {
             sessionStorage.selectedActive = self.selectedActive();
             location.reload();
         } else {
             $.jGrowl("Please choose backend instance", { sticky: false, theme: 'Error' });
         }
-    }
+    };
 }
 // End ## Load Back end list ##
 
 // Start ## Login and Security ##
 function doIfUserLoggedIn(user) {
-    sessionStorage.removeItem("currentUser");
-    sessionStorage.setItem("currentUser", user);
+    setCurrentUser(user);
     $("#userItem").show();
     $("#userItem").addClass("user-login");
     $("#ldapUserName").text(user);
@@ -228,7 +283,7 @@ function doIfUserLoggedIn(user) {
 }
 
 function doIfUserLoggedOut() {
-    sessionStorage.removeItem("currentUser");
+    setCurrentUser("");
     $("#userItem").show();
     $("#userItem").removeClass("user-login");
     $("#ldapUserName").text("Guest");
@@ -246,8 +301,10 @@ function doIfSecurityOff() {
 function checkBackendSecured() {
     var callback = {
         success: function (responseData, textStatus) {
-            var ldapEnabled = JSON.parse(ko.toJSON(responseData)).security;
-            if (ldapEnabled == true) {
+            var response = JSON.parse(ko.toJSON(responseData));
+            var ldapStatus = response.security;
+            setLdapEnabled(ldapStatus);
+            if (isLdapEnabled()) {
                 checkLoggedInUser();
             } else {
                 doIfSecurityOff();
@@ -277,9 +334,6 @@ function checkLoggedInUser() {
     ajaxHttpSender.sendAjax(contextPath, "GET", null, callback);
 }
 
-function getCurrentUserInSession() {
-	return sessionStorage.getItem("currentUser");
-}
 // End ## Login and Security ##
 
 // Start ## Status Indicator ##
@@ -293,7 +347,7 @@ var statusType = {
 var statusText = {
     backend_down: "<strong>Back end is down!</strong> Wait for it go up or switch to another back end before continuing!",
     test_rules_disabled: "<strong>Test Rule service is disabled!</strong> To enable it set the backend property [testaggregated.enabled] as [true]"
-}
+};
 
 function addStatusIndicator(statusType, statusText) {
     var statusIndicator = $(".content")[0].previousElementSibling;

src/main/resources/static/js/errorMessages.js

@@ -13,54 +13,54 @@ function viewModel(data) {
         for (var i = 0; i < json.length; i++) {
             self.addErrorMessage(json[i].message);
         }
-    }
+    };
     self.addErrorMessage = function (data) {
         var model = new messageModel(data);
         self.errorMessages.push(model);
-    }
+    };
     self.removeErrorMessage = function (index) {
         var length = self.errorMessages.length;
         var realIndex = length - 1 - index;
         self.errorMessages.splice(realIndex, 1);
         self.mergeErrorMessages();
-    }
+    };
     self.removeAllErrorMessages = function () {
         self.errorMessages([]);
         sessionStorage.setItem('ei.errorMessages', '[]');
         sessionStorage.setItem('ei.errorMessagesNew', '[]');
-    }
+    };
     self.storeErrorMessage = function (data) {
-        storedNew.push({ "message": data })
+        storedNew.push({ "message": data });
         sessionStorage.setItem('ei.errorMessagesNew', JSON.stringify(storedNew));
         self.updateNewMessagesLength();
-    }
+    };
     self.mergeErrorMessages = function () {
         storedOld = ko.toJS(self.errorMessages);
         storedNew = [];
         sessionStorage.setItem('ei.errorMessages', JSON.stringify(storedOld));
         sessionStorage.setItem('ei.errorMessagesNew', JSON.stringify(storedNew));
         self.updateNewMessagesLength();
-    }
+    };
     self.updateNewMessagesLength = function () {
         self.newMessagesLength(storedNew.length);
-    }
+    };
     self.expandMessage = function (event) {
         if (event.target.classList.contains("expand")) {
             event.target.classList.remove("expand");
         } else {
             self.resetExpandMessage();
             event.target.classList.add("expand");
         }
-    }
+    };
     self.resetExpandMessage = function () {
         $(".alert-message").removeClass("expand");
-    }
+    };
     self.stopPropagation = function () {
         $('.alert-menu').on('click', function (event) {
             event.stopPropagation();
             event.preventDefault();
         });
-    }
+    };
 }
 var vm = new viewModel();
 vm.init();

src/main/resources/static/js/login.js

@@ -1,28 +1,13 @@
 jQuery(document).ready(function () {
+    function rerouteToSubscription() {
+        checkBackendSecured();
+        if ( !isLdapEnabled() || isStringDefined(getCurrentUser()) ) {
+            console.log("Ldap not enabled or user already logged in, this page should not be accessable!");
+            navigateToRoute('subscriptions');
+        }
 
-    function checkBackendSecured() {
-        var callback = {
-            beforeSend: function () {
-            },
-            success: function (responseData, textStatus) {
-                var currentUser = getCurrentUserInSession();
-                var ldapEnabled = responseData.security;
-                if (ldapEnabled == false || (ldapEnabled == true && currentUser != null)) {
-                    navigateToRoute('subscriptions');
-                }
-            },
-            error: function (responseData) {
-                navigateToRoute('subscriptions');
-            },
-            complete: function () {
-            }
-        };
-        var ajaxHttpSender = new AjaxHttpSender();
-        var contextPath = "/auth";
-        ajaxHttpSender.sendAjax(contextPath, "GET", null, callback);
     }
-
-    checkBackendSecured();
+    rerouteToSubscription();
 
     // /Start ## Knockout ####################################################
     function loginModel() {
@@ -40,10 +25,12 @@ jQuery(document).ready(function () {
                 var token = window.btoa(dataJSON.ldapUserName + ":" + dataJSON.password);
                 sendLoginRequest(token);
             }
-        }
+        };
     }
 
     function sendLoginRequest(token) {
+        $('#loginError').hide();
+        $('#loginError').removeClass("is-invalid");
         var callback = {
             beforeSend: function (XMLHttpRequest) {
                 XMLHttpRequest.setRequestHeader("Authorization", "Basic " + token);
@@ -55,14 +42,24 @@ jQuery(document).ready(function () {
                 navigateToRoute('subscriptions');
             },
             error: function (XMLHttpRequest, textStatus, errorThrown) {
-                window.logMessages("Bad credentials");
+                if (XMLHttpRequest.status == 401) {
+                    window.logMessages("Bad credentials");
+                    $('#loginError').text("Invalid username and/or password!");
+                    $('#loginError').addClass("is-invalid");
+                    $('#loginError').show();
+                } else {
+                    window.logMessages("Unknown login error");
+                    $('#loginError').text("Unknown login error!");
+                    $('#loginError').addClass("is-invalid");
+                    $('#loginError').show();
+                }
             },
             complete: function () {
             }
         };
         var ajaxHttpSender = new AjaxHttpSender();
         var contextPath = "/auth/login";
-        ajaxHttpSender.sendAjax(contextPath, "GET", token, callback);
+        ajaxHttpSender.sendAjax(contextPath, "GET", "", callback);
     }
 
     var observableObject = $("#viewModelDOMObject")[0];