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

Fixing issue #4950 #4951

Closed
wants to merge 54 commits into from
Closed

Conversation

leonardlabat
Copy link
Contributor

Use a deepmerge function to merge both globa level config & bidder specific config

Type of change

  • Bugfix

Description of change

Fixing issue #4950

Use a deepmerge function to merge both globa level config & bidder specific config
@jsnellbaker jsnellbaker requested a review from snapwich March 9, 2020 14:39
jsnellbaker and others added 3 commits March 9, 2020 20:32
* add no-console eslint rule for tests directory

* remove console logs from onetag tests

* update scope of rule to include src files
* replace karma-coverage-istanbul-reporter with karma-coverage

* remove unused variable

* create coverage folder when required

* merge with master to fix issue of all unit tests not running

* update processKillTimeout to 10secs

* change reporter type html to lcov
test/spec/utils_spec.js Show resolved Hide resolved
7XBID00 and others added 6 commits March 10, 2020 11:26
* 7xbid adapter

* fix error when cli build

* update to implement prebid 3.0

* remove unneeded code

Co-authored-by: Nguyen Le Thinh <thinhnl@geniee.co.jp>
Co-authored-by: rmartinez <Rachael24!>
Co-authored-by: rmartinez <Rachael24!>
Co-authored-by: Ambuj Gupta <ambuj.g@media.net>
* added option to url parser to ignore decoding entire url

* add try catch just in case

* updated to test

Co-authored-by: rmartinez <Rachael24!>
ix-prebid-support and others added 16 commits March 10, 2020 22:26
* Added adapter without tests

* Added readme

* Added tests and CCPA support

* Cleaned code, fixed tests

* reverted examples

* Added more tests + CR fixes

* Fixed example in lifestreet readme, reverted integration  example page

* restored permission for page example
* implement size bucket filtration logic

* finish implmenation of getFilteredMediaTypes

* implement getBids function

* log useful information to the console

* enable test workflow

* modify checkAdUnitSetup function to account for the new sizeConfig object

* remove unrelated example

* add decider function to choose between sizeMapping v1 and sizeMapping v2

* add getBidsHook for s2s bidders

* handle edge case where all mediaTypes get filtered out and the case when bidder gets filtered out

* add test examples for banner media type

* update label check to pick up the fist label operator instead of the last on incase there are multiple lables present

* added example for label checks with banner ad

* add checkAdUnit setup hook on sizeMappingV2 modules to check presence of sizeConfig property in addition to doing normal adUnit checks

* restore old hello world example

* give free pass to video mediaTypes configured with sizeConfig property, while keeping in place the essential sizeConfig checks

* fixing minor bus and enchancing bidder level sizeConfig checks

* bugfix: checkBidderSizeConfigFormat

* add more scenarios for testing sizeMapping V2

* small docs changes

* feedback1 changes

* modify logic for bailing out

* add module description

* refactor isUsingNewSizeMapping function by making it a pure function

* add unit test case for isUsingNewSizeMapping function

* made adUnit checks more robusts and fully make adUnit.mediaTypes mandatory

* remove redundancy in checAdUnitSetupHook

* add banner units test cases for checkAdUnitSetupHook function

* add video and native mediaTypes units test for checkAdUnitSetupHook function

* rewrite some of the log messages

* redefine log messages to make it simple to the end user

* code optimization done so that getFilteredMediaTypes function gets called only once per adUnit per auction

* add code comments

* code refactorization and more unit test cases

* more unit tests for getBids function

* add sizeMapping usage example

* delete sizeMappingV2 directory

* add doctype declaration

* fix LGTM alert and revert changes to pbjs_api.spec.js

* fix LGTM alerts in sizeMappingV2_spec file

* add file extension for imports
* add mediaforce bid adapter

* make use of unused variable language
* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* fixing liveintent-segments

added separate functions in config for eid.ext and uid.ext
liventent segments should have been in eid.ext not in eid.uids[].ext

* added example of generated eids array

* formating

* commeneted a console log; avoiding lint error

* fixed breaking test-cases
* add UNICORN bid adapter

* fix not using flatMap

* fix symbol error

* care lint & empty response

* care lint & add tests
Clicktripz bid adapter
- adapter
- description
- test
…ebid#4966)

* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* in-dev; breaking; waiting for a fix

* removed console.log

* deleted commented code
* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* using userIdAsEids
* initial support for TCF2

* update wording in err message

* update logic and comment around safeframe workflow

* fix typo
* initial

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fix

* fixes

* navigator check

* navigator.language check
* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* update changed default value of netRevenue to true

* Re-add rubicon analytics without deprecated getTopWindowUrl util

* Cache referrer on auction_init instead of bid_requested

* add config for deviceAccess enforcement in utils getCookie setCookie and hasLocalStorage

* add tests, and updates to names/comments

* add deviceAccess enforcement to util method cookiesAreEnabled

* update to adspendBidAdapter for device access enforcement

* update to pubCommonId for device access enforcement

* update widespaceBidAdapter for device access enforcement. updated utils storage methods with jsdoc typing, hasLocalStorage changed to only return boolean type

* update to digiTrustIdSystem for device access enforcement

* updated utils.setCookie signature, adding a 'domain' argument. update to invibesBidAdapter for device access enforcement

* updated utils to group similar storage methods

* updated kargoBidAdapter for add-enforcement-device-access

* update to minimize changes in adapters using browser storage

* updated modules with localStorage or cookie methods to use utils

* updated invibesBidAdapter use of storage methods to use utils

* fix for wrong obj reference for date string

* revert accidental change to package.json

* fix linting error, trailing comma. removed unnecessary cookie get set functions and replaced with util methods

* reverted change to removed extra methods since it breaks unit test

* fix for pubcommonidsystem id generation

* update jsdoc param 'domain'

* Update adagioBidAdapter.js

merging changes from prebid#4978

* Removing encoding in DT encId

We need to get moving on this merge, so I made an update -- the encId() function appears to be necessary to stringify and btoa() the ID. Just removed the layer of URL encoding in that function as duplicate of what happens in the PBJS setCookie fn.

Co-authored-by: nakamoto <nakamoto_tatsuya@microad.co.jp>
Co-authored-by: Chandra Prakash <chandra.prakash@advangelists.com>
Co-authored-by: Eric Harper <eharper@rubiconproject.com>
Co-authored-by: TJ Eastmond <teastmond@la-wlandaverde-mac.local>
Co-authored-by: Mark Monday <mmonday@rubiconproject.com>
Co-authored-by: msm0504 <51493331+msm0504@users.noreply.github.com>
Co-authored-by: bretg <bgorsline@gmail.com>
Copy link
Contributor

@pm-harshad-mane pm-harshad-mane left a comment

Choose a reason for hiding this comment

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

LGTM

@pm-harshad-mane pm-harshad-mane added the needs 2nd review Core module updates require two approvals from the core team label Mar 19, 2020
uditalias and others added 21 commits March 20, 2020 16:33
* add coppa support in quantcast adapter

* fix unit tests
* Add Valueimpression Bid Adapter

* Update valueimpressionBidAdapter_spec.js

* Update valueimpressionBidAdapter.md

* Lint valueimpressionBidAdapter.js

* Update valueimpressionBidAdapter.js
* appnexus adapter : include hb_source in request to server

* add unit tests

* Revert "add unit tests"

This reverts commit 7b6f97c.

* Revert "appnexus adapter : include hb_source in request to server"

This reverts commit 2a24271.

* move hb_source to tag level

* update if condition for adpod

Co-authored-by: sumit sharma <sumit.sharma1@SYNPUNLT9114TFL.SYNAPPNXS.local>
Co-authored-by: sumit sharma <sumit.sharma1@SYNPUNLT9114TFL.appnexus.com>
* added user sync for ix

* tests for userSync iframe drop [LIBRARY-690]

* fix user sync test

* fix lint

* added user sync info to ix bidder doc

Co-authored-by: Zicong Zhou <zicong.zhou@indexexchange.com>
Co-authored-by: Pankaj Yadav <pankaj.yadav@indexexchange.com>
…prebid#4970)

* Add microadBidAdapter

* Remove unnecessary encodeURIComponent from microadBidAdapter

* Submit Advangelists Prebid Adapter

* Submit Advangelists Prebid Adapter 1.1

* Correct procudtion endpoint for prebid

* analytics update with wrapper name

* reverted error merge

* update changed default value of netRevenue to true

* Re-add rubicon analytics without deprecated getTopWindowUrl util

* Cache referrer on auction_init instead of bid_requested

* add gdprScope config support

* add tests

* updated with requested changes from the pull request

* optimization to simplify setting the gdprApplies value

Co-authored-by: nakamoto <nakamoto_tatsuya@microad.co.jp>
Co-authored-by: Chandra Prakash <chandra.prakash@advangelists.com>
Co-authored-by: Eric Harper <eharper@rubiconproject.com>
Co-authored-by: TJ Eastmond <teastmond@la-wlandaverde-mac.local>
Co-authored-by: Mark Monday <mmonday@rubiconproject.com>
Co-authored-by: msm0504 <51493331+msm0504@users.noreply.github.com>
* Added Adnuntius Bid Adapter

* Changes to Adnuntius bidder according to comments.

* Fixed non used variable warning.

* Fixed outstanding issues

* Fixed issue in test and bidder.

* Fixed all the "for ... of" Issues.
Co-authored-by: Jaimin Panchal <email@example.com>
* added support for pubcommon, digitrust, id5id

* added support for IdentityLink

* changed the source for id5

* added unit test cases

* changed source param for identityLink

* PubMatic to support NetId UserId sub-module
* * Update undertone adapter - change parameters - placementId parameter is now optional and not mandatory - undertoneBidAdapter.js

* Updated undertone bid adapter tests accordingly - undertoneBidAdapter_spec.js

* * Update undertone adapter - change parameters - placementId parameter is now optional and not mandatory - undertoneBidAdapter.js

 * Updated undertone bid adapter tests accordingly - undertoneBidAdapter_spec.js

* fix lint issue in undertone adapter spec

* added user sync function to undertone adapter

* * Update undertone adapter - change parameters - placementId parameter is now optional and not mandatory - undertoneBidAdapter.js

* Updated undertone bid adapter tests accordingly - undertoneBidAdapter_spec.js

* added user sync function to undertone adapter

* added user sync function to undertone adapter

* revert package-lock.json

* send element coordinates and viewport

* Update undertoneBidAdapter.js

* add null in case of no data

easier integration with earlier versions

* update according to fixes

* added user sync function to undertone adapter

* Update undertoneBidAdapter.js

* remove unneded changes after rebase

Co-authored-by: omerko <omer.koren@perion.com>
Co-authored-by: Omer Koren <omerko@users.noreply.github.com>
* ET-1691: Pulsepoint Analytics adapter for Prebid. (#1)

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: Adding pulsepoint analytics and tests for pulsepoint adapter

* ET-1691: cleanup

* ET-1691: minor

* ET-1691: revert package.json change

* Adding bidRequest to bidFactory.createBid method as per prebid#509

* ET-1765: Adding support for additional params in PulsePoint adapter (#2)

* ET-1850: Fixing prebid#866

* Minor fix

* Adding mandatory parameters to Bid

* PulsePoint: support for banner.format object

* AdSize on response for banner responses

* Fixing review comment

* Reverting package-json changes
* New adfinity adapter

* Update adfinityBidAdapter.md

* add test params

* native response validattion

* fix secure param

* gdpr support

* fix merge conflict

Co-authored-by: Aiholkin <artem.iholkin@smartyads.com>
Co-authored-by: root <root@localhost.localdomain>
* adds Media.net Analytics Adapter

* fixes medianet adapter key in docs

Co-authored-by: vedant.s <vedant.s@media.net>
Use a deepmerge function to merge both globa level config & bidder specific config
@leonardlabat leonardlabat requested a review from snapwich March 26, 2020 09:21
Copy link
Collaborator

@snapwich snapwich left a comment

Choose a reason for hiding this comment

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

This pull-request appears to be doing a lot more than fixing issue #4950

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs 2nd review Core module updates require two approvals from the core team
Projects
None yet
Development

Successfully merging this pull request may close these issues.