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

Jump to bottom

User ID's (liveramp, britepool) and gdpr #5114

Merged
merged 41 commits into from
Apr 17, 2020
Merged

User ID's (liveramp, britepool) and gdpr #5114

merged 41 commits into from
Apr 17, 2020

Conversation

HuddledMasses
Copy link
Contributor

Type of change

  • Feature

Description of change

Added support of user identeties and gdpr

vladis-teqblaze and others added 30 commits March 26, 2018 11:58
@vladis-teqblaze
add video&native traffic colossus ssp
b87237c
@vladis-teqblaze
Native obj validation
1ca4e28
@vladis-teqblaze
Native obj validation #2
b5c1850
@vladis-teqblaze
Added size field in requests
e969f27
@vladis-teqblaze
fixed test
67693e1
fix merge conflicts
e7ab418
fix merge conflicts
3320c68
move to 3.0
44e59b8
move to 3.0
7133a72
fix IE11 new URL issue
3dba3ac
fix IE11 new URL issue
7f14e4d
fix IE11 new URL issue
78609ff
https for 3.0
4c5d711
add https test
1027b54
add ccp and schain features
684639c
fix test
1c6681c
sync with upstream, fix conflicts
436ff0f
sync with upstream, fix conflicts
2f9efee
Update colossussspBidAdapter.js
c40dbe3 
remove commented code
Update colossussspBidAdapter.js
7d2e9f3 
lint fix
Merge branch 'master' of https://github.com/prebid/Prebid.js
8055e57
identity extensions
53bb18e
identity extensions
51faedc
fix
6cee3e7
fix
461e4ff
fix
e78a9dc
fix
1547d0a
fix
803be44
add tests for user ids
47a78af
fix
9ff6f10
harpere
harpere requested changes Apr 14, 2020
View reviewed changes
Copy link
Collaborator

@harpere harpere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

needs docs https://github.com/prebid/prebid.github.io/pulls

@harpere harpere self-assigned this Apr 14, 2020
@harpere
Copy link
Collaborator

harpere commented Apr 14, 2020

Also the tests failed, but for some reason are running under your organization so I can't rerun them

@HuddledMasses
Copy link
Contributor Author

@harpere For some reason ci fails with error
10 03 2020 12:44:16.716:ERROR [launcher]: Cannot load browser "bs_edge_17_windows_10"! Error: Username is required.
and similar for other browsers
But local gulp test finishes successfuly
`[10:53:39] Using gulpfile ~/Documents/work/nodejs/prebid/testing/Prebid.js/gulpfile.js
[10:53:39] Starting 'test'...
[10:53:39] Starting 'clean'...
[10:53:39] Finished 'clean' after 13 ms
[10:53:39] Starting 'lint'...
[10:53:57] Finished 'lint' after 18 s
[10:53:57] Starting 'test'...

START:
ℹ ｢wdm｣:
ℹ ｢wdm｣: Compiled successfully.
ℹ ｢wdm｣: Compiling...
ℹ ｢wdm｣:
ℹ ｢wdm｣: Compiled successfully.
14 04 2020 10:54:29.135:INFO [karma-server]: Karma v3.1.4 server started at http://0.0.0.0:9876/
14 04 2020 10:54:29.137:INFO [launcher]: Launching browsers ChromeHeadless with concurrency unlimited
14 04 2020 10:54:29.175:INFO [launcher]: Starting browser ChromeHeadless
14 04 2020 10:54:29.624:INFO [HeadlessChrome 81.0.4044 (Linux 0.0.0)]: Connected on socket Quc2Ua8zOoNtF7wzAAAA with id 78421739
LOG: Object{pubcid: '203a0692-f728-4856-87f6-9a25a6b63715'}
ERROR: '{"bidderCode":"tribeos","width":300,"height":250,"statusMessage":"Bid available","adId":"2041cbb1911a0d8","requestId":"21f3e9c3ce92f2","mediaType":"banner","source":"client","creativeId":"5e0b71e6823bb66fcb6c9858","cpm":1.1,"ad":"","currency":"USD","netRevenue":true,"ttl":180}'

Finished in 5.192 secs / 3.06 secs @ 10:54:36 GMT+0300 (Eastern European Summer Time)

SUMMARY:
✔ 4646 tests completed
ℹ 2 tests skipped
[10:54:36] Finished 'test' after 39 s
[10:54:36] Finished 'test' after 56 s`

@HuddledMasses HuddledMasses mentioned this pull request Apr 14, 2020
Merged
@HuddledMasses
Copy link
Contributor Author

Added docs prebid/prebid.github.io#1920

@HuddledMasses HuddledMasses requested a review from harpere April 14, 2020 08:23
harpere
harpere approved these changes Apr 17, 2020
View reviewed changes
Copy link
Collaborator

@harpere harpere left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@harpere
Copy link
Collaborator

harpere commented Apr 17, 2020

ran tests locally and they pass. thx for adding docs.

@harpere harpere merged commit a213fa0 into prebid:master Apr 17, 2020
redaguermas added a commit to redaguermas/Prebid.js that referenced this pull request Apr 20, 2020
@redaguermas
Merge branch 'master' of https://github.com/prebid/Prebid.js
6b11e52 
* 'master' of https://github.com/prebid/Prebid.js:
  Revert "New LuponMedia Bid Adapter (prebid#5120)" (prebid#5145)
  New LuponMedia Bid Adapter (prebid#5120)
  Feature/send publisher domain (prebid#5121)
  update test adunit params (prebid#5135)
  add parameter to the conversant adapter to override the url (prebid#5133)
  Replace call to old url module with call to utils (prebid#5136)
  GumGum: uses encodeURIComponent inline (prebid#5124)
  User ID's (liveramp, britepool) and gdpr (prebid#5114)
  fix wipes adapter response (prebid#5134)
  Submitting Tercept Analytics Adapter (prebid#5099)
  hotfix - undefined consent (prebid#5127)
  parrableIdSystem: Send current page location to back-end (prebid#5123)
  Increment pre version
  Prebid 3.16.0 Release
  Use a deepmerge function to merge both globa level config & bidder specific config (prebid#5039)
  Update appnexusBidAdapter.js (prebid#4893)
  Quantcast: Block bids without purpose 1 consent (prebid#5046)
  ShowHeroes adapter v2 (prebid#5085)
  Qc/qc usersyncs (prebid#4923)
redaguermas added a commit to redaguermas/Prebid.js that referenced this pull request Apr 20, 2020
@redaguermas
Merge branch 'master' into NoBid-Version-1.2.5
9d0db06 
* master:
  Revert "New LuponMedia Bid Adapter (prebid#5120)" (prebid#5145)
  New LuponMedia Bid Adapter (prebid#5120)
  Feature/send publisher domain (prebid#5121)
  update test adunit params (prebid#5135)
  add parameter to the conversant adapter to override the url (prebid#5133)
  Replace call to old url module with call to utils (prebid#5136)
  GumGum: uses encodeURIComponent inline (prebid#5124)
  User ID's (liveramp, britepool) and gdpr (prebid#5114)
  fix wipes adapter response (prebid#5134)
  Submitting Tercept Analytics Adapter (prebid#5099)
  hotfix - undefined consent (prebid#5127)
  parrableIdSystem: Send current page location to back-end (prebid#5123)
  Increment pre version
  Prebid 3.16.0 Release
  Use a deepmerge function to merge both globa level config & bidder specific config (prebid#5039)
  Update appnexusBidAdapter.js (prebid#4893)
  Quantcast: Block bids without purpose 1 consent (prebid#5046)
  ShowHeroes adapter v2 (prebid#5085)
  Qc/qc usersyncs (prebid#4923)
iggyfisk pushed a commit to happypancake/Prebid.js that referenced this pull request Jun 22, 2020
@vladis-teqblaze @iggyfisk
User ID's (liveramp, britepool) and gdpr (prebid#5114)
a881bfe 
* add video&native traffic colossus ssp

* Native obj validation

* Native obj validation #2

* Added size field in requests

* fixed test

* fix merge conflicts

* move to 3.0

* move to 3.0

* fix IE11 new URL issue

* fix IE11 new URL issue

* fix IE11 new URL issue

* https for 3.0

* add https test

* add ccp and schain features

* fix test

* sync with upstream, fix conflicts

* Update colossussspBidAdapter.js

remove commented code

* Update colossussspBidAdapter.js

lint fix

* identity extensions

* identity extensions

* fix

* fix

* fix

* fix

* fix

* add tests for user ids

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* add gdpr support

* add gdpr support

* id5id support

Co-authored-by: Vladislav Isaiko <vladis@smartyads.com>
Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@harpere harpere harpere approved these changes

Assignees

@harpere harpere

Labels
needs docs needs review
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@HuddledMasses @harpere @vladis-teqblaze