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

[pull] master from prebid:master #1586

Merged
merged 58 commits into from
Jan 9, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
58 commits
Select commit Hold shift + click to select a range
048f735
Pubmatic Analytics Adapter : skip duplicate data for pubmatic bids in…
pm-priyanka-deshmane Dec 12, 2023
947a487
support ad unit name (#10825)
gwi-mmuths Dec 12, 2023
5dbbf1b
PBjs Core : new event fired before add bid response (#10685)
matthieularere-msq Dec 12, 2023
85817e7
Revert "Pubmatic Analytics Adapter : skip duplicate data for pubmatic…
patmmccann Dec 12, 2023
fd35856
Revert "support ad unit name (#10825)" (#10831)
ChrisHuie Dec 12, 2023
1c4bc7a
Invibes Bid Adapter : infinite scroll tcf (#10764)
gabrielIvbs Dec 12, 2023
2e07896
Mediago Bid Adapter : switch domain name (#10833)
BaronJHYu Dec 13, 2023
75cb166
Bizzclick Bid Adapter : update adapter, used ortbConverter lib (#10828)
BizzClick Dec 13, 2023
dc530cf
PubMatic Bid Adapter : passing a unique wiid to pubmatic ssp and logg…
pm-azhar-mulla Dec 13, 2023
a631892
Criteo Bid Adapter: Add support for app.publisher.id in bid request (…
vraybaud Dec 14, 2023
3e57af3
providing visibility in case of adapter timeout and bidError (#10807)
barRubi Dec 14, 2023
f58a0a3
Prebid 8.28.0 release
prebidjs-release Dec 14, 2023
2732783
Increment version to 8.29.0-pre
prebidjs-release Dec 14, 2023
5292b63
Adding support for video.plcmt (#10841)
desidiver Dec 15, 2023
a90d6c8
Bump github/codeql-action from 2 to 3 (#10856)
dependabot[bot] Dec 18, 2023
5f8ff5f
HadronId Module: implementing user consent in backend calls (#10845)
jlaso Dec 18, 2023
9a0f012
Eids Docs : add missing EID examples (#10844)
3link Dec 18, 2023
332a7d2
Admixer Bid Adaper: add admixerwl alias (#10859)
AdmixerTech Dec 19, 2023
cd787eb
AdagioAnalyticsAdapter: fix function param check (#10860)
osazos Dec 19, 2023
0b59d4d
NoBid Analytics Adapter: support for counting blocked requests for th…
redaguermas Dec 20, 2023
a5c2e06
consentManagementGpp: fix handling of CMP errors (#10811)
dgirardi Dec 20, 2023
104f53f
Taboola Bid Adapter: implement Iframe user sync (#10789)
ahmadlob Dec 20, 2023
2548949
AMX bid adapter: fix timeout handler, bump version (#10744)
nickjacob Dec 20, 2023
2b8aacb
Ucfunnel Bid Adapter: add format support (#10862)
jackhsiehucf Dec 20, 2023
3c632ca
R2B2 Bid Adapter: Initial release (#10702)
alexalukr2b2 Dec 21, 2023
f5e1988
Core: fix headers in ortbConverter readme (#10874)
someden Dec 27, 2023
c6b45c4
SparteoBidAdapter: Add UserSync (#10822)
geoffray-viously Dec 27, 2023
f625c1e
Yandex Bid Adapter: Add rtt (roud trip time) tracking via nurl (#10846)
korobkov-k Dec 27, 2023
ed48e34
AdMatic Bid Adapter : consent management features added (#10813)
fatihkaya84 Dec 27, 2023
9ec2092
Taboola Bid Adapter: Cookie Look Up Logic Fix (#10873)
ahmadlob Dec 27, 2023
984abfa
ZetaGlobalSsp Bid Adapter : support topics module (#10803)
asurovenko-zeta Dec 27, 2023
325cd3c
Adnuntius Bid Adapter: bugfix for storageFunction (#10869)
mikael-lundin Dec 28, 2023
bdbbf09
Prebid 8.29.0 release
prebidjs-release Dec 28, 2023
46784ab
Increment version to 8.30.0-pre
prebidjs-release Dec 28, 2023
cc49968
Yandex Bid Adapter: add support for topicsFpdModule (#10875)
someden Dec 31, 2023
ff27673
Yandex Bid Adapter: add jsdoc (#10884)
someden Dec 31, 2023
233695d
DxKulture Bid Adapter : user syncs improvements (#10738)
kmdevops Jan 2, 2024
04a7659
Mygaru Id System: Initial release (#10848)
GeneGenie Jan 2, 2024
ed05478
Update viantOrtbBidAdapter_spec.js (#10888)
tkrishnaviant Jan 3, 2024
665c894
Stv Bid Adapter: added user id support, adaptation of schain support …
theo-stv Jan 3, 2024
185e97f
Missena Bid Adapter: allow per page capping (#10863)
pdamoc Jan 3, 2024
49904a0
LiveIntent ID Module: Update live-connect version (#10894)
wi101 Jan 3, 2024
136f0bb
Do not require API for video requests (#10895)
robertrmartinez Jan 3, 2024
7a09d81
Price Floors: Failure to Account for 'data.skipRate' (#10872)
bbaresic Jan 4, 2024
aa21bfd
Prebid 8.30.0 release
prebidjs-release Jan 4, 2024
714acd3
Increment version to 8.31.0-pre
prebidjs-release Jan 4, 2024
866be6e
1.Added safechecks for s2s metadapter case 2.Skipped firing client si…
kapil-tuptewar Jan 4, 2024
60e7e96
Discovery Bid Adapter: update buyerId, add ssppid & pmguid, add getUs…
ecoeco163 Jan 4, 2024
cdbe68c
ID5 User Id module - pass gpp string and sid in getId request (#10899)
abazylewicz-id5 Jan 5, 2024
7f2763d
Adnuntius Bid Adapter : bugfix void au ids (#10890)
antosarho Jan 5, 2024
3e6b546
GreenbidsAnalyticsAdapter and GreenbidsRtdProvider: Rework greenbids …
jbogp Jan 5, 2024
d390f6c
Core: add eslint-plugin-jsdoc (#10893)
someden Jan 6, 2024
759c52d
Pangle Bid Adapter : add multi format support (#10909)
pangle-fe Jan 8, 2024
6689373
Criteo bid adapter: remove checks on video context and placement (#10…
dzhang-criteo Jan 8, 2024
b6d7b0a
Discovery Bid Adapter : add title, description, keywords (#10900)
lhxx121 Jan 9, 2024
cf1f150
Ampliffy Bid Adapter: initial commit (#10883)
vicenteampliffy Jan 9, 2024
b93416b
Utils.js (Warning in Integration Tests): add back getWindowFromDocume…
ChrisHuie Jan 9, 2024
2b25ec4
Rubicon: remove transformBidParams function (#10919)
bretg Jan 9, 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
35 changes: 33 additions & 2 deletions .eslintrc.js
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,25 @@ module.exports = {
node: {
moduleDirectory: ['node_modules', './']
}
},
'jsdoc': {
mode: 'typescript',
tagNamePreference: {
'tag constructor': 'constructor',
extends: 'extends',
method: 'method',
return: 'return',
}
}
},
extends: 'standard',
extends: [
'standard',
'plugin:jsdoc/recommended'
],
plugins: [
'prebid',
'import'
'import',
'jsdoc'
],
globals: {
'BROWSERSTACK_USERNAME': false,
Expand Down Expand Up @@ -46,6 +59,24 @@ module.exports = {
'no-undef': 2,
'no-useless-escape': 'off',
'no-console': 'error',
'jsdoc/check-types': 'off',
'jsdoc/newline-after-description': 'off',
'jsdoc/require-jsdoc': 'off',
'jsdoc/require-param': 'off',
'jsdoc/require-param-description': 'off',
'jsdoc/require-param-name': 'off',
'jsdoc/require-param-type': 'off',
'jsdoc/require-property': 'off',
'jsdoc/require-property-description': 'off',
'jsdoc/require-property-name': 'off',
'jsdoc/require-property-type': 'off',
'jsdoc/require-returns': 'off',
'jsdoc/require-returns-check': 'off',
'jsdoc/require-returns-description': 'off',
'jsdoc/require-returns-type': 'off',
'jsdoc/require-yields': 'off',
'jsdoc/require-yields-check': 'off',
'jsdoc/tag-lines': 'off'
},
overrides: Object.keys(allowedModules).map((key) => ({
files: key + '/**/*.js',
Expand Down
6 changes: 3 additions & 3 deletions .github/workflows/codeql-analysis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ jobs:

# Initializes the CodeQL tools for scanning.
- name: Initialize CodeQL
uses: github/codeql-action/init@v2
uses: github/codeql-action/init@v3
with:
languages: ${{ matrix.language }}
config-file: ./.github/codeql/codeql-config.yml
Expand All @@ -57,7 +57,7 @@ jobs:
# Autobuild attempts to build any compiled languages (C/C++, C#, or Java).
# If this step fails, then you should remove it and run the build manually (see below)
- name: Autobuild
uses: github/codeql-action/autobuild@v2
uses: github/codeql-action/autobuild@v3

# ℹ️ Command-line programs to run using the OS shell.
# 📚 See https://docs.github.com/en/actions/using-workflows/workflow-syntax-for-github-actions#jobsjob_idstepsrun
Expand All @@ -70,4 +70,4 @@ jobs:
# ./location_of_script_within_repo/buildscript.sh

- name: Perform CodeQL Analysis
uses: github/codeql-action/analyze@v2
uses: github/codeql-action/analyze@v3
9 changes: 4 additions & 5 deletions libraries/ortbConverter/README.md
Original file line number Diff line number Diff line change
Expand Up @@ -80,8 +80,7 @@ However, there are two restrictions (to avoid them, use the [other customization
)
```

<a id="fine-customization" />
### Fine grained customization - imp, request, bidResponse, response
### <a id="fine-customization" /> Fine grained customization - imp, request, bidResponse, response

When invoked, `toORTB({bidRequests, bidderRequest})` first loops through each request in `bidRequests`, converting them into ORTB `imp` objects.
It then packages them into a single ORTB request, adding other parameters that are not imp-specific (such as for example `request.tmax`).
Expand All @@ -91,7 +90,7 @@ a single return value.

You can customize each of these steps using the `ortbConverter` arguments `imp`, `request`, `bidResponse` and `response`:

### <a id="imp" />Customizing imps: `imp(buildImp, bidRequest, context)`
### <a id="imp" /> Customizing imps: `imp(buildImp, bidRequest, context)`

Invoked once for each input `bidRequest`; should return the ORTB `imp` object to include in the request.
The arguments are:
Expand All @@ -101,7 +100,7 @@ The arguments are:
- `context`: a [context object](#context) that contains at least:
- `bidderRequest`: the `bidderRequest` argument passed to `toORTB`.

#### <a id="params" />Example: attaching custom bid params
#### <a id="params" /> Example: attaching custom bid params

```javascript
const converter = ortbConverter({
Expand Down Expand Up @@ -351,7 +350,7 @@ const converter = ortbConverter({
- the `context` argument of `ortbConverter`: e.g. `ortbConverter({context: {ttl: 30}})`. This will set `context.ttl = 30` globally for the converter.
- the `context` argument of `toORTB`: e.g. `converter.toORTB({bidRequests, bidderRequest, context: {ttl: 30}})`. This will set `context.ttl = 30` only for this request.

### <a id="special-context"/> Special `context` properties
### <a id="special-context" /> Special `context` properties

For ease of use, the conversion logic gives special meaning to some context properties:

Expand Down
3 changes: 2 additions & 1 deletion modules/.submodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@
"adqueryIdSystem",
"gravitoIdSystem",
"freepassIdSystem",
"operaadsIdSystem"
"operaadsIdSystem",
"mygaruIdSystem"
],
"adpod": [
"freeWheelAdserverVideo",
Expand Down
28 changes: 16 additions & 12 deletions modules/adagioAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ const enc = window.encodeURIComponent;

/**
/* BEGIN ADAGIO.JS CODE
*/
*/

function canAccessTopWindow() {
try {
Expand All @@ -71,12 +71,12 @@ const adagioEnqueue = function adagioEnqueue(action, data) {
};

/**
* END ADAGIO.JS CODE
*/
* END ADAGIO.JS CODE
*/

/**
* UTILS FUNCTIONS
*/
* UTILS FUNCTIONS
*/

const guard = {
adagio: (value) => isAdagio(value),
Expand All @@ -97,6 +97,10 @@ function getAdapterNameForAlias(aliasName) {
};

function isAdagio(value) {
if (!value) {
return false
}

return value.toLowerCase().includes('adagio') ||
getAdapterNameForAlias(value).toLowerCase().includes('adagio');
};
Expand Down Expand Up @@ -126,9 +130,9 @@ function addKeyPrefix(obj, prefix) {
}

/**
* sendRequest to Adagio. It filter null values and encode each query param.
* @param {Object} qp
*/
* sendRequest to Adagio. It filter null values and encode each query param.
* @param {Object} qp
*/
function sendRequest(qp) {
// Removing null values
qp = Object.keys(qp).reduce((acc, key) => {
Expand Down Expand Up @@ -160,7 +164,7 @@ function getTargetedAuctionId(bid) {

/**
* END UTILS FUNCTIONS
*/
*/

/**
* HANDLERS
Expand All @@ -171,7 +175,7 @@ function getTargetedAuctionId(bid) {
* - handlerAdRender
*
* Each handler is called when the event is fired.
*/
*/

function handlerAuctionInit(event) {
const w = getCurrentWindow();
Expand Down Expand Up @@ -267,7 +271,7 @@ function handlerAuctionInit(event) {
* handlerBidResponse allow to track the adagio bid response
* and to update the auction cache with the seat ID.
* No beacon is sent here.
*/
*/
function handlerBidResponse(event) {
if (!guard.adagio(event.bidder)) {
return;
Expand Down Expand Up @@ -368,7 +372,7 @@ function handlerAdRender(event, isSuccess) {

/**
* END HANDLERS
*/
*/

let adagioAdapter = Object.assign(adapter({ emptyUrl, analyticsType }), {
track: function(event) {
Expand Down
10 changes: 5 additions & 5 deletions modules/adagioBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -700,9 +700,9 @@ function getPageDimensions() {
}

/**
* @todo Move to prebid Core as Utils.
* @returns
*/
* @todo Move to prebid Core as Utils.
* @returns
*/
function getViewPortDimensions() {
if (!isSafeFrameWindow() && !canAccessTopWindow()) {
return '';
Expand Down Expand Up @@ -832,8 +832,8 @@ function getPrintNumber(adUnitCode, bidderRequest) {
}

/**
* domLoading feature is computed on window.top if reachable.
*/
* domLoading feature is computed on window.top if reachable.
*/
function getDomLoadingDuration() {
let domLoadingDuration = -1;
let performance;
Expand Down
Loading