Changeset 7530

Timestamp:

Nov 26, 2018, 12:40:55 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

The most recently used login form should now be remembered and automatically loaded the next time.

Location:

trunk/www

Files:

• login.js (modified) (7 diffs)
• login.jsp (modified) (3 diffs)
• main.jsp (modified) (2 diffs)

trunk/www/login.js

@@ -33 +33 @@
   login.initPage = function()
   {
+    // If there is no requested login form, we try to use the last one that was used
+    var requestedForm = Data.get(document.body, 'requested-form');
+    if (!requestedForm)
+    {
+      var lastLoginForm = login.getLastLoginForm();
+      var selectedLoginForm = Data.get(document.body, 'login-form');
+      if (lastLoginForm && lastLoginForm != selectedLoginForm)
+      {
+        login.switchLoginForm(lastLoginForm);
+        return;
+      }
+    }
+    
     // Information links
     Buttons.addClickHandler('aboutServer', login.showAbout);
@@ -44 +57 @@
     Buttons.addClickHandler('close', App.closeWindow);
     
-    Events.addEventHandler('loginForm', 'change', login.switchLoginForm);
+    Events.addEventHandler('loginForm', 'change', login.loginFormOnChange);
     
     var extraField = Doc.element('extraField');
@@ -70 +83 @@
   }
   
-  login.switchLoginForm = function(event)
-  {
-    // TODO -- will not work when login form is in a different jsp
+  
+  login.loginFormOnChange = function(event)
+  {
+    login.switchLoginForm(event.currentTarget.value);
+  }
+  
+  login.switchLoginForm = function(loginForm)
+  {
     var url = 'main.jsp?ID='+App.getSessionId();
-    url += '&loginForm='+event.currentTarget.value;
+    url += '&loginForm='+encodeURIComponent(loginForm);
     location.replace(url);
   }
@@ -141 +159 @@
     return lastLogin;
   }
+  
+  
+  /*
+    Save the last login form. If local storage is available we use that,
+    otherwise we simply save it on the top frameset.
+  */
+  login.saveLastLoginForm = function(lastLoginForm)
+  {
+    var storage = App.localStorage();
+    if (storage)
+    {
+      App.setLocal('last-login-form', lastLoginForm);
+    }
+    else
+    {
+      App.topWindow().lastLoginForm = lastLoginForm;
+    }
+  }
+  
+  /**
+    Get the last used login form. If local storage is available we
+    use that, otherwise we use the top frameset.
+   */
+  login.getLastLoginForm = function()
+  {
+    var lastLoginForm;
+    var storage = App.localStorage();
+    if (storage)
+    {
+      lastLoginForm = App.getLocal('last-login-form');
+    }
+    if (!lastLoginForm)
+    {
+      lastLoginForm = App.topWindow().lastLoginForm;
+    }
+    return lastLoginForm;
+  }
+
   
   /**
@@ -202 +258 @@
     }
     
-    alert(frm.loginForm.value);
-    
     // On the impersonate form, check that a user has been selected
     if (frm.user_id && !frm.user_id.value)
@@ -216 +270 @@
       Login.saveLastLogin(frm.login.value);
     }
-    // TODO -- save the login form
+    if (frm.loginForm)
+    {
+      Login.saveLastLoginForm(frm.loginForm.value);
+    }
     
     // Check 'remain on page' and 'redirect' options
@@ -246 +303 @@
       var frm2 = Forms.cloneAsHidden(frm);
       document.body.appendChild(frm2);
-      alert(frm2.loginForm.value);
       frm2.submit();
       document.body.removeChild(frm2);

trunk/www/login.jsp

@@ -61 +61 @@
   String message = null;
   String login = request.getParameter("login");
+  String loginForm = Values.getStringOrNull(request.getParameter("loginForm"));
     
   if ("Login".equals(cmd) || cmd == null)
@@ -67 +68 @@
     String deviceToken = Values.getStringOrNull(request.getParameter("deviceToken"));
     String extraValue = Values.getStringOrNull(request.getParameter("extraField"));
-    String loginForm = Values.getStringOrNull(request.getParameter("loginForm"));
     try
     {
@@ -233 +233 @@
     if (errorMessage != null)
     {
-      response.sendRedirect(root+"main.jsp?ID="+ID+"&login="+HTML.urlEncode(login)+"&error="+HTML.urlEncode(errorMessage));
+      response.sendRedirect(root+"main.jsp?ID="+ID+"&login="+HTML.urlEncode(login)+"&loginForm="+HTML.encodeTags(loginForm)+"&error="+HTML.urlEncode(errorMessage));
     }
     else

trunk/www/main.jsp

@@ -116 +116 @@
     bean.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
     loginAction = bean;
+    selectedLoginForm = "password";
   }
 
@@ -127 +128 @@
     <ext:stylesheets context="<%=jspContext%>" />
   </base:head>
-  <base:body style="padding-top: 5em;" data-login-form="<%=Values.getString(selectedLoginForm)%>">
+  <base:body style="padding-top: 5em;" data-login-form="<%=HTML.encodeTags(selectedLoginForm)%>" data-requested-form="<%=HTML.encodeTags(requestedLoginForm) %>">
     <form name="login" action="login.jsp" method="post">
     <input type="hidden" name="ID" value="<%=ID%>">