Extend validation result on disabeled

Author: malaqueueit

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

@@ -19,7 +19,6 @@ public class CookieValidateResultRepository extends ValidateResultRepositoryBase
     static String defaultCookieDomain;
     static int defaultCookieExpiration = 1200;
     static int defaultIdleExpiration = 180;
-    static int defaultDisabledExpiration = 180;
 
     static {       
         loadConfiguration();
@@ -33,22 +32,19 @@ private static void loadConfiguration()
             defaultCookieDomain = props.getProperty("cookieDomain", null);
             defaultCookieExpiration =  Integer.parseInt(props.getProperty("cookieExpiration", "1200"));
             defaultIdleExpiration =  Integer.parseInt(props.getProperty("idleExpiration", "180"));
-            defaultDisabledExpiration =  Integer.parseInt(props.getProperty("disabledExpiration", "180"));
         } catch (Exception e) {
             // no need to handle exception
         }    
     }
 
-    public static void configure(String cookieDomain, Integer cookieExpiration, Integer idleExpiration, Integer disabledExpiration)
+    public static void configure(String cookieDomain, Integer cookieExpiration, Integer idleExpiration)
     {
         if (cookieDomain != null)
             defaultCookieDomain = cookieDomain;
         if (cookieExpiration != null)
             defaultCookieExpiration = cookieExpiration;
         if (idleExpiration != null)
             defaultIdleExpiration = idleExpiration;        
-        if (disabledExpiration != null)
-            defaultDisabledExpiration = disabledExpiration;        
     }
 
     @Override
@@ -97,7 +93,7 @@ public IValidateResult getValidationResult(IQueue queue) {
         if (!expectedHash.equals(actualHash))
             return null;
 
-        if (redirectType != RedirectType.Disabled && redirectType != RedirectType.Idle)
+        if (redirectType != RedirectType.Idle)
             setCookie(queue, queueId, originalUrl, placeInQueue, redirectType, timeStamp, actualHash, null);
 
         return new AcceptedConfirmedResult(
@@ -155,8 +151,6 @@ private void setCookie(
 
         if (expirationTime != null)
             expiration = (int)(expirationTime.getTime() - now.getTime());
-        else if (redirectType == RedirectType.Disabled)
-            expiration = defaultDisabledExpiration;
         else if (redirectType == RedirectType.Idle)
             expiration = defaultIdleExpiration;
         else

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

@@ -8,7 +8,6 @@
 public class SessionValidateResultRepository extends ValidateResultRepositoryBase {
 
     static int defaultIdleExpiration = 180;
-    static int defaultDisabledExpiration = 180;
 
     static {       
         loadConfiguration();
@@ -20,18 +19,15 @@ private static void loadConfiguration()
             // Load the properties
             Properties props = QueueitProperties.getProperties("queueit.properties");
             defaultIdleExpiration =  Integer.parseInt(props.getProperty("idleExpiration", "180"));
-            defaultDisabledExpiration =  Integer.parseInt(props.getProperty("disabledExpiration", "180"));
         } catch (Exception e) {
             // no need to handle exception
         }    
     }
 
-    public static void configure(Integer idleExpiration, Integer disabledExpiration)
+    public static void configure(Integer idleExpiration)
     {
         if (idleExpiration != null)
             defaultIdleExpiration = idleExpiration;        
-        if (disabledExpiration != null)
-            defaultDisabledExpiration = disabledExpiration;        
     }
     @Override
     public IValidateResult getValidationResult(IQueue queue) {
@@ -87,8 +83,6 @@ public void setValidationResult(IQueue queue, IValidateResult validationResult,
 
             if (expirationTime != null)
                 model.Expiration = expirationTime;
-            else if (confirmedResult.getKnownUser().getRedirectType() == RedirectType.Disabled)
-                model.Expiration = new Date(System.currentTimeMillis()+(defaultDisabledExpiration*1000));
             else if (confirmedResult.getKnownUser().getRedirectType() == RedirectType.Idle)
                 model.Expiration = new Date(System.currentTimeMillis()+(defaultIdleExpiration*1000));