release 3.4

queueit · Dec 18, 2017 · e46de06 · e46de06
1 parent 22329f0
commit e46de06
Show file tree

Hide file tree

Showing 9 changed files with 247 additions and 106 deletions.
diff --git a/SDK/src/queueit/knownuserv3/sdk/Constants.java b/SDK/src/queueit/knownuserv3/sdk/Constants.java
@@ -4,4 +4,5 @@ final class ActionType {
 
     public static final String CANCEL_ACTION = "Cancel";
     public static final String QUEUE_ACTION = "Queue";
+    public static final String IGNORE_ACTION = "Ignore";
 }
diff --git a/SDK/src/queueit/knownuserv3/sdk/KnownUser.java b/SDK/src/queueit/knownuserv3/sdk/KnownUser.java
@@ -16,7 +16,7 @@ public class KnownUser {
     public static final String QueueITDebugKey = "queueitdebug";
     private static IUserInQueueService _userInQueueService;
 
-    private static IUserInQueueService createUserInQueueService(HttpServletRequest request, HttpServletResponse response) {
+    private static IUserInQueueService getUserInQueueService(HttpServletRequest request, HttpServletResponse response) {
         if (_userInQueueService == null) {
             return new UserInQueueService(new UserInQueueStateCookieRepository(new CookieManager(request, response)));
         }
@@ -71,44 +71,16 @@ public static RequestValidationResult validateRequestByIntegrationConfig(String
                 return new RequestValidationResult(null, null, null, null);
             }
 
+            // unspecified or 'Queue' specified
             if(Utils.isNullOrWhiteSpace(matchedConfig.ActionType) || ActionType.QUEUE_ACTION.equals(matchedConfig.ActionType)) {
-                String targetUrl;
-                switch (matchedConfig.RedirectLogic) {
-                    case "ForecedTargetUrl": // suuport for typo (fall through)
-                    case "ForcedTargetUrl":
-                        targetUrl = matchedConfig.ForcedTargetUrl;
-                        break;
-                    case "EventTargetUrl":
-                        targetUrl = "";
-                        break;
-                    default:
-                        targetUrl = currentUrlWithoutQueueITToken;
-                        break;
-                }
-
-                QueueEventConfig queueConfig = new QueueEventConfig();
-                queueConfig.setQueueDomain(matchedConfig.QueueDomain);
-                queueConfig.setCulture(matchedConfig.Culture);
-                queueConfig.setEventId(matchedConfig.EventId);
-                queueConfig.setExtendCookieValidity(matchedConfig.ExtendCookieValidity);
-                queueConfig.setLayoutName(matchedConfig.LayoutName);
-                queueConfig.setCookieValidityMinute(matchedConfig.CookieValidityMinute);
-                queueConfig.setCookieDomain(matchedConfig.CookieDomain);
-                queueConfig.setVersion(customerIntegrationInfo.Version);
-
-                return resolveQueueRequestByLocalConfig(
-                        targetUrl, queueitToken, queueConfig, customerId, request, response, secretKey, debugEntries);
+                return handleQueueAction(matchedConfig, currentUrlWithoutQueueITToken, customerIntegrationInfo, queueitToken, customerId, request, response, secretKey, debugEntries);
             }
-            // CancelQueueAction
+            else if (ActionType.CANCEL_ACTION.equals(matchedConfig.ActionType)){
+                return handleCancelAction(matchedConfig, customerIntegrationInfo, currentUrlWithoutQueueITToken, queueitToken, customerId, request, response, secretKey, debugEntries);
+            }            
+            // for all unknown types default to 'Ignore'
             else {
-                CancelEventConfig cancelConfig = new CancelEventConfig();
-                cancelConfig.setQueueDomain(matchedConfig.QueueDomain);
-                cancelConfig.setEventId(matchedConfig.EventId);
-                cancelConfig.setCookieDomain(matchedConfig.CookieDomain);
-                cancelConfig.setVersion(customerIntegrationInfo.Version);
-
-                return cancelRequestByLocalConfig(
-                        currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, request, response, secretKey, debugEntries);
+                return handleIgnoreAction(request, response);
             }
         }
         finally {
@@ -166,7 +138,7 @@ private static RequestValidationResult cancelRequestByLocalConfig(
             throw new Exception("QueueDomain from cancelConfig can not be null or empty.");
         }
 
-        IUserInQueueService userInQueueService = createUserInQueueService(request, response);
+        IUserInQueueService userInQueueService = getUserInQueueService(request, response);
         return userInQueueService.validateCancelRequest(targetUrl, cancelConfig, customerId, secretKey);
     }
 
@@ -223,7 +195,7 @@ private static RequestValidationResult resolveQueueRequestByLocalConfig(
             queueitToken = "";
         }
 
-        IUserInQueueService userInQueueService = createUserInQueueService(request, response);
+        IUserInQueueService userInQueueService = getUserInQueueService(request, response);
         return userInQueueService.validateQueueRequest(targetUrl, queueitToken, queueConfig, customerId, secretKey);
     }
 
@@ -244,7 +216,7 @@ public static void extendQueueCookie(String eventId,
             throw new Exception("secretKey can not be null or empty.");
         }
 
-        IUserInQueueService userInQueueService = createUserInQueueService(request, response);
+        IUserInQueueService userInQueueService = getUserInQueueService(request, response);
         userInQueueService.extendQueueCookie(eventId, cookieValidityMinute, cookieDomain, secretKey);
     }
 
@@ -288,6 +260,51 @@ private static String getOriginalUrl(HttpServletRequest request){
                 ? String.join("", request.getRequestURL(), "?",request.getQueryString()) 
                 : request.getRequestURL().toString();        
     }
+
+    private static RequestValidationResult handleQueueAction(IntegrationConfigModel matchedConfig, String currentUrlWithoutQueueITToken, CustomerIntegration customerIntegrationInfo, String queueitToken, String customerId, HttpServletRequest request, HttpServletResponse response, String secretKey, Map<String, String> debugEntries) throws Exception {
+        String targetUrl;
+        switch (matchedConfig.RedirectLogic) {
+            case "ForecedTargetUrl": // suuport for typo (fall through)
+            case "ForcedTargetUrl":
+                targetUrl = matchedConfig.ForcedTargetUrl;
+                break;
+            case "EventTargetUrl":
+                targetUrl = "";
+                break;
+            default:
+                targetUrl = currentUrlWithoutQueueITToken;
+                break;
+        }
+
+        QueueEventConfig queueConfig = new QueueEventConfig();
+        queueConfig.setQueueDomain(matchedConfig.QueueDomain);
+        queueConfig.setCulture(matchedConfig.Culture);
+        queueConfig.setEventId(matchedConfig.EventId);
+        queueConfig.setExtendCookieValidity(matchedConfig.ExtendCookieValidity);
+        queueConfig.setLayoutName(matchedConfig.LayoutName);
+        queueConfig.setCookieValidityMinute(matchedConfig.CookieValidityMinute);
+        queueConfig.setCookieDomain(matchedConfig.CookieDomain);
+        queueConfig.setVersion(customerIntegrationInfo.Version);
+
+        return resolveQueueRequestByLocalConfig(
+                targetUrl, queueitToken, queueConfig, customerId, request, response, secretKey, debugEntries);
+    }
+
+    private static RequestValidationResult handleCancelAction(IntegrationConfigModel matchedConfig, CustomerIntegration customerIntegrationInfo, String currentUrlWithoutQueueITToken, String queueitToken, String customerId, HttpServletRequest request, HttpServletResponse response, String secretKey, Map<String, String> debugEntries) throws Exception {
+        CancelEventConfig cancelConfig = new CancelEventConfig();
+        cancelConfig.setQueueDomain(matchedConfig.QueueDomain);
+        cancelConfig.setEventId(matchedConfig.EventId);
+        cancelConfig.setCookieDomain(matchedConfig.CookieDomain);
+        cancelConfig.setVersion(customerIntegrationInfo.Version);
+
+        return cancelRequestByLocalConfig(
+                currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, request, response, secretKey, debugEntries);
+    }
+
+    private static RequestValidationResult handleIgnoreAction(HttpServletRequest request, HttpServletResponse response) {
+        IUserInQueueService userInQueueService = getUserInQueueService(request, response);
+        return userInQueueService.getIgnoreActionResult();
+    }
 }
 
 interface ICookieManager {

diff --git a/SDK/src/queueit/knownuserv3/sdk/UserInQueueService.java b/SDK/src/queueit/knownuserv3/sdk/UserInQueueService.java
@@ -25,11 +25,13 @@ void extendQueueCookie(
             String cookieDomain,
             String secretKey
     );
+
+    RequestValidationResult getIgnoreActionResult();
 }
 
 class UserInQueueService implements IUserInQueueService {
 
-    public static final String SDK_VERSION = "3.3.2";
+    public static final String SDK_VERSION = "3.4.0";
     private final IUserInQueueStateRepository _userInQueueStateRepository;
 
     public UserInQueueService(
@@ -168,7 +170,10 @@ public void extendQueueCookie(
 
     @Override
     public RequestValidationResult validateCancelRequest(
-            String targetUrl, CancelEventConfig config, String customerId, String secretKey) throws Exception {
+            String targetUrl, 
+            CancelEventConfig config, 
+            String customerId, 
+            String secretKey) throws Exception {
 
         StateInfo state = _userInQueueStateRepository.getState(config.getEventId(), secretKey);
 
@@ -193,4 +198,9 @@ public RequestValidationResult validateCancelRequest(
             return new RequestValidationResult(ActionType.CANCEL_ACTION, config.getEventId(), null, null);
         }
     }
+
+    @Override
+    public RequestValidationResult getIgnoreActionResult() {
+        return new RequestValidationResult(ActionType.IGNORE_ACTION, null, null, null);
+    }
 }
diff --git a/SDK/src/queueit/knownuserv3/sdk/integrationconfig/Constants.java b/SDK/src/queueit/knownuserv3/sdk/integrationconfig/Constants.java
@@ -22,6 +22,8 @@ final class ComparisonOperatorType {
     public static final String STARTS_WITH = "StartsWith";
     public static final String ENDS_WITH = "EndsWith";
     public static final String MATCHES_WITH = "MatchesWith";
+    public static final String EQUALS_ANY = "EqualsAny";
+    public static final String CONTAINS_ANY = "ContainsAny";
 }
 
 final class LogicalOperatorType {