Bugfix - Getting target url from UrlProvider

queueit · Jan 18, 2016 · 73dc342 · 73dc342
1 parent d0c0bc0
commit 73dc342
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 14 deletions.
diff --git a/QueueIT.Security/src/queueit/security/KnownUserFactory.java b/QueueIT.Security/src/queueit/security/KnownUserFactory.java
@@ -65,6 +65,15 @@ public static void configure(
             defaultQuerystringPrefix = querystringPrefix;
         }       
     }
+
+    static IKnownUserUrlProvider getKnownUserUrlProvider()
+    {
+        try {
+            return defaultUrlProviderFactory.call();
+        } catch (Exception ex) {
+            throw new InvalidKnownUserUrlException();
+        }
+    }
 
     public static IKnownUser verifyMd5Hash() 
         throws InvalidKnownUserUrlException, InvalidKnownUserHashException {

diff --git a/QueueIT.Security/src/queueit/security/Queue.java b/QueueIT.Security/src/queueit/security/Queue.java
@@ -323,25 +323,13 @@ private UriComponentsBuilder getQueueUrlWithoutTarget(Boolean sslEnabled, String
 
     private void includeTargetUrl(Boolean includeTargetUrl, UriComponentsBuilder queueUrl)
     {
-        HttpServletRequest request = RequestContext.getCurrentInstance().getRequest();
-        if (request == null) {
-            return;
-        }
-
         if (includeTargetUrl == null)
             includeTargetUrl = this.defaultIncludeTargetUrl;
 
         if (!includeTargetUrl)
             return;
-
-        StringBuffer requestURL = request.getRequestURL();
-        String queryString = request.getQueryString();
-
-        if (queryString != null) {
-            requestURL.append('?').append(queryString);
-        }
-
-        includeTargetUrl(requestURL.toString().toString(), queueUrl);
+
+        includeTargetUrl(KnownUserFactory.getKnownUserUrlProvider().getUrl(), queueUrl);
     }
 
     private static void includeTargetUrl(String targetUrl, UriComponentsBuilder queueUrl)