Ptow 2 resolving conflicts #21
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
…quest payload (prebid#11490) * sends bcat and badv ortb2 params in request payload * adds tests for bcat and badv
…#11477) * InvibesBidAdapter - added cookie and referer read * InvibesBidAdapter - unit tests * InvibesBidAdapter - tab fix * InvibesBidAdapter - null checks * InvibesBidAdapter - fix { after if
* TargetVideo bid adapter * TargetVideo bid adapter * TargetVideo bid adapter * TargetVideo Bid Adapter: Add GDPR/USP support * TargetVideo Bid Adapter: Add GDPR/USP support tests * TargetVideo Bid Adapter: Updating margin rule * Add Brid bid adapter * Brid adapter requested changes * BridBidAdapter: switching to plcmt
* Tappx Refactor: Optimizing and adding more checkers and tests * Fix: fixed site referrer for iframes using external sites error #13231 * Adapt new placement params --------- Co-authored-by: Jordi Arnau <jarnau@tappx.com> Co-authored-by: Felipe N <fnoriega@tappx.com>
* 51Degrees RTD provider * Amended comments and documentation to improve references for obtaining additional information and resources. Added an exception if the resourceKey parameter is not updated from the example. Added a customer notices section to the readme. Used User Agent Client Hint (UA-CH) consistently in the documentation. * Modified the maintainer email address. * Change outdated URL * Adjust code to work on legacy browsers * Refactor a test of the `inject` method * Replace URL in a test method * 51Degrees RTD provider: remove redundant parameter from the example * 51Degrees RTD provider: update gpt.js URL in the example file * 51Degrees RTD provider: add schema to the `is51DegreesMetaPresent` method's URL * 51Degrees RTD provider: refactor `51Degrees` script injection method * 51Degrees RTD provider: show enriched device data in the example page * 51Degrees RTD provider: provide additional explanation for checking meta tags * 51Degrees RTD provider: update string for meta tag check * 51Degrees RTD provider: improve tests, reach 100% tests coverage * 51d example: debug warning and guidance as per review comment: - added a comment warning that debug flag should not be used in production - improved example page a bit with the testing/debugging guidance * 51d doc: add GetHighEntropyValues vs. Delegate-CH addressing review comment: prebid#11414 (review) with a discussion on why Delegate-CH is more prefereable than GetHighEntropyValues API * 51d: fix minor doc omissions --------- Co-authored-by: Bohdan V <25197509+BohdanVV@users.noreply.github.com> Co-authored-by: Eugene Dorfman <eugene.dorfman@gmail.com>
* Adding documentation for Sharethrough's analytics adapter.
…11514) * Remove parsing of addtlConsent * Fix test
Adzmyic is an aliased adapter from Appnexus. This update modifies the GVL ID to a new value, 723, obtained by Adzymic.
* Removing placement validation * Adding render back * add validation * remove validation for plcmt * Update unit tests
* add driftpixel Adapter * fix warnings * fix find requestId in interpretResponse * fix format of the bidderRequest --------- Co-authored-by: Chucky-choo <dedafu47@gmail.com>
* Update adxcgBidAdapter.js fix adxcgBidAdapter - removed transformBidParams * Update adxcgBidAdapter_spec.js removed deprecated params
* 1plusX: Add First Party Cookie ID Option * 1plusX: Remove Empty Test Case * 1plusX Rtd Provider: Improve Documentation
…rebid#11485) * Utils: add isSafeFrameWindow(), canAccessWindowTop() * AdagioBidAdapter: prepare to work with Adagio RTD Provider
* Update adapter SmartHub * revert previous fixes * Add back convertOrtbRequestToNative function --------- Co-authored-by: Victor <victor.banudz@smartyads.com> Co-authored-by: Chris Huie <phoenixtechnerd@gmail.com>
Co-authored-by: shreeyash.g <shreeyash.g@media.net>
* ZetaGlobalSsp Analytics Adapter: refactoring * test * improve test * - * BidTimeout event * bidTimeoutHandler * - * ortb2 to only device --------- Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com> Co-authored-by: Alexey Surovenko <ASurovenko@vdhk6ddf9m.home>
* freewheel add schain in the request * FreeWheel-SSP-Adapter: remove the innerText for 9.0 release * update test
* Update tests for sspBC adapter Update tests for sspBC adapter: - change userSync test (due to tcf param appended in v4.6) - add tests for onBidWon and onTimeout * [sspbc-adapter] 5.3 updates: content-type for notifications * [sspbc-adapter] pass CTA to native bid * [sspbc-5.3] keep pbsize for detected adunits * [maintenance] - remove old test for sspBc bid adaptor * [sspbc-5.3] increment adaptor ver * [sspbc-adapter] maintenance update to sspBCBidAdapter * remove yarn.lock * Delete package-lock.json * remove package-lock.jsonfrom pull request * [sspbc-adapter] send pageViewId in request * [sspbc-adapter] update pageViewId test * [sspbc-adapter] add viewabiility tracker to native ads * [sspbc-adapter] add support for bid.admNative property * [sspbc-adapter] ensure that placement id length is always 3 (improves matching response to request) * [sspbc-adapter] read publisher id and custom ad label, then send them to banner creative * [sspbc-adapter] adlabel and pubid are set as empty strings, if not present in bid response * [sspbc-adapter] jstracker data fix * [sspbc-adapter] jstracker data fix * [sspbc-adapter] send tagid in notifications * [sspbc-adapter] add gvlid to spec; prepare getUserSyncs for iframe + image sync * update remote repo * cleanup of grupawp/prebid master branch * update sspBC adapter to v 5.9 * update tests for sspBC bid adapter * [sspbc-adapter] add support for topicsFPD module * [sspbc-adapter] change topic segment ids to int * add pirIdSystem * pirIdSystem * piridSystem - preCR * fix after CR * name change --------- Co-authored-by: wojciech-bialy-wpm <67895844+wojciech-bialy-wpm@users.noreply.github.com> Co-authored-by: Wojciech Biały <wb@WojciechBialy.local> Co-authored-by: Wojciech Biały <wojciech.bialy@grupawp.pl>
* real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * real time data module, browsi sub module for real time data, new hook bidsBackCallback, fix for config unsubscribe * change timeout&primary ad server only to auctionDelay update docs * support multiple providers * change promise to callbacks configure submodule on submodules.json * bug fixes * use Prebid ajax * tests fix * browsi real time data provider improvements * browsi-rtd-kv * browsi-rtd-kv (lint) * unit tests * lint fix
…er (prebid#11530) * Added support for displaymanager & version to pubmatic adapter * Added comments
* Added deals support in viantOrtbBidAdapter * refactoring * refactor * refactor * refactor * refactor * added test case * refactor * refactor test file * added test case and addressed suggestions
* ZetaGlobalSsp adapter: merge params.site and ortb2.site * fix unit test * extract buildVideo into utils * Revert "extract buildVideo into utils" This reverts commit a075583. --------- Co-authored-by: Surovenko Alexey <surovenko.alexey@gmail.com> Co-authored-by: Alexey Surovenko <ASurovenko@vdhk6ddf9m.home>
* cpmstarBidAdapter - added gvlid, added ortb and banner request data, various cleanups * cpmstarBidAdapter - fixed schain test for different url encoding * cpmstarBidAdapter: removed extra blank line
…b2 (prebid#11860) * AF-3740 retrieved topics data from user on ortb2 * AF-3740 kept old user data * AF-3740 added some checks for user data * AF-3740 used mergeDeep for merging user objects * AF-3740 provided unit tests for ortb2 data * AF-3740 moved some functionality to utils and used for avoiding duplication * AF-3740 provided unit tests
big fix for ozsize key
This fixes an issue in the server response parsing for user sync, where it was not using the body from the response. I took the occasion to also convert this member to camelCase for consistency with the others. Co-authored-by: Kevin Siow <kevin.siow@dailymotion.com>
…rebid#11888) * vidazooUtils - single request configurations * fix: shines rtb adapter use vidazoo bidder utils * fix: added vidazoo utils to illimin adapter * fix: illumin bid adapter using vidazooUtils * fix: twistDigital adapter use vidazooUtils * fix: tagoras adapter use vidazooUtils * fix: kueezRtb adapter use vidazooUtils * fix: removed parrable and digitrust id systems
…ves (prebid#11863) * Core: add location method for cross-frame creatives and update creatives * improvements
…11799) * start sending placement and placmt separately * move setOnAny function to utils * remove transformSizes and use util function
* Outbrain Bid Adapter: Add full ORTB2 device data to request payload * Outbrain Bid Adapter: Add test to verify presence of ORTB2 device data in request --------- Co-authored-by: Bohdan V <25197509+BohdanVV@users.noreply.github.com>
This can cause too big of an issue for reporting it only as warning.
* Update README.md update * Add admixerwl alias for admixerBidAdapter. * add rtbstack alias to admixerBidAdapter * rtbstack tests * RTB Stack Test Parameters --------- Co-authored-by: AdmixerTech <35560933+AdmixerTech@users.noreply.github.com> Co-authored-by: AdmixerTech <admin@admixer.net> Co-authored-by: Yaroslav Masenko <intgr-user@admixer.ua> Co-authored-by: Daria Boyko <dboyko@admixer.com>
…defs (prebid#11901) * adds missing typedefs * revert videojs * restore videojs * uses typedef import statements * unifies statements * undo videojs * restore import
* Send ae parameter in the request. * Fix comments for jsdoc warrnings
…port from symitri (prebid#11900) * SYM-2-rename-akamaiDapRtdProvider-to-symitriDapRtdProvider * encapsulate the Symitri module code in a create wrapper, instanciate in Akamai module * cleanup and sqaush --------- Co-authored-by: Jeff Palladino <jeff@symitri.com>
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
| export function getCids(site) { | ||
| if (site.content && Array.isArray(site.content.data)) { | ||
| for (const dataItem of site.content.data) { | ||
| if (dataItem.name.includes('iris.com') || dataItem.name.includes('iris.tv')) { |
Check failure
Code scanning / CodeQL
Incomplete URL substring sanitization High
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This PR has roughly the same effect as syncing the main branches, and was constructed with:
git fetch --allgit checkout pubx/mastergit merge prebid/master