From cdf352a93b77f43cbfc1f955e59bc317ba3ae799 Mon Sep 17 00:00:00 2001
From: Jaimin Panchal <jaiminpanchal27@gmail.com>
Date: Fri, 21 Sep 2018 12:56:48 -0400
Subject: [PATCH] send url as it is (#3116)

---
 modules/appnexusBidAdapter.js                |  4 ++--
 src/refererDetection.js                      | 16 ++++++----------
 test/spec/modules/appnexusBidAdapter_spec.js | 10 +++++-----
 test/spec/refererDetection_spec.js           | 14 +++++++-------
 4 files changed, 20 insertions(+), 24 deletions(-)

diff --git a/modules/appnexusBidAdapter.js b/modules/appnexusBidAdapter.js
index 1bffb80975f..aaec207dc1e 100644
--- a/modules/appnexusBidAdapter.js
+++ b/modules/appnexusBidAdapter.js
@@ -109,10 +109,10 @@ export const spec = {
 
     if (bidderRequest && bidderRequest.refererInfo) {
       let refererinfo = {
-        rd_ref: bidderRequest.refererInfo.referer,
+        rd_ref: encodeURIComponent(bidderRequest.refererInfo.referer),
         rd_top: bidderRequest.refererInfo.reachedTop,
         rd_ifs: bidderRequest.refererInfo.numIframes,
-        rd_stk: bidderRequest.refererInfo.stack.join(',')
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
       }
       payload.referrer_detection = refererinfo;
     }
diff --git a/src/refererDetection.js b/src/refererDetection.js
index 6292b65f92a..bf2ef5209f6 100644
--- a/src/refererDetection.js
+++ b/src/refererDetection.js
@@ -27,7 +27,6 @@ export function detectReferer(win) {
   function getPubUrlStack(levels) {
     let stack = [];
     let defUrl = null;
-    let encodedUrl = null;
     let frameLocation = null;
     let prevFrame = null;
     let prevRef = null;
@@ -43,10 +42,9 @@ export function detectReferer(win) {
       }
 
       if (frameLocation) {
-        encodedUrl = encodeURIComponent(frameLocation);
-        stack.push(encodedUrl);
+        stack.push(frameLocation);
         if (!detectedRefererUrl) {
-          detectedRefererUrl = encodedUrl;
+          detectedRefererUrl = frameLocation;
         }
       } else if (i !== 0) {
         prevFrame = levels[i - 1];
@@ -58,16 +56,14 @@ export function detectReferer(win) {
         }
 
         if (prevRef) {
-          encodedUrl = encodeURIComponent(prevRef);
-          stack.push(encodedUrl);
+          stack.push(prevRef);
           if (!detectedRefererUrl) {
-            detectedRefererUrl = encodedUrl;
+            detectedRefererUrl = prevRef;
           }
         } else if (ancestor) {
-          encodedUrl = encodeURIComponent(ancestor);
-          stack.push(encodedUrl);
+          stack.push(ancestor);
           if (!detectedRefererUrl) {
-            detectedRefererUrl = encodedUrl;
+            detectedRefererUrl = ancestor;
           }
         } else {
           stack.push(defUrl);
diff --git a/test/spec/modules/appnexusBidAdapter_spec.js b/test/spec/modules/appnexusBidAdapter_spec.js
index 66568781a84..9be87ac8628 100644
--- a/test/spec/modules/appnexusBidAdapter_spec.js
+++ b/test/spec/modules/appnexusBidAdapter_spec.js
@@ -375,13 +375,13 @@ describe('AppNexusAdapter', function () {
       const bidRequest = Object.assign({}, bidRequests[0])
       const bidderRequest = {
         refererInfo: {
-          referer: 'http%3A%2F%2Fexample.com%2Fpage.html',
+          referer: 'http://example.com/page.html',
           reachedTop: true,
           numIframes: 2,
           stack: [
-            'http%3A%2F%2Fexample.com%2Fpage.html',
-            'http%3A%2F%2Fexample.com%2Fiframe1.html',
-            'http%3A%2F%2Fexample.com%2Fiframe2.html'
+            'http://example.com/page.html',
+            'http://example.com/iframe1.html',
+            'http://example.com/iframe2.html'
           ]
         }
       }
@@ -393,7 +393,7 @@ describe('AppNexusAdapter', function () {
         rd_ref: 'http%3A%2F%2Fexample.com%2Fpage.html',
         rd_top: true,
         rd_ifs: 2,
-        rd_stk: bidderRequest.refererInfo.stack.join(',')
+        rd_stk: bidderRequest.refererInfo.stack.map((url) => encodeURIComponent(url)).join(',')
       });
     });
   })
diff --git a/test/spec/refererDetection_spec.js b/test/spec/refererDetection_spec.js
index 95a2d096389..956ba794546 100644
--- a/test/spec/refererDetection_spec.js
+++ b/test/spec/refererDetection_spec.js
@@ -35,13 +35,13 @@ describe('referer detection', () => {
     const getRefererInfo = detectReferer(mockIframe2WinObject);
     let result = getRefererInfo();
     let expectedResult = {
-      referer: 'http%3A%2F%2Fexample.com%2Fpage.html',
+      referer: 'http://example.com/page.html',
       reachedTop: true,
       numIframes: 2,
       stack: [
-        'http%3A%2F%2Fexample.com%2Fpage.html',
-        'http%3A%2F%2Fexample.com%2Fiframe1.html',
-        'http%3A%2F%2Fexample.com%2Fiframe2.html'
+        'http://example.com/page.html',
+        'http://example.com/iframe1.html',
+        'http://example.com/iframe2.html'
       ]
     };
     expect(result).to.deep.equal(expectedResult);
@@ -66,13 +66,13 @@ describe('referer detection', () => {
     const getRefererInfo = detectReferer(mockIframe2WinObject);
     let result = getRefererInfo();
     let expectedResult = {
-      referer: 'http%3A%2F%2Faaa.com%2Fiframe1.html',
+      referer: 'http://aaa.com/iframe1.html',
       reachedTop: false,
       numIframes: 2,
       stack: [
         null,
-        'http%3A%2F%2Faaa.com%2Fiframe1.html',
-        'http%3A%2F%2Fbbb.com%2Fiframe2.html'
+        'http://aaa.com/iframe1.html',
+        'http://bbb.com/iframe2.html'
       ]
     };
     expect(result).to.deep.equal(expectedResult);