Changeset 7531

Timestamp:

Nov 26, 2018, 1:06:20 PM (3 years ago)

Author:

Nicklas Nordborg

Message:

References #2131: Add support for installing multiple authentication managers

The "Switch user" dialog should now work with multiple login forms.

Location:

trunk/www

Files:

• include/menu.jsp (modified) (1 diff)
• login.js (modified) (1 diff)
• switch.jsp (modified) (7 diffs)

trunk/www/include/menu.jsp

@@ -1194 +1194 @@
         title="<%=menu.getString("switchuser.title") + "…"%>" 
         url="<%=root+"switch.jsp?ID="+ID%>"
-        data-popup="Switch, 480, 320"
+        data-popup="Switch, 540, 360"
         tooltip="<%=menu.getString("switchuser.tooltip")%>" 
       />

trunk/www/login.js

@@ -91 +91 @@
   login.switchLoginForm = function(loginForm)
   {
-    var url = 'main.jsp?ID='+App.getSessionId();
+    var url = location.pathname+'?ID='+App.getSessionId();
     url += '&loginForm='+encodeURIComponent(loginForm);
     location.replace(url);

trunk/www/switch.jsp

@@ -33 +33 @@
   import="net.sf.basedb.core.query.Hql"
   import="net.sf.basedb.util.extensions.ExtensionsInvoker"
+  import="net.sf.basedb.util.extensions.ActionIterator"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.util.HTML"
@@ -41 +42 @@
   import="net.sf.basedb.clients.web.extensions.login.FieldInfo"
   import="net.sf.basedb.util.Values"
+  import="java.util.Map"
+  import="java.util.TreeMap"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -53 +56 @@
 <%
 final String login = Values.getString(request.getParameter("login"), "");
+final String requestedLoginForm = Values.getString(request.getParameter("loginForm"), null);
 
 final SessionControl sc = Base.getSessionControl(pageContext, true);
@@ -61 +65 @@
   JspContext jspContext = ExtensionsControl.createContext(dc, pageContext);
   ExtensionsInvoker<LoginFormAction> invoker = (ExtensionsInvoker<LoginFormAction>)ExtensionsControl.useExtensions(jspContext, "net.sf.basedb.clients.web.login-form");
+
   LoginFormAction loginAction = null;
-  for (LoginFormAction action : invoker)
+  String selectedLoginForm = null;
+  Map<String, String> allForms = new TreeMap<String, String>();
+
+  ActionIterator<LoginFormAction> it = invoker.iterate();
+  while (it.hasNext())
   {
+    LoginFormAction action = it.next();
     if (action != null)
     {
-      loginAction = action;
-      break;
+      String formId = action.getId();
+      if (formId == null) formId = it.getExtension().getId();
+      String displayName = action.getDisplayName();
+      if (displayName == null) displayName = it.getExtension().getAbout().getName();
+      allForms.put(formId, displayName);
+      
+      if (loginAction == null || formId.equals(requestedLoginForm))
+      {
+        loginAction = action;
+        selectedLoginForm = formId;
+      }
     }
   }
@@ -77 +96 @@
     bean.setPasswordField(FieldInfo.DEFAULT_PASSWORD);
     loginAction = bean;
+    selectedLoginForm = "password";
   }
   FieldInfo loginField = loginAction.getLoginField();
@@ -87 +107 @@
     <ext:stylesheets context="<%=jspContext%>" />
   </base:head>
-  <base:body>
+  <base:body data-login-form="<%=HTML.encodeTags(selectedLoginForm)%>" data-requested-form="<%=HTML.encodeTags(requestedLoginForm) %>">
     <h1>Switch user <base:help helpid="switchuser" /></h1>
     <form name="login" action="login.jsp" method="post">
@@ -98 +118 @@
     <div class="content">
       <table class="fullform input100 bottomborder ">
+      <%
+      if (allForms.size() > 0)
+      {
+        %>
+        <tr>
+          <th>Login with</th>
+          <td>
+          <select name="loginForm" id="loginForm" style="min-width: 10em;">
+          <%
+          for (Map.Entry<String, String> entry : allForms.entrySet())
+          {
+            String formId = entry.getKey();
+            %>
+            <option value="<%=formId%>" <%=formId.equals(selectedLoginForm) ? "selected" : ""%>><%=HTML.encodeTags(entry.getValue()) %>
+            <%
+          }
+          %>
+          </select>
+          </td>
+        </tr>
+        <%
+      }
+      %>
       <tr <%=valueIfNotNull("class=\"", loginField.getClazz(), "\"")%> id="login-row">
         <th><%=loginField.getPrompt() %></th>