Added extend validity disable option

Author: malaqueueit

QueueIT.Security/src/queueit/security/CookieValidateResultRepository.java

@@ -18,6 +18,7 @@ public class CookieValidateResultRepository extends ValidateResultRepositoryBase
     static String defaultCookieDomain;
     static int defaultCookieExpiration = 1200;
     static int defaultIdleExpiration = 180;
+    static boolean defaultExtendValidity = true;
 
     static {       
         loadConfiguration();
@@ -31,19 +32,22 @@ private static void loadConfiguration()
             defaultCookieDomain = props.getProperty("cookieDomain", null);
             defaultCookieExpiration =  Integer.parseInt(props.getProperty("cookieExpiration", "1200"));
             defaultIdleExpiration =  Integer.parseInt(props.getProperty("idleExpiration", "180"));
+            defaultExtendValidity =  Boolean.parseBoolean(props.getProperty("extendValidity", "true"));
         } catch (Exception e) {
             // no need to handle exception
         }    
     }
 
-    public static void configure(String cookieDomain, Integer cookieExpiration, Integer idleExpiration)
+    public static void configure(String cookieDomain, Integer cookieExpiration, Integer idleExpiration, Boolean extendValidity)
     {
         if (cookieDomain != null)
             defaultCookieDomain = cookieDomain;
         if (cookieExpiration != null)
             defaultCookieExpiration = cookieExpiration;
         if (idleExpiration != null)
             defaultIdleExpiration = idleExpiration;        
+        if (extendValidity != null)
+            defaultExtendValidity = extendValidity;  
     }
 
     @Override
@@ -109,7 +113,7 @@ public IValidateResult getValidationResult(IQueue queue) {
         if (!expectedHash.equals(actualHash))
             return null;
 
-        if (redirectType != RedirectType.Idle)
+        if (defaultExtendValidity && redirectType != RedirectType.Idle)
         {
             Date newExpirationTime = new Date((new Date()).getTime() + (defaultCookieExpiration * 1000));
             String newHash = generateHash(queueId, originalUrl, placeInQueue, redirectType.toString(), timeStamp, newExpirationTime);

QueueIT.Security/src/queueit/security/SessionValidateResultRepository.java

@@ -8,7 +8,8 @@
 public class SessionValidateResultRepository extends ValidateResultRepositoryBase {
 
     static int defaultIdleExpiration = 180;
-    
+    static boolean defaultExtendValidity = true;
+        
     static {       
         loadConfiguration();
     }
@@ -19,15 +20,18 @@ private static void loadConfiguration()
             // Load the properties
             Properties props = QueueitProperties.getProperties("queueit.properties");
             defaultIdleExpiration =  Integer.parseInt(props.getProperty("idleExpiration", "180"));
+            defaultExtendValidity =  Boolean.parseBoolean(props.getProperty("extendValidity", "true"));
         } catch (Exception e) {
             // no need to handle exception
         }    
     }
 
-    public static void configure(Integer idleExpiration)
+    public static void configure(Integer idleExpiration, Boolean extendValidity)
     {
         if (idleExpiration != null)
             defaultIdleExpiration = idleExpiration;        
+        if (extendValidity != null)
+            defaultExtendValidity = extendValidity;  
     }
     @Override
     public IValidateResult getValidationResult(IQueue queue) {
@@ -66,6 +70,14 @@ public void setValidationResult(IQueue queue, IValidateResult validationResult,
 
         if (validationResult instanceof AcceptedConfirmedResult)
         {
+            if (defaultExtendValidity && expirationTime == null) 
+            {
+                HttpServletRequest request = RequestContext.getCurrentInstance().getRequest();
+                HttpSession session = request.getSession(true);
+        
+                expirationTime = new Date(System.currentTimeMillis()+(session.getMaxInactiveInterval()*1000));
+            }
+            
             AcceptedConfirmedResult confirmedResult = (AcceptedConfirmedResult)validationResult;
 
             HttpServletRequest request = RequestContext.getCurrentInstance().getRequest();
@@ -79,7 +91,6 @@ public void setValidationResult(IQueue queue, IValidateResult validationResult,
             model.TimeStamp = confirmedResult.getKnownUser().getTimeStamp();
             model.RedirectType = confirmedResult.getKnownUser().getRedirectType();
             model.PlaceInQueue = confirmedResult.getKnownUser().getPlaceInQueue();
-            model.Expiration = expirationTime;
 
             if (expirationTime != null)
                 model.Expiration = expirationTime;