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.

Sign up for GitHub

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

[TripleLift] - Allow usersync redirect #1086

Merged
merged 91 commits into from
Oct 30, 2019
Merged

[TripleLift] - Allow usersync redirect #1086

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
91 commits
Select commit Hold shift + click to select a range
d2b2e19
ignore swp files
Kevin-P-Kerr Jun 13, 2019
d210145
start small
Kevin-P-Kerr Jun 13, 2019
3acedbe
start really small
Kevin-P-Kerr Jun 13, 2019
04a6137
add a user sync
Kevin-P-Kerr Jun 13, 2019
5babcb1
justify
Kevin-P-Kerr Jun 13, 2019
a55a9c1
triplelift adapter
Kevin-P-Kerr Jun 13, 2019
3c4ccbc
add our endpoint
Kevin-P-Kerr Jun 13, 2019
44f921b
fix syntax
Kevin-P-Kerr Jun 13, 2019
f9d30c4
config stuff
Kevin-P-Kerr Jun 13, 2019
9f299fe
compiler fixes
Kevin-P-Kerr Jun 13, 2019
bc3b636
more config
Kevin-P-Kerr Jun 14, 2019
408c011
add params
Kevin-P-Kerr Jun 14, 2019
e7cb43d
making progress
Kevin-P-Kerr Jun 14, 2019
cf6bbe8
make our ext more exty
Kevin-P-Kerr Jun 14, 2019
61f72b3
start making responses
Kevin-P-Kerr Jun 14, 2019
d9b8c59
more logic
Kevin-P-Kerr Jun 15, 2019
c6e5f55
fix compilation errors
Kevin-P-Kerr Jun 15, 2019
a57cfde
can we just nil this out?
Kevin-P-Kerr Jun 15, 2019
1707d8a
augment our json
Kevin-P-Kerr Jun 17, 2019
6d3a72e
radically simplify our json
Kevin-P-Kerr Jun 17, 2019
e1efc38
fix errs
Kevin-P-Kerr Jun 17, 2019
0a25607
infer the bid type
Kevin-P-Kerr Jun 17, 2019
856f3ab
fix syntax
Kevin-P-Kerr Jun 17, 2019
c46c510
fix comilation errors
Kevin-P-Kerr Jun 17, 2019
f49c552
rename
Kevin-P-Kerr Jun 17, 2019
7bd8bb0
fix compilation error
Kevin-P-Kerr Jun 17, 2019
2a6c2be
config stuff
Kevin-P-Kerr Jun 17, 2019
dae5782
simplify params
Kevin-P-Kerr Jun 17, 2019
b1aa20d
more config stuff
Kevin-P-Kerr Jun 17, 2019
796ab7a
fixes
Kevin-P-Kerr Jun 17, 2019
d2d8a8a
revert this
Kevin-P-Kerr Jun 17, 2019
02f1073
fix up the extension
Kevin-P-Kerr Jun 17, 2019
7d9df4d
getting closer
Kevin-P-Kerr Jun 17, 2019
a835c6c
add a test
Kevin-P-Kerr Jun 17, 2019
eabff67
update config
Kevin-P-Kerr Jun 18, 2019
645879d
update bidder params
Kevin-P-Kerr Jun 18, 2019
68abbf9
add the floor here, too
Kevin-P-Kerr Jun 18, 2019
3de38ec
add a usersync test
Kevin-P-Kerr Jun 18, 2019
248a2b8
validation, ws, and a test
Kevin-P-Kerr Jun 18, 2019
22acdce
update tests
Kevin-P-Kerr Jun 18, 2019
951dcf4
fix test
Kevin-P-Kerr Jun 18, 2019
9c75da6
update email
Kevin-P-Kerr Jun 18, 2019
3d8635a
why not
Kevin-P-Kerr Jun 18, 2019
1160d94
change email
Kevin-P-Kerr Jun 19, 2019
0b59aa4
preprocess requests
Kevin-P-Kerr Jun 26, 2019
d14a353
do some parsing
Kevin-P-Kerr Jun 26, 2019
67f241c
take care of some errors
Kevin-P-Kerr Jun 26, 2019
863a2c5
floor is optional
Kevin-P-Kerr Jun 26, 2019
0955972
ws
Kevin-P-Kerr Jul 2, 2019
7a1d044
remove native
Kevin-P-Kerr Jul 2, 2019
f763064
everything is either banner or video
Kevin-P-Kerr Jul 2, 2019
1e7b6ab
Merge pull request #1 from triplelift/triplelift-dev-work
Kevin-P-Kerr Jul 8, 2019
10b2a2d
Merge branch 'master' of github.com:prebid/prebid-server
Kevin-P-Kerr Jul 8, 2019
f6183ff
this should be a float
Kevin-P-Kerr Jul 10, 2019
8b2706b
floor to floor
Kevin-P-Kerr Jul 11, 2019
df5fbc8
fix compilation errors
Kevin-P-Kerr Jul 11, 2019
21d9526
add some tests
Kevin-P-Kerr Jul 11, 2019
edda36e
more tests
Kevin-P-Kerr Jul 11, 2019
d63b2fd
more tests
Kevin-P-Kerr Jul 11, 2019
121efee
simplify
Kevin-P-Kerr Jul 11, 2019
0212e67
more progress
Kevin-P-Kerr Jul 16, 2019
04063ae
format
Kevin-P-Kerr Jul 16, 2019
3a35776
ws
Kevin-P-Kerr Jul 16, 2019
4d47460
rm
Kevin-P-Kerr Jul 16, 2019
b1219c3
don't need this
Kevin-P-Kerr Jul 16, 2019
da4664b
fix test
Kevin-P-Kerr Jul 16, 2019
8d64ae3
fix test
Kevin-P-Kerr Jul 16, 2019
8a0a65b
Merge pull request #2 from triplelift/add-tests-tl
Kevin-P-Kerr Jul 16, 2019
6e5024f
don't ignore swap
Kevin-P-Kerr Jul 17, 2019
9256e07
Merge branch 'add-tests-tl'
Kevin-P-Kerr Jul 17, 2019
329cbc1
Merge remote-tracking branch 'origin/master' into HEAD
Kevin-P-Kerr Jul 17, 2019
88e4261
change line back
Kevin-P-Kerr Jul 23, 2019
7898b4e
report an error if there are no valid impressions for triplelift
Kevin-P-Kerr Jul 23, 2019
f83bdab
check for either a Banner or Video object on the impression
Kevin-P-Kerr Jul 23, 2019
45f6749
more tests
Kevin-P-Kerr Aug 2, 2019
7feeb75
mv
Kevin-P-Kerr Aug 2, 2019
f21041d
more tests
Kevin-P-Kerr Aug 2, 2019
92062e6
Merge remote-tracking branch 'origin/master'
Kevin-P-Kerr Sep 13, 2019
5acc222
update triplelift end point
Kevin-P-Kerr Oct 2, 2019
0c51b9f
add redirect to triplelift usersync
tgeeting Oct 21, 2019
b3b3d1a
fix supplier id in triplelift_test
tgeeting Oct 21, 2019
eb85d9d
update tl usersync endpoint and test
tgeeting Oct 21, 2019
aba433f
Merge pull request #4 from triplelift/TL-12297-triplelift-add-redirec…
tgeeting Oct 21, 2019
8863eeb
Update tl master from prebid master
tgeeting Oct 21, 2019
5834dc2
Merge pull request #6 from triplelift/sync-with-prebid
dangoldin Oct 22, 2019
92dc7ed
fix tl supplier id in test json
tgeeting Oct 23, 2019
a46b041
Merge pull request #7 from triplelift/fix-supplier-id-broken-tests
Kevin-P-Kerr Oct 24, 2019
6b4a634
update usersync test template
tgeeting Oct 25, 2019
0d79be5
Merge pull request #8 from triplelift/update-usersync-test-template
Kevin-P-Kerr Oct 25, 2019
0df5fca
adjust inconsistency with test and sync url
tgeeting Oct 29, 2019
a91d06f
Merge pull request #9 from triplelift/update-usersync-test-template
tgeeting Oct 29, 2019
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
2 changes: 1 addition & 1 deletion adapters/triplelift/triplelift_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,5 +6,5 @@ import (
)

func TestJsonSamples(t *testing.T) {
adapterstest.RunJSONBidderTest(t, "triplelifttest", NewTripleliftBidder(nil, "http://tlx.3lift.net/s2s/auction?supplier_id=19"))
adapterstest.RunJSONBidderTest(t, "triplelifttest", NewTripleliftBidder(nil, "http://tlx.3lift.net/s2s/auction?supplier_id=20"))
SyntaxNode marked this conversation as resolved.
Show resolved Hide resolved
}
8 changes: 4 additions & 4 deletions adapters/triplelift/triplelifttest/exemplary/optional-params.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"ext": {
"bidder": {
"inventoryCode": "foo",
"floor" : 20
"floor": 20
}
}
}
Expand All @@ -28,7 +28,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=19",
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=20",
"body": {
"id": "test-request-id",
"imp": [
Expand All @@ -51,7 +51,7 @@
"ext": {
"bidder": {
"inventoryCode": "foo",
"floor" : 20
"floor": 20
}
}
}
Expand All @@ -63,4 +63,4 @@
}
}
]
}
}
12 changes: 6 additions & 6 deletions adapters/triplelift/triplelifttest/exemplary/simple-banner.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
},
"ext": {
"bidder": {
"inventoryCode": "aa"
"inventoryCode": "aa"
}
}
}
Expand All @@ -27,7 +27,7 @@
"httpCalls": [
{
"expectedRequest": {
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=19",
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=20",
"body": {
"id": "test-request-id",
"imp": [
Expand All @@ -45,7 +45,7 @@
}
]
},
"tagid" : "aa",
"tagid": "aa",
"ext": {
"bidder": {
"inventoryCode": "aa"
Expand Down Expand Up @@ -79,7 +79,7 @@
"w": 300,
"ext": {
"triplelift_pb": {
"format" : 2
"format": 2
}
}
}
Expand Down Expand Up @@ -113,7 +113,7 @@
"h": 250,
"ext": {
"triplelift_pb": {
"format" : 2
"format": 2
}
}
},
Expand All @@ -122,4 +122,4 @@
]
}
]
}
}
256 changes: 143 additions & 113 deletions adapters/triplelift/triplelifttest/exemplary/simple-video.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,114 +1,144 @@
{
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"video": {
"mimes": ["video/mp4"],
"minduration": 15,
"maxduration": 30,
"protocols": [2, 3, 5, 6, 7, 8],
"w": 940,
"h": 560
},
"ext": {
"bidder": {
"inventoryCode" : "aaw",
"floor" : 0.10
}
}
}
]
},

"httpCalls": [
{
"expectedRequest": {
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=19",
"body": {
"id": "test-request-id",
"imp": [
{
"tagid" : "aaw",
"bidfloor" : 0.10,
"id": "test-imp-id",
"video": {
"mimes": ["video/mp4"],
"minduration": 15,
"maxduration": 30,
"protocols": [2, 3, 5, 6, 7, 8],
"w": 940,
"h": 560
},
"ext": {
"bidder": {
"inventoryCode": "aaw",
"floor" : 0.10
}
}
}
]
}
},
"mockResponse": {
"status": 200,
"body": {
"id": "test-request-id",
"seatbid": [
{
"seat": "958",
"bid": [{
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.500000,
"adid": "29681110",
"adm": "some-test-ad",
"adomain": ["foo.com"],
"iurl": "http://tlx.3lift.net/s2s/auction?supplier_id=19",
"cid": "958",
"crid": "29681110",
"h": 250,
"w": 300,
"cat": ["IAB9-1"],
"ext": {"triplelift_pb":{"format":11}}
}]
}
],
"bidid": "5778926625248726496",
"cur": "USD"
}
}
}
],

"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.5,
"adm": "some-test-ad",
"adid": "29681110",
"adomain": ["foo.com"],
"iurl": "http://tlx.3lift.net/s2s/auction?supplier_id=19",
"cid": "958",
"crid": "29681110",
"w": 300,
"h": 250,
"cat": ["IAB9-1"],
"ext": {
"triplelift_pb": {
"format": 11
}
}
},
"type": "video"
}
]
}
]
}
"mockBidRequest": {
"id": "test-request-id",
"imp": [
{
"id": "test-imp-id",
"video": {
"mimes": [
"video/mp4"
],
"minduration": 15,
"maxduration": 30,
"protocols": [
2,
3,
5,
6,
7,
8
],
"w": 940,
"h": 560
},
"ext": {
"bidder": {
"inventoryCode": "aaw",
"floor": 0.10
}
}
}
]
},
"httpCalls": [
{
"expectedRequest": {
"uri": "http://tlx.3lift.net/s2s/auction?supplier_id=20",
"body": {
"id": "test-request-id",
"imp": [
{
"tagid": "aaw",
"bidfloor": 0.10,
"id": "test-imp-id",
"video": {
"mimes": [
"video/mp4"
],
"minduration": 15,
"maxduration": 30,
"protocols": [
2,
3,
5,
6,
7,
8
],
"w": 940,
"h": 560
},
"ext": {
"bidder": {
"inventoryCode": "aaw",
"floor": 0.10
}
}
}
]
}
},
"mockResponse": {
"status": 200,
"body": {
"id": "test-request-id",
"seatbid": [
{
"seat": "958",
"bid": [
{
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.500000,
"adid": "29681110",
"adm": "some-test-ad",
"adomain": [
"foo.com"
],
"iurl": "http://tlx.3lift.net/s2s/auction?supplier_id=20",
"cid": "958",
"crid": "29681110",
"h": 250,
"w": 300,
"cat": [
"IAB9-1"
],
"ext": {
"triplelift_pb": {
"format": 11
}
}
}
]
}
],
"bidid": "5778926625248726496",
"cur": "USD"
}
}
}
],
"expectedBidResponses": [
{
"currency": "USD",
"bids": [
{
"bid": {
"id": "7706636740145184841",
"impid": "test-imp-id",
"price": 0.5,
"adm": "some-test-ad",
"adid": "29681110",
"adomain": [
"foo.com"
],
"iurl": "http://tlx.3lift.net/s2s/auction?supplier_id=20",
"cid": "958",
"crid": "29681110",
"w": 300,
"h": 250,
"cat": [
"IAB9-1"
],
"ext": {
"triplelift_pb": {
"format": 11
}
}
},
"type": "video"
}
]
}
]
}
Loading