Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

OneVideo: Sync pixel redirect fix and Test cases #4741

Merged
merged 109 commits into from
Jan 16, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
109 commits
Select commit Hold shift + click to select a range
62516db
outstream changes
Jun 27, 2019
05e333a
removing global filtet
Jun 27, 2019
054b515
reverting page
Jun 27, 2019
94cbc2d
message
Jul 2, 2019
d49e922
adapter change
Jul 3, 2019
7a43143
remove space
Jul 3, 2019
bc859b3
testcases
Jul 3, 2019
0a8a86c
testpage
Jul 3, 2019
22e4ec9
spaces for test page
Jul 3, 2019
9637b48
renderer exist case
Jul 4, 2019
0e2d31b
reverting package-lock.json
Jul 9, 2019
88ac283
Merge branch 'master' of https://github.com/prebid/Prebid.js
Jul 11, 2019
d81769b
Merge branch 'master' of https://github.com/prebid/Prebid.js
Jul 24, 2019
2d48e1e
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 1, 2019
63a37e3
adding schain object
Aug 2, 2019
873a2c1
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 4, 2019
7e68c35
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 7, 2019
e8c40c3
adding tagid
Aug 7, 2019
af32e45
syntaxx error fix
Aug 7, 2019
4bb7c45
video.html
Aug 7, 2019
caf81ac
space trailing
Aug 7, 2019
514f68d
space
Aug 7, 2019
5dc1086
tagid
Aug 7, 2019
606eb96
inventoryId and placement
Aug 14, 2019
4cfb6f4
rewarded video
Sep 3, 2019
e03ff33
added unit test case
Sep 5, 2019
7075182
Remove pbs depracated legacy url (#4226)
sumit116 Sep 26, 2019
8c2b196
sync with master
Fawke Oct 1, 2019
06c6fbd
Revert "sync with master"
Fawke Oct 1, 2019
8855c1e
Merge branch 'master' into prebid-3.0
Fawke Oct 1, 2019
ec6661c
Merge branch 'master' into prebid-3.0
Fawke Oct 3, 2019
c2ebb7c
Merge branch 'master' into prebid-3.0
Fawke Oct 7, 2019
b87527a
Merge branch 'master' into prebid-3.0
Fawke Oct 8, 2019
09a6c4c
removed targeting set filter and moved where render status is set to …
Oct 8, 2019
f80be1d
Merge branch 'master' into prebid-3.0
Fawke Oct 9, 2019
2f05669
Merge branch 'prebid-3.0' of https://github.com/prebid/Prebid.js into…
Fawke Oct 9, 2019
6c69f76
Merge branch 'master' into prebid-3.0
Fawke Oct 11, 2019
01c8037
Merge branch 'master' into prebid-3.0
Fawke Oct 14, 2019
9c7a0df
Merge branch 'master' into prebid-3.0
Fawke Oct 15, 2019
aeaef03
Merge branch 'master' into prebid-3.0
Fawke Oct 16, 2019
3b42f4f
Merge branch 'master' into prebid-3.0
Fawke Oct 17, 2019
52f1047
Depracate adloader loadscript fn (#4228)
sumit116 Oct 22, 2019
cf03c36
merge with master
Fawke Oct 22, 2019
9f181dd
Merge branch 'prebid-3.0' of https://github.com/prebid/Prebid.js into…
Fawke Oct 22, 2019
2331851
Merge branch 'master' into prebid-3.0
Fawke Oct 23, 2019
01ac0a1
Merge branch 'master' into prebid-3.0
Fawke Oct 29, 2019
8b07cb0
merged with master
Fawke Oct 30, 2019
44eae64
Merge branch 'master' into prebid-3.0
Fawke Oct 31, 2019
c08b55c
Merge branch 'master' into prebid-3.0
Fawke Nov 4, 2019
2fb1e14
getHighestCpmBids only returns non-rendered bids (#4247)
Fawke Nov 5, 2019
445746c
Merge branch 'master' into prebid-3.0
Fawke Nov 5, 2019
3e3833f
Merge branch 'master' into prebid-3.0
Fawke Nov 6, 2019
e2ddbcb
Merge branch 'master' into prebid-3.0
Fawke Nov 7, 2019
3d99998
Merge branch 'master' into prebid-3.0
Fawke Nov 8, 2019
46e635b
Merge branch 'master' into prebid-3.0
Fawke Nov 11, 2019
8d371cc
Merge branch 'master' into prebid-3.0
Fawke Nov 12, 2019
52f6513
Merge branch 'master' into prebid-3.0
Fawke Nov 13, 2019
f5f11a8
Merge branch 'master' into prebid-3.0
Fawke Nov 14, 2019
a17b3d3
merge
Nov 14, 2019
ac2aa68
Merge branch 'master' into prebid-3.0
Fawke Nov 15, 2019
98ed940
Merge branch 'master' into prebid-3.0
Fawke Nov 18, 2019
d17a906
Merge branch 'master' into prebid-3.0
Fawke Nov 19, 2019
df5a733
Merge branch 'master' into prebid-3.0
Fawke Nov 20, 2019
2a3d06d
Merge branch 'master' into prebid-3.0
Fawke Nov 21, 2019
efae937
Merge branch 'master' into prebid-3.0
Fawke Nov 22, 2019
8a0512f
Merge branch 'master' into prebid-3.0
Fawke Nov 25, 2019
1417c94
Merge branch 'master' into prebid-3.0
Fawke Nov 26, 2019
3164cfa
Make all adapters https (#4294)
sumit116 Nov 26, 2019
55ec532
Merge branch 'master' into prebid-3.0
Fawke Nov 27, 2019
82f2963
Merge branch 'master' into prebid-3.0
Fawke Nov 28, 2019
549f273
Merge branch 'master' into prebid-3.0
Fawke Nov 29, 2019
31bd686
Merge branch 'master' of https://github.com/prebid/Prebid.js
Dec 2, 2019
9765332
Removed pub common and unified id submodules as defaults in user id m…
coryhammon1 Dec 2, 2019
dfdde06
Merge branch 'master' into prebid-3.0
Fawke Dec 3, 2019
f561c71
Deprecate user sync (#4241)
Fawke Dec 3, 2019
dc586d1
sync with master
Fawke Dec 4, 2019
843258f
sync with master
Fawke Dec 6, 2019
6729336
deprecate support for adUnit.sizes for pubs (#4458)
jsnellbaker Dec 6, 2019
266302c
Merge branch 'master' into prebid-3.0
Fawke Dec 9, 2019
4f09223
Merge branch 'prebid-3.0' of https://github.com/prebid/Prebid.js into…
Fawke Dec 9, 2019
157b009
ccpa cahnges
Dec 9, 2019
2294643
ccpa change
Dec 9, 2019
baaf4e0
test page
Dec 9, 2019
8d62da3
test page change
Dec 9, 2019
9548ac5
test page change 2
Dec 9, 2019
97ad9d0
change the variable
Dec 9, 2019
a7034d1
Merge branch 'master' into prebid-3.0
Fawke Dec 10, 2019
ca23f38
sync with master
Fawke Dec 11, 2019
3bb263b
Deprecations utils.js (#4249)
Fawke Dec 11, 2019
2762cb7
remove min field from priceGranularity feature (#4574)
jsnellbaker Dec 11, 2019
48cf003
merge branch master and resolve conflicts
jsnellbaker Dec 11, 2019
30fd314
ccpa support for v3.0
Jan 7, 2020
dbf3eda
Merge branch 'prebid-3.0' into CCPA_3.0-support
DeepthiNeeladri Jan 7, 2020
287b695
Update oneVideoBidAdapter_spec.js
DeepthiNeeladri Jan 7, 2020
22f1a8e
Update oneVideoBidAdapter.js
DeepthiNeeladri Jan 7, 2020
4221391
sync pixel chnge
Jan 11, 2020
1b9e421
msater
Jan 11, 2020
7bef75d
fix
Jan 11, 2020
28a341a
sync
Jan 11, 2020
90c96b9
fix
Jan 12, 2020
0660a71
sync
Jan 12, 2020
e8f733d
sync
Jan 12, 2020
a17205b
adding gdpr
Jan 15, 2020
fcfa5a8
test cases
Jan 15, 2020
958f638
Merge remote-tracking branch 'upstream/master' into SyncPixel_Change_…
Jan 15, 2020
be87f1b
test cases
Jan 16, 2020
b569c4c
Merge branch 'master' into SyncPixel_Change_OnevideoAdaptor
DeepthiNeeladri Jan 16, 2020
e72e582
test case
Jan 16, 2020
cebbc7d
Merge branch 'SyncPixel_Change_OnevideoAdaptor' of https://github.com…
Jan 16, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion modules/oneVideoBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -104,6 +104,7 @@ export const spec = {
*/
getUserSyncs: function(syncOptions, responses, consentData) {
let { gdprApplies, consentString = '' } = consentData;

if (syncOptions.pixelEnabled) {
return [{
type: 'image',
Expand All @@ -115,7 +116,7 @@ export const spec = {
},
{
type: 'image',
url: `https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr_qparam=${gdprApplies ? 1 : 0}&gdpr_consent_qparam=${consentString}&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0%26gdpr%3D{gdpr}%26gdpr_consent%3D{gdpr_consent}`
url: `https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0` + encodeURI(`&gdpr=${gdprApplies ? 1 : 0}&gdpr_consent=${consentString}`)
},
{
type: 'image',
Expand Down
2 changes: 1 addition & 1 deletion test/spec/modules/oneVideoBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -408,7 +408,7 @@ describe('OneVideoBidAdapter', function () {
it('should get correct user sync when iframeEnabled', function () {
let pixel = spec.getUserSyncs({pixelEnabled: true}, {}, {gdprApplies: true, consentString: GDPR_CONSENT_STRING})
expect(pixel[2].type).to.equal('image');
expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr_qparam=1&gdpr_consent_qparam=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0%26gdpr%3D{gdpr}%26gdpr_consent%3D{gdpr_consent}');
expect(pixel[2].url).to.equal('https://sync-tm.everesttech.net/upi/pid/m7y5t93k?gdpr=1&gdpr_consent=' + GDPR_CONSENT_STRING + '&redir=https%3A%2F%2Fpixel.advertising.com%2Fups%2F55986%2Fsync%3Fuid%3D%24%7BUSER_ID%7D%26_origin%3D0&gdpr=1&gdpr_consent=' + encodeURI(GDPR_CONSENT_STRING));
});
});
});
Expand Down