queueit_knownuserv3 3.2.3 → 3.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    ZTZmYWVkMDlhZmY4NzIwYzBiYjkyMmY0Njg4YTlmYzMyYzczNzI4OQ==
+    MTU3N2I1ODBiZjE3ZWRkODk2YjJhYzE5NzgzMTBkOTY5NzYwNzQ5OA==
   data.tar.gz: !binary |-
-    NDE4OTVjYzEyZWJmOGIwMzkwMTFiYWU2Yzg5ZjRiOGMxNGE0ZmMwOA==
+    Zjg2ZDIwZmQxYjRlYmFmN2Y1ODZjOGE2N2RjYWY5MGFhNTc5Y2U1Yg==
 SHA512:
   metadata.gz: !binary |-
-    YWMzOGU1YTU2NDJjYTQwODJkMzdlNjBjNTU2Y2U2MTA3NWRkNmJmZTFhOGYy
-    MWIzYjY4Y2Q0ZTE1OTBjOTFkODM0NGJiMzIzZDRjNDc2ZTc3MDk2ODIwZmVi
-    YjJkN2QwZWIwODg5NzE0MDg5YmE5MDFlZTZhZWY1NWY3M2FkYTM=
+    YzdkZWRhYjhhYjkyOGMzMDg0MTlmNGUxZDYzOGM4ZWY0MTU5ZGQ3M2Q3OTdj
+    YjZlYjIxNTgxMzg0MzE0MzI3MDExOTQ0NzNlNjhhYTFlMDUxZWE0YmJkNzUz
+    ZTVhNzc0NDE1MmRiOTdkMjNkZTVjN2ZmN2ZhYTg5YmVjNWVmOTg=
   data.tar.gz: !binary |-
-    NDQ1MjI5YmZiMDEwNGU3MTFkNWUxYjhhYTIyNjBhZmE5MGRmMmExODAwNWYw
-    NGZiMzM4NzYzN2YyYmEyYjc1YzAwZTc2OTNkZDdiYjg4Njc2YzlkNWI2OGE4
-    MjUwMWUyOTE2NGY2NjYyNWQxMzg1YTA0YjM5OTlmZTY0MDcxMWI=
+    NjVkZWFiMTIwOGI2YTBmM2RiYmJhMmIwYjllMmNhMWRjNTQwY2UxMzI3M2M0
+    MjhkNzZmYjNlMDI5MjBjODAzZDkyZWI5YjBhZGM4NWQ2MjYyNTY3YTBiNmYy
+    YzBjNzM3ZjIzYzEwMDgwODc0ZWI1ZjgwN2ZlNjY5MDMwYThjMzk=

data/lib/queueit_knownuserv3/integration_config_helpers.rb

@@ -2,7 +2,7 @@ require 'uri'
 
 module QueueIt
 	class IntegrationEvaluator
-		def getMatchedIntegrationConfig(customerIntegration, currentPageUrl, cookieList, userAgent)
+		def getMatchedIntegrationConfig(customerIntegration, currentPageUrl, request)
 			if (!customerIntegration.kind_of?(Hash) || !customerIntegration.key?("Integrations") ||
 				!customerIntegration["Integrations"].kind_of?(Array))
 				return nil;
@@ -14,7 +14,7 @@ module QueueIt
 					if(!trigger.kind_of?(Hash))
 						return false
 					end
-					if(evaluateTrigger(trigger, currentPageUrl, cookieList, userAgent))
+					if(evaluateTrigger(trigger, currentPageUrl, request))
 						return integrationConfig
 					end
 				end
@@ -23,7 +23,7 @@ module QueueIt
 			return nil
 		end
 
-		def evaluateTrigger(trigger, currentPageUrl, cookieList, userAgent)
+		def evaluateTrigger(trigger, currentPageUrl, request)
 			if (!trigger.key?("LogicalOperator") ||
 				!trigger.key?("TriggerParts") ||
 				!trigger["TriggerParts"].kind_of?(Array))
@@ -35,7 +35,7 @@ module QueueIt
 					if(!triggerPart.kind_of?(Hash))
 						return false
 					end
-					if(evaluateTriggerPart(triggerPart, currentPageUrl, cookieList, userAgent))
+					if(evaluateTriggerPart(triggerPart, currentPageUrl, request))
 						return true
 					end
 				end
@@ -45,7 +45,7 @@ module QueueIt
 					if(!triggerPart.kind_of?(Hash))
 						return false
 					end
-					if(!evaluateTriggerPart(triggerPart, currentPageUrl, cookieList, userAgent))
+					if(!evaluateTriggerPart(triggerPart, currentPageUrl, request))
 						return false
 					end
 				end
@@ -53,7 +53,7 @@ module QueueIt
 			end
 		end
 
-		def evaluateTriggerPart(triggerPart, currentPageUrl, cookieList, userAgent)
+		def evaluateTriggerPart(triggerPart, currentPageUrl, request)
 			if (!triggerPart.key?("ValidatorType"))
 				return false
 			end
@@ -62,9 +62,11 @@ module QueueIt
 				when "UrlValidator"
 					return UrlValidatorHelper.evaluate(triggerPart, currentPageUrl)
 				when "CookieValidator"
-					return CookieValidatorHelper.evaluate(triggerPart, cookieList)
+					return CookieValidatorHelper.evaluate(triggerPart, request.cookie_jar)
 				when "UserAgentValidator"
-					return UserAgentValidatorHelper.evaluate(triggerPart, userAgent)
+					return UserAgentValidatorHelper.evaluate(triggerPart, request.user_agent)
+				when "HttpHeaderValidator"
+					return HttpHeaderValidatorHelper.evaluate(triggerPart, request.headers)
 				else
 					return false
 			end
@@ -111,7 +113,7 @@ module QueueIt
 	end
 
 	class CookieValidatorHelper
-		def self.evaluate(triggerPart, cookieList)
+		def self.evaluate(triggerPart, cookieJar)
 			begin
 				if (!triggerPart.key?("Operator") ||
 					!triggerPart.key?("IsNegative") ||
@@ -121,14 +123,14 @@ module QueueIt
 					return false;
 				end
 
-				if(cookieList.nil?)
+				if(cookieJar.nil?)
 					return false
 				end
 
 				cookieName = triggerPart["CookieName"]
 				cookieValue = ''
-				if(!cookieName.nil? && !cookieList[cookieName.to_sym].nil?)
-					cookieValue = cookieList[cookieName.to_sym]
+				if(!cookieName.nil? && !cookieJar[cookieName.to_sym].nil?)
+					cookieValue = cookieJar[cookieName.to_sym]
 				end
 				return ComparisonOperatorHelper.evaluate(
 					triggerPart["Operator"], 
@@ -162,6 +164,22 @@ module QueueIt
 		end
 	end
 
+	class HttpHeaderValidatorHelper
+		def self.evaluate(triggerPart, headers)
+			begin				
+				headerValue = headers[triggerPart['HttpHeaderName']]
+				return ComparisonOperatorHelper.evaluate(
+					triggerPart["Operator"], 
+					triggerPart["IsNegative"], 
+					triggerPart["IsIgnoreCase"], 
+					headerValue, 
+					triggerPart["ValueToCompare"])				
+			rescue
+				return false
+			end
+		end
+	end
+
 	class ComparisonOperatorHelper
 		def self.evaluate(opt, isNegative, ignoreCase, left, right)
 			if(left.nil?)

data/lib/queueit_knownuserv3/known_user.rb

@@ -60,7 +60,7 @@ module QueueIt
 		end
 		private_class_method :setDebugCookie
 
-		def self._resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, cookieJar, request, debugEntries)
+		def self._resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)
 			isDebug = getIsDebug(queueitToken, secretKey)
 			if(isDebug)
 				debugEntries["TargetUrl"] = targetUrl
@@ -102,12 +102,12 @@ module QueueIt
 				raise KnownUserError, "queueConfig.extendCookieValidity should be valid boolean."
 			end
 
-			userInQueueService = getUserInQueueService(cookieJar)
+			userInQueueService = getUserInQueueService(request.cookie_jar)
 			userInQueueService.validateQueueRequest(targetUrl, queueitToken, queueConfig, customerId, secretKey)
 		end
 		private_class_method :_resolveQueueRequestByLocalConfig
 	
-		def self._cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, cookieJar, request, debugEntries)
+		def self._cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries)
 			isDebug = getIsDebug(queueitToken, secretKey)
 			if(isDebug)
 				debugEntries["TargetUrl"] = targetUrl
@@ -144,12 +144,12 @@ module QueueIt
 				raise KnownUserError, "cancelConfig.queueDomain can not be nil or empty."
 			end
 
-			userInQueueService = getUserInQueueService(cookieJar)
+			userInQueueService = getUserInQueueService(request.cookie_jar)
 			userInQueueService.validateCancelRequest(targetUrl, cancelConfig, customerId, secretKey)
 		end
 		private_class_method :_cancelRequestByLocalConfig
 
-		def self.extendQueueCookie(eventId, cookieValidityMinute, cookieDomain, secretKey, cookieJar)
+		def self.extendQueueCookie(eventId, cookieValidityMinute, cookieDomain, secretKey, request)
 			if(Utils.isNilOrEmpty(eventId))
 				raise KnownUserError, "eventId can not be nil or empty."
 			end
@@ -163,20 +163,20 @@ module QueueIt
 				raise KnownUserError, "cookieValidityMinute should be integer greater than 0."	
 			end
 
-			userInQueueService = getUserInQueueService(cookieJar)
+			userInQueueService = getUserInQueueService(request.cookie_jar)
 			userInQueueService.extendQueueCookie(eventId, cookieValidityMinute, cookieDomain, secretKey)
 		end
 
-		def self.resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, cookieJar, request)
+		def self.resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request)
 			debugEntries = Hash.new
 			begin
-				return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, cookieJar, request, debugEntries)
+				return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)
 			ensure
-				setDebugCookie(debugEntries, cookieJar)
+				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
 
-		def self.validateRequestByIntegrationConfig(currentUrlWithoutQueueITToken, queueitToken, integrationsConfigString, customerId, secretKey, cookieJar, request)
+		def self.validateRequestByIntegrationConfig(currentUrlWithoutQueueITToken, queueitToken, integrationsConfigString, customerId, secretKey, request)
 			if(Utils.isNilOrEmpty(currentUrlWithoutQueueITToken))
 				raise KnownUserError, "currentUrlWithoutQueueITToken can not be nil or empty."
 			end
@@ -198,7 +198,7 @@ module QueueIt
 				end
 			
 				integrationEvaluator = IntegrationEvaluator.new
-				matchedConfig = integrationEvaluator.getMatchedIntegrationConfig(customerIntegration, currentUrlWithoutQueueITToken, cookieJar, request.user_agent)
+				matchedConfig = integrationEvaluator.getMatchedIntegrationConfig(customerIntegration, currentUrlWithoutQueueITToken, request)
 
 				if(isDebug)
 					if(matchedConfig == nil)
@@ -232,7 +232,7 @@ module QueueIt
 							targetUrl = currentUrlWithoutQueueITToken
 					end
 
-					return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, cookieJar, request, debugEntries)			
+					return _resolveQueueRequestByLocalConfig(targetUrl, queueitToken, queueConfig, customerId, secretKey, request, debugEntries)			
 			
 				else # cancel action			
 					cancelConfig = CancelEventConfig.new;
@@ -241,21 +241,21 @@ module QueueIt
 					cancelConfig.cookieDomain = matchedConfig["CookieDomain"]
 					cancelConfig.version = customerIntegration["Version"]
             
-					return _cancelRequestByLocalConfig(currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, secretKey, cookieJar, request, debugEntries);
+					return _cancelRequestByLocalConfig(currentUrlWithoutQueueITToken, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries);
 				end
 			rescue StandardError => stdErr
 				raise KnownUserError, "integrationConfiguration text was not valid: " + stdErr.message
 			ensure
-				setDebugCookie(debugEntries, cookieJar)
+				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
 
-		def self.cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, cookieJar, request)
+		def self.cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request)
 			debugEntries = Hash.new
 			begin
-				return _cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, cookieJar, request, debugEntries)
+				return _cancelRequestByLocalConfig(targetUrl, queueitToken, cancelConfig, customerId, secretKey, request, debugEntries)
 			ensure
-				setDebugCookie(debugEntries, cookieJar)
+				setDebugCookie(debugEntries, request.cookie_jar)
 			end
 		end
 	end

data/lib/queueit_knownuserv3/user_in_queue_service.rb

@@ -3,7 +3,7 @@ require 'cgi'
 
 module QueueIt
 	class UserInQueueService
-		SDK_VERSION = "3.2.3"
+		SDK_VERSION = "3.3.0"
     
 		def initialize(userInQueueStateRepository)
 			@userInQueueStateRepository = userInQueueStateRepository
@@ -82,7 +82,7 @@ module QueueIt
 			if (!domainAlias.end_with?("/") )
 				domainAlias = domainAlias + "/"
 			end
-			redirectUrl = "https://" + domainAlias + "error/" + errorCode + "?"  + query
+			redirectUrl = "https://" + domainAlias + "error/" + errorCode + "/?"  + query
 			return RequestValidationResult.new(ActionTypes::QUEUE, config.eventId, nil, redirectUrl)        
 		end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: queueit_knownuserv3
 version: !ruby/object:Gem::Version
-  version: 3.2.3
+  version: 3.3.0
 platform: ruby
 authors:
 - Queue-it
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-10-02 00:00:00.000000000 Z
+date: 2017-10-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler