From a2a0048d7eb69162602540b55e6553878aa666c4 Mon Sep 17 00:00:00 2001
From: Vladimir Fedoseev <vl.fedoseev@gmail.com>
Date: Thu, 26 Nov 2020 08:21:55 +0100
Subject: [PATCH] FID-251: Update Reconciliation RTD Provider to 2.1

---
 .../reconciliationRtdProvider_example.html    |  5 +-
 modules/reconciliationRtdProvider.js          | 27 +-------
 .../modules/reconciliationRtdProvider_spec.js | 66 ++++++++-----------
 3 files changed, 34 insertions(+), 64 deletions(-)

diff --git a/integrationExamples/gpt/reconciliationRtdProvider_example.html b/integrationExamples/gpt/reconciliationRtdProvider_example.html
index af414e0b055..4f9b663c22d 100644
--- a/integrationExamples/gpt/reconciliationRtdProvider_example.html
+++ b/integrationExamples/gpt/reconciliationRtdProvider_example.html
@@ -82,8 +82,9 @@
 
     <script>
       googletag.cmd.push(function () {
-        googletag.defineSlot('/21834411153/rsdk-2', [[300, 250], [728, 90]], 'div-gpt-ad-rsdk-1').addService(googletag.pubads());
-
+        googletag.defineSlot('/21834411153/rsdk-2', [[300, 250], [728, 90]], 'div-gpt-ad-rsdk-1')
+          .addService(googletag.pubads())
+          .setTargeting('RSDK_VER', '2.1');
         googletag.pubads().enableSingleRequest();
         googletag.enableServices();
       });
diff --git a/modules/reconciliationRtdProvider.js b/modules/reconciliationRtdProvider.js
index 20acb6a535a..bd3d8861c5b 100644
--- a/modules/reconciliationRtdProvider.js
+++ b/modules/reconciliationRtdProvider.js
@@ -29,7 +29,7 @@ const MessageType = {
 /** @type {ModuleParams} */
 const DEFAULT_PARAMS = {
   initUrl: 'https://confirm.fiduciadlt.com/init',
-  impressionUrl: 'https://confirm.fiduciadlt.com/imp',
+  impressionUrl: 'https://confirm.fiduciadlt.com/pimp',
   allowAccess: false,
 };
 /** @type {ModuleParams} */
@@ -78,7 +78,7 @@ function handleAdMessage(e) {
       adDeliveryId,
     });
 
-    track.trackGet(_moduleParams.impressionUrl, args);
+    track.trackPost(_moduleParams.impressionUrl, args);
 
     // Send response back to the Advertiser tag
     let response = {
@@ -186,26 +186,6 @@ export function getSlotByWin(win) {
   );
 }
 
-/**
- * serialize object and return query params string
- * @param {Object} data
- * @return {string}
- */
-export function stringify(query) {
-  const parts = [];
-
-  for (let key in query) {
-    if (query.hasOwnProperty(key)) {
-      let val = query[key];
-      if (typeof query[key] !== 'object') {
-        parts.push(`${key}=${encodeURIComponent(val)}`);
-      } else {
-        parts.push(`${key}=${encodeURIComponent(stringify(val))}`);
-      }
-    }
-  }
-  return parts.join('&');
-}
 /**
  * Init Reconciliation post messages listeners to handle
  * impressions messages from ad creative
@@ -236,9 +216,6 @@ function trackInit(adUnits) {
  * @param {Object} data
  */
 export const track = {
-  trackGet(url, data) {
-    utils.triggerPixel(`${url}?${stringify(data)}`);
-  },
   trackPost(url, data) {
     const ajax = ajaxBuilder();
 
diff --git a/test/spec/modules/reconciliationRtdProvider_spec.js b/test/spec/modules/reconciliationRtdProvider_spec.js
index 8adca28248c..6efe55ddf46 100644
--- a/test/spec/modules/reconciliationRtdProvider_spec.js
+++ b/test/spec/modules/reconciliationRtdProvider_spec.js
@@ -1,7 +1,6 @@
 import {
   reconciliationSubmodule,
   track,
-  stringify,
   getTopIFrameWin,
   getSlotByWin
 } from 'modules/reconciliationRtdProvider.js';
@@ -18,16 +17,14 @@ describe('Reconciliation Real time data submodule', function () {
     }]
   };
 
-  let trackPostStub, trackGetStub;
+  let trackPostStub;
 
   beforeEach(function () {
     trackPostStub = sinon.stub(track, 'trackPost');
-    trackGetStub = sinon.stub(track, 'trackGet');
   });
 
   afterEach(function () {
     trackPostStub.restore();
-    trackGetStub.restore();
   });
 
   describe('reconciliationSubmodule', function () {
@@ -93,30 +90,6 @@ describe('Reconciliation Real time data submodule', function () {
       });
     });
 
-    describe('stringify parameters', function () {
-      it('should return query for flat object', function () {
-        const parameters = {
-          adUnitId: '/adunit',
-          adDeliveryId: '12345'
-        };
-
-        expect(stringify(parameters)).to.eql('adUnitId=%2Fadunit&adDeliveryId=12345');
-      });
-
-      it('should return query with nested parameters', function () {
-        const parameters = {
-          adUnitId: '/adunit',
-          adDeliveryId: '12345',
-          ext: {
-            adSize: '300x250',
-            adType: 'banner'
-          }
-        };
-
-        expect(stringify(parameters)).to.eql('adUnitId=%2Fadunit&adDeliveryId=12345&ext=adSize%3D300x250%26adType%3Dbanner');
-      });
-    });
-
     describe('get topmost iframe', function () {
       /**
        * - top
@@ -206,21 +179,40 @@ describe('Reconciliation Real time data submodule', function () {
           window.parent.postMessage(JSON.stringify({
             type: 'rsdk:impression:req',
             args: {
-              sourceMemberId: 'test_member_id',
-              sourceImpressionId: '123'
+              tagOwnerMemberId: "test_member_id",
+              dataSources: [
+                {
+                  memberId: "member_test",
+                  dataFeedName: "12345",
+                  impressionId: "54321",
+                  impressionIdDataField: "imp_id",
+                  allowedRecipientTypes: 41
+                }
+              ],
+              dataRecipients: [
+                {
+                  type: 1,
+                  memberId: "test_publisher_recipient"
+                },
+                {
+                  type: 16,
+                  memberId: "test_agency_recipient"
+                }
+              ]
             }
           }), '*');
         </script>`);
         adSlotIframe.contentDocument.close();
 
         setTimeout(() => {
-          expect(trackGetStub.calledOnce).to.be.true;
-          expect(trackGetStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/imp');
-          expect(trackGetStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
-          expect(trackGetStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
-          expect(trackGetStub.getCalls()[0].args[1].sourceMemberId).to.eql('test_member_id'); ;
-          expect(trackGetStub.getCalls()[0].args[1].sourceImpressionId).to.eql('123'); ;
-          expect(trackGetStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
+          expect(trackPostStub.calledOnce).to.be.true;
+          expect(trackPostStub.getCalls()[0].args[0]).to.eql('https://confirm.fiduciadlt.com/pimp');
+          expect(trackPostStub.getCalls()[0].args[1].adUnitId).to.eql('/reconciliationAdunit');
+          expect(trackPostStub.getCalls()[0].args[1].adDeliveryId).to.eql('12345');
+          expect(trackPostStub.getCalls()[0].args[1].tagOwnerMemberId).to.eql('test_member_id'); ;
+          expect(trackPostStub.getCalls()[0].args[1].dataSources.length).to.eql(1);
+          expect(trackPostStub.getCalls()[0].args[1].dataRecipients.length).to.eql(2);
+          expect(trackPostStub.getCalls()[0].args[1].publisherMemberId).to.eql('test_prebid_publisher');
           done();
         }, 100);
       });