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

ColossusSSP Bid Adapter : replace gpid for pbadslot #11701

Merged
merged 103 commits into from
Jun 5, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
103 commits
Select commit Hold shift + click to select a range
b87237c
add video&native traffic colossus ssp
vladis-teqblaze Mar 26, 2018
1ca4e28
Native obj validation
vladis-teqblaze Apr 10, 2018
b5c1850
Native obj validation #2
vladis-teqblaze Apr 22, 2018
e969f27
Added size field in requests
vladis-teqblaze Apr 22, 2018
67693e1
fixed test
vladis-teqblaze Apr 22, 2018
e7ab418
fix merge conflicts
Nov 18, 2019
3320c68
fix merge conflicts
Nov 18, 2019
44e59b8
move to 3.0
Nov 18, 2019
7133a72
move to 3.0
Nov 18, 2019
3dba3ac
fix IE11 new URL issue
Nov 18, 2019
7f14e4d
fix IE11 new URL issue
Nov 18, 2019
78609ff
fix IE11 new URL issue
Nov 18, 2019
4c5d711
https for 3.0
Nov 20, 2019
1027b54
add https test
Nov 21, 2019
684639c
add ccp and schain features
Dec 5, 2019
1c6681c
fix test
Dec 5, 2019
436ff0f
sync with upstream, fix conflicts
Dec 5, 2019
2f9efee
sync with upstream, fix conflicts
Dec 5, 2019
c40dbe3
Update colossussspBidAdapter.js
Dec 9, 2019
7d2e9f3
Update colossussspBidAdapter.js
Dec 10, 2019
8055e57
Merge branch 'master' of https://github.com/prebid/Prebid.js
Feb 28, 2020
53bb18e
identity extensions
Feb 28, 2020
51faedc
identity extensions
Feb 28, 2020
6cee3e7
fix
Mar 6, 2020
461e4ff
fix
Mar 6, 2020
e78a9dc
fix
Mar 6, 2020
1547d0a
fix
Mar 6, 2020
803be44
fix
Mar 6, 2020
47a78af
add tests for user ids
Mar 10, 2020
9ff6f10
fix
Mar 10, 2020
b02455a
fix
Mar 10, 2020
a4b93a1
fix
Mar 10, 2020
1e74169
fix
Mar 10, 2020
74a42cd
fix
Mar 10, 2020
d65984e
fix
Mar 10, 2020
1595a00
fix
Mar 10, 2020
42c5e53
add gdpr support
Mar 10, 2020
480f127
add gdpr support
Mar 10, 2020
5d9299c
Merge branch 'master' of https://github.com/prebid/Prebid.js
Mar 30, 2020
3a4c32c
Merge remote-tracking branch 'upstream/master'
Apr 14, 2020
a51a3e1
id5id support
Apr 16, 2020
562a1e5
Update colossussspBidAdapter.js
Jan 15, 2021
3a99998
Update colossussspBidAdapter.js
Jan 15, 2021
ffdefbd
Merge branch 'master' into master
Jan 15, 2021
0cb39f1
Update colossussspBidAdapter.js
Jan 15, 2021
38182c0
Update colossussspBidAdapter.js
Jan 15, 2021
d2b3331
Update colossussspBidAdapter.js
Jan 15, 2021
6e2a64b
Update colossussspBidAdapter_spec.js
Jan 15, 2021
32c71f2
Merge remote-tracking branch 'upstream/master'
Jan 20, 2021
f0c5c24
use floor module
Jan 20, 2021
586367d
Revert "use floor module"
Jan 20, 2021
4fa75dd
use floor module
Jan 20, 2021
4e16010
update to 5v
Aug 2, 2021
3f62aa0
fix conflicts
Aug 2, 2021
d8e9722
fix
Aug 2, 2021
00dd7a4
add uid2 and bidFloor support
Aug 29, 2021
bb93f94
fix
Aug 29, 2021
be17cfe
fix conflicts
Aug 29, 2021
58b1381
Merge remote-tracking branch 'prebid/master'
Sep 23, 2021
a30eff4
add pbadslot support
Sep 23, 2021
97f9e69
fix conflicts
Nov 25, 2021
3459b8d
fix conflicts
Nov 25, 2021
5597d45
add onBidWon
Nov 25, 2021
afdc2db
refactor
Nov 25, 2021
df5163b
add test for onBidWon()
Dec 1, 2021
7aa74cb
fix
Dec 1, 2021
b039e90
add group_id
Jan 5, 2022
d57e129
Trigger circleci
Jan 6, 2022
e63a8e3
fix
Jan 10, 2022
aae3d00
Merge remote-tracking branch 'prebid/master'
Feb 10, 2022
93e9965
update user sync
Feb 11, 2022
1bbfe4d
Merge remote-tracking branch 'prebid/master'
Mar 30, 2022
1aa001d
fix window.location
Mar 30, 2022
ef3fde7
fix test
Mar 30, 2022
c3a5f04
updates
Apr 8, 2022
a5ce301
fix conflict
Apr 8, 2022
06d1707
fix conflict
Apr 8, 2022
9640dcc
fix
Apr 8, 2022
310f4c8
updates
Apr 20, 2022
a85ae83
fix conflicts
Jul 4, 2022
1634c2f
Merge remote-tracking branch 'prebid/master'
Jul 21, 2022
8ad6b98
remove traffic param
Jul 21, 2022
7885e6a
Merge remote-tracking branch 'prebid/master'
Sep 29, 2022
932c7a2
add transactionId to request data for colossusssp adapter
Sep 30, 2022
8e84f53
Send tid in placements array
Sep 30, 2022
12091e4
Merge remote-tracking branch 'prebid/master'
Dec 8, 2022
c1a2e00
update user sync
Dec 8, 2022
1cfcc9d
updated tests
Dec 8, 2022
4af0892
remove changes package-lock file
Dec 8, 2022
2d48733
fix
Dec 8, 2022
9d261b1
Merge remote-tracking branch 'prebid/master'
Dec 13, 2022
17f00a5
add First Party Data
Dec 14, 2022
fd2bbb9
Merge remote-tracking branch 'prebid/master'
Jun 13, 2023
d758d1d
gpp support
Jun 13, 2023
dcd3c43
accepting eids from request
bhasker-gyt Feb 28, 2024
ec42d23
fixing lint errors
bhasker-gyt Feb 29, 2024
151cbd0
resolving a conflict
bhasker-gyt Mar 4, 2024
dfaed09
fixing a failed test case related to tid
bhasker-gyt Mar 4, 2024
7bffa6c
fixing karma version for conflict resolution
bhasker-gyt Mar 4, 2024
99ce27b
reverting package json files to original version
bhasker-gyt Mar 5, 2024
4acfb10
Merge branch 'master' into master
bhasker-ddh Mar 5, 2024
8813788
switching placement to plcmt
bhasker-gyt Jun 3, 2024
d64a3e0
replacing gpid for pbadslot
bhasker-gyt Jun 5, 2024
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
6 changes: 3 additions & 3 deletions modules/colossussspBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -140,14 +140,14 @@ export const spec = {
groupId: bid.params.group_id,
bidId: bid.bidId,
tid: bid.ortb2Imp?.ext?.tid,
eids: [],
eids: bid.userIdAsEids || [],
floor: {}
};

if (bid.schain) {
placement.schain = bid.schain;
}
let gpid = deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
let gpid = deepAccess(bid, 'ortb2Imp.ext.gpid') || deepAccess(bid, 'ortb2Imp.ext.data.pbadslot');
if (gpid) {
placement.gpid = gpid;
}
Expand All @@ -173,7 +173,7 @@ export const spec = {
placement.mimes = mediaTypes[VIDEO].mimes;
placement.protocols = mediaTypes[VIDEO].protocols;
placement.startdelay = mediaTypes[VIDEO].startdelay;
placement.placement = mediaTypes[VIDEO].placement;
placement.placement = mediaTypes[VIDEO].plcmt;
placement.skip = mediaTypes[VIDEO].skip;
placement.skipafter = mediaTypes[VIDEO].skipafter;
placement.minbitrate = mediaTypes[VIDEO].minbitrate;
Expand Down
51 changes: 42 additions & 9 deletions test/spec/modules/colossussspBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -255,13 +255,46 @@ describe('ColossussspAdapter', function () {
});

describe('buildRequests with user ids', function () {
bid.userId = {}
bid.userId.britepoolid = 'britepoolid123';
bid.userId.idl_env = 'idl_env123';
bid.userId.tdid = 'tdid123';
bid.userId.id5id = { uid: 'id5id123' };
bid.userId.uid2 = { id: 'uid2id123' };
let serverRequest = spec.buildRequests([bid], bidderRequest);
var clonedBid = JSON.parse(JSON.stringify(bid));
clonedBid.userId = {}
clonedBid.userId.britepoolid = 'britepoolid123';
clonedBid.userId.idl_env = 'idl_env123';
clonedBid.userId.tdid = 'tdid123';
clonedBid.userId.id5id = { uid: 'id5id123' };
clonedBid.userId.uid2 = { id: 'uid2id123' };
clonedBid.userIdAsEids = [
{
'source': 'pubcid.org',
'uids': [
{
'id': '4679e98e-1d83-4718-8aba-aa88hhhaaa',
'atype': 1
}
]
},
{
'source': 'adserver.org',
'uids': [
{
'id': 'e804908e-57b4-4f46-a097-08be44321e79',
'atype': 1,
'ext': {
'rtiPartner': 'TDID'
}
}
]
},
{
'source': 'neustar.biz',
'uids': [
{
'id': 'E1:Bvss1x8hXM2zHeqiqj2umJUziavSvLT6E_ORri5fDCsZb-5sfD18oNWycTmdx6QBNdbURBVv466hLJiKSwHCaTxvROo8smjqj6GfvlKfzQI',
'atype': 1
}
]
}
];
let serverRequest = spec.buildRequests([clonedBid], bidderRequest);
it('Returns valid data if array of bids is valid', function () {
let data = serverRequest.data;
let placements = data['placements'];
Expand All @@ -270,11 +303,11 @@ describe('ColossussspAdapter', function () {
let placement = placements[i];
expect(placement).to.have.property('eids')
expect(placement.eids).to.be.an('array')
expect(placement.eids.length).to.be.equal(5)
expect(placement.eids.length).to.be.equal(8)
for (let index in placement.eids) {
let v = placement.eids[index];
expect(v).to.have.all.keys('source', 'uids')
expect(v.source).to.be.oneOf(['britepool.com', 'identityLink', 'adserver.org', 'id5-sync.com', 'uidapi.com'])
expect(v.source).to.be.oneOf(['pubcid.org', 'adserver.org', 'neustar.biz', 'britepool.com', 'identityLink', 'id5-sync.com', 'adserver.org', 'uidapi.com'])
expect(v.uids).to.be.an('array');
expect(v.uids.length).to.be.equal(1)
expect(v.uids[0]).to.have.property('id')
Expand Down