Changeset 7114

Timestamp:

Mar 16, 2016, 9:17:01 AM (8 years ago)

Author:

Nicklas Nordborg

Message:

References #1995: Add extension point for selecting start page

The login handling should now support this feature. It is available from the main login page and from the "Switch user" dialog when the "Remain on this page" is not checked. The login page that is shown after an automatic logout due to a timeout does not support this feature since it may interfere with what the user doing.

A concern is that the new start page doean't exists or has an error of some sort. In this case it may result in a lockout of the user. To prevent this a special page for handling "404 Not found" errors have been created. This page should display the regular BASE menu and allow the user to continue and modify the start page setting.

If this doesn't work it is also possible to hold down CTRL or ALT or SHIFT while clicking on the "Login" button. This will disable the extension start page and always display the regular home page instead.

Location:

trunk

Files:

• config/dist/web.xml (modified) (1 diff)
• www/exception/404.jsp (added)
• www/exception/not_logged_in.jsp (modified) (1 diff)
• www/login.js (modified) (2 diffs)
• www/login.jsp (modified) (6 diffs)
• www/main.jsp (modified) (1 diff)
• www/switch.jsp (modified) (1 diff)

trunk/config/dist/web.xml

@@ -36 +36 @@
     <exception-type>java.lang.Throwable</exception-type>
     <location>/exception/exception.jsp</location>
+  </error-page>
+  
+  <error-page>
+    <error-code>404</error-code>
+    <location>/exception/404.jsp</location>
   </error-page>
   

trunk/www/exception/not_logged_in.jsp

@@ -100 +100 @@
       <input type="hidden" name="ID" value="<%=ID%>">
       <input type="hidden" name="redirect" value="<%=redirect%>">
+      <input type="hidden" name="useAutoStartPage" value="0">
   
       <table style="margin: auto; width: 700px; margin-top:5em; ">

trunk/www/login.js

@@ -154 +154 @@
     if (frm.login && frm.login.disabled) return;
 
+    // Disable start page extension if special key is used
+    var specialKey = event.altKey || event.ctrlKey || event.shiftKey;
+    
     // Check if the login is not recommended
     var denyLogin = Doc.element('denyLogin');
@@ -186 +189 @@
       else
       {
-        frm.redirect.value = App.getRoot()+'my_base/index.jsp?ID='+getSessionId();
-      }
-    }
+        frm.useAutoStartPage.value = '1';
+        frm.redirect.value = App.getRoot()+'my_base/index.jsp?ID='+App.getSessionId();
+      }
+    }
+    
+    if (specialKey && frm.useAutoStartPage) frm.useAutoStartPage.value = '0'; 
     
     if (frm.target) Dialogs.openPopup('', frm.target, 300, 200);

trunk/www/login.jsp

@@ -28 +28 @@
   @param login The login for the user.
   @param password The password for the user.
-  @param nextpage The URL for the next page to show. If not
-    specified the current page is reloaded
 
   @author Nicklas
@@ -37 +35 @@
   import="net.sf.basedb.core.*"
   import="net.sf.basedb.core.authentication.LoginRequest"
+  import="net.sf.basedb.util.extensions.ExtensionsInvoker"
   import="net.sf.basedb.clients.web.Base"
   import="net.sf.basedb.clients.web.WebException"
+  import="net.sf.basedb.clients.web.extensions.JspContext"
+  import="net.sf.basedb.clients.web.extensions.ExtensionsControl"
+  import="net.sf.basedb.clients.web.extensions.startpage.StartPageAction"
   import="net.sf.basedb.clients.web.util.HTML"
   import="net.sf.basedb.util.Values"
+  import="java.util.Iterator"
 %>
 <%@ taglib prefix="base" uri="/WEB-INF/base.tld" %>
@@ -48 +51 @@
   String cmd = request.getParameter("cmd");
   String again = request.getParameter("again");
+  boolean useAutoStartPage = Values.getBoolean(request.getParameter("useAutoStartPage"));
   String root = request.getContextPath()+"/";
   String redirect = Values.getStringOrNull(request.getParameter("redirect"));
@@ -57 +61 @@
   {
     String password = request.getParameter("password");
+    DbControl dc = null;
     try
     {
@@ -62 +67 @@
       LoginRequest loginRequest = new LoginRequest(login, password);
       sc.login(loginRequest);
+      
+      if (useAutoStartPage)
+      {
+        String startPageId = sc.getUserClientSetting("start-page-id");
+        if (startPageId != null)
+        {
+          dc = sc.newDbControl();
+          User user = User.getById(dc, sc.getLoggedInUserId());
+          JspContext context = ExtensionsControl.createContext(dc, pageContext, null, user);
+          ExtensionsInvoker<StartPageAction> invoker = (ExtensionsInvoker<StartPageAction>)ExtensionsControl.useExtensions(context, "net.sf.basedb.clients.web.start-page");
+          Iterator<StartPageAction> it = invoker.iterator();
+          while (it.hasNext())
+          {
+            try
+            {
+              StartPageAction action = it.next();
+              if (startPageId.equals(action.getId()))
+              {
+                String startPage = action.getUrl();
+                if (startPage != null)
+                {
+                  redirect = startPage.replace("$SESSION-ID$", sc.getId());
+                }
+                break;
+              }
+            }
+            catch (RuntimeException ex)
+            {}
+          }
+        }
+      }
     }
     catch (LoginException ex)
@@ -83 +119 @@
       errorMessage = ex.getMessage();
     }
-
+    finally
+    {
+      if (dc != null) dc.close();
+    }
   }
   else if ("Impersonate".equals(cmd))

trunk/www/main.jsp

@@ -111 +111 @@
     <form name="login" action="login.jsp" method="post">
     <input type="hidden" name="ID" value="<%=ID%>">
-    <input type="hidden" name="nextpage" value="<%=root%>my_base/user/index.jsp">
+    <input type="hidden" name="useAutoStartPage" value="1">
     
     <table style="margin: auto; width: 700px;">

trunk/www/switch.jsp

@@ -92 +92 @@
     <input type="hidden" name="again" value="1">
     <input type="hidden" name="redirect" value="">
+    <input type="hidden" name="useAutoStartPage" value="0">
   
     <div class="content">