Changeset 5528

Timestamp:

09/26/08 14:04:26 (3 months ago)

Author:

joonas.lehtinen@…

Message:

Fixed #2106 : Reviewed, tested, merged (and a bit fixed) Maunos patch for automatic expiration forward when the session ends.

Location:

trunk/src/com/itmill/toolkit

Files:

• Application.java (modified) (3 diffs)
• terminal/gwt/client/ApplicationConnection.java (modified) (2 diffs)
• terminal/gwt/server/CommunicationManager.java (modified) (3 diffs)
• tests/tickets/Ticket2106.java (added)

trunk/src/com/itmill/toolkit/Application.java

@@ -1394 +1394 @@
         /**
          * Enables or disables the notification. If disabled, the set URL (or
-         * current) is loaded directly.
+         * current) is loaded directly when next transaction between server and
+         * client happens.
          * 
          * @param sessionExpiredNotificationEnabled
-         *            true = enabled, false = disabled
+         *                true = enabled, false = disabled
          */
         public void setSessionExpiredNotificationEnabled(
@@ -1406 +1407 @@
         /**
          * Sets the caption of the notification. Set to null for no caption. If
-         * both caption and message is null, the notification is disabled;
+         * both caption and message are null, client automatically forwards to
+         * sessionExpiredUrl after timeout timer expires. Timer uses value read
+         * from HTTPSession.getMaxInactiveInterval()
          * 
          * @param sessionExpiredCaption
@@ -1417 +1420 @@
         /**
          * Sets the message of the notification. Set to null for no message. If
-         * both caption and message is null, the notification is disabled;
+         * both caption and message are null, client automatically forwards to
+         * sessionExpiredUrl after timeout timer expires. Timer uses value read
+         * from HTTPSession.getMaxInactiveInterval()
          * 
          * @param sessionExpiredMessage
-         *            the message
+         *                the message
          */
         public void setSessionExpiredMessage(String sessionExpiredMessage) {

trunk/src/com/itmill/toolkit/terminal/gwt/client/ApplicationConnection.java

@@ -109 +109 @@
     /** List of pending variable change bursts that must be submitted in order */
     private final Vector pendingVariableBursts = new Vector();
+    
+    /** Timer for automatic refirect to SessionExpiredURL */
+    private Timer redirectTimer; 
+    
+    /** redirectTimer scheduling interval in seconds */ 
+    private int sessionExpirationInterval; 
 
     public ApplicationConnection(WidgetSet widgetSet,
@@ -501 +507 @@
                 paintableToId.clear();
             }
-        }
-
+            if (meta.containsKey("timedRedirect")) {
+                final JSONObject timedRedirect = meta.get("timedRedirect").isObject();
+                redirectTimer = new Timer() { 
+                    public void run() { 
+                        redirect(timedRedirect.get("url").isString().stringValue()); 
+                    }
+                };                
+                sessionExpirationInterval = Integer.parseInt(timedRedirect.get("interval").toString());
+            }
+        }
+        if (redirectTimer != null) {
+            redirectTimer.schedule(1000 * sessionExpirationInterval);
+        }
         // Process changes
         final JSONArray changes = (JSONArray) ((JSONObject) json)

trunk/src/com/itmill/toolkit/terminal/gwt/server/CommunicationManager.java

@@ -13 +13 @@
 import java.io.OutputStreamWriter;
 import java.io.PrintWriter;
+import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
 import java.text.DateFormatSymbols;
@@ -104 +105 @@
 
     private int pendingLocalesIndex;
+
+    private int timeoutInterval = -1;
 
     public CommunicationManager(Application application,
@@ -439 +442 @@
                 metaOpen = true;
                 outWriter.write("\"repaintAll\":true");
+            }
+
+            SystemMessages ci = null;
+            try {
+                Method m = application.getClass().getMethod(
+                        "getSystemMessages", null);
+                ci = (Application.SystemMessages) m.invoke(null, null);
+            } catch (NoSuchMethodException e1) {
+                e1.printStackTrace();
+            } catch (IllegalArgumentException e) {
+                e.printStackTrace();
+            } catch (IllegalAccessException e) {
+                e.printStackTrace();
+            } catch (InvocationTargetException e) {
+                e.printStackTrace();
+            }
+
+            // meta instruction for client to enable auto-forward to
+            // sessionExpiredURL after timer expires.
+            if (ci != null && ci.getSessionExpiredMessage() == null
+                    && ci.getSessionExpiredCaption() == null
+                    && ci.isSessionExpiredNotificationEnabled()) {
+                int newTimeoutInterval = request.getSession()
+                        .getMaxInactiveInterval();
+                if (repaintAll || (timeoutInterval != newTimeoutInterval)) {
+                    String escapedURL = ci.getSessionExpiredURL() == null ? ""
+                            : ci.getSessionExpiredURL().replace("/", "\\/");
+                    if (metaOpen) {
+                        outWriter.write(",");
+                    }
+                    outWriter.write("\"timedRedirect\":{\"interval\":"
+                            + (newTimeoutInterval + 15) + ",\"url\":\""
+                            + escapedURL + "\"}");
+                    metaOpen = true;
+                }
+                timeoutInterval = newTimeoutInterval;
             }