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

Fix multi-bid adId in Criteo bid adapter #3340

Merged
merged 3 commits into from
Dec 19, 2018
Merged

Fix multi-bid adId in Criteo bid adapter #3340

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
09e58ff
Fix multi-bid adId in Criteo bid adapter
Spark-NF Nov 28, 2018
eef0451
Increment Criteo adapter version
Spark-NF Dec 3, 2018
d1512f1
Add test for Criteo multi-bid fix
Spark-NF Dec 19, 2018
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
3 changes: 2 additions & 1 deletion modules/criteoBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import find from 'core-js/library/fn/array/find';
import JSEncrypt from 'jsencrypt/bin/jsencrypt';
import sha256 from 'crypto-js/sha256';

const ADAPTER_VERSION = 15;
const ADAPTER_VERSION = 16;
const BIDDER_CODE = 'criteo';
const CDB_ENDPOINT = '//bidder.criteo.com/cdb';
const CRITEO_VENDOR_ID = 91;
Expand Down Expand Up @@ -98,6 +98,7 @@ export const spec = {
const bidId = bidRequest.bidId;
const bid = {
requestId: bidId,
adId: slot.bidId || utils.getUniqueIdentifierStr(),
cpm: slot.cpm,
currency: slot.currency,
netRevenue: true,
Expand Down
38 changes: 38 additions & 0 deletions test/spec/modules/criteoBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
import { expect } from 'chai';
import { cryptoVerify, spec, FAST_BID_PUBKEY } from 'modules/criteoBidAdapter';
import * as bidfactory from 'src/bidfactory';
import CONSTANTS from 'src/constants.json';
import * as utils from 'src/utils';

describe('The Criteo bidding adapter', function () {
Expand Down Expand Up @@ -241,6 +243,7 @@ describe('The Criteo bidding adapter', function () {
body: {
slots: [{
impid: 'test-requestId',
bidId: 'abc123',
cpm: 1.23,
creative: 'test-ad',
width: 728,
Expand All @@ -261,6 +264,7 @@ describe('The Criteo bidding adapter', function () {
const bids = spec.interpretResponse(response, request);
expect(bids).to.have.lengthOf(1);
expect(bids[0].requestId).to.equal('test-bidId');
expect(bids[0].adId).to.equal('abc123');
expect(bids[0].cpm).to.equal(1.23);
expect(bids[0].ad).to.equal('test-ad');
expect(bids[0].width).to.equal(728);
Expand Down Expand Up @@ -297,6 +301,40 @@ describe('The Criteo bidding adapter', function () {
expect(bids[0].width).to.equal(728);
expect(bids[0].height).to.equal(90);
});

it('should generate unique adIds if none are returned by the endpoint', function () {
const response = {
body: {
slots: [{
impid: 'test-requestId',
cpm: 1.23,
creative: 'test-ad',
width: 300,
height: 250,
}, {
impid: 'test-requestId',
cpm: 4.56,
creative: 'test-ad',
width: 728,
height: 90,
}],
},
};
const request = {
bidRequests: [{
adUnitCode: 'test-requestId',
bidId: 'test-bidId',
sizes: [[300, 250], [728, 90]],
params: {
networkId: 456,
}
}]
};
const bids = spec.interpretResponse(response, request);
expect(bids).to.have.lengthOf(2);
const prebidBids = bids.map(bid => Object.assign(bidfactory.createBid(CONSTANTS.STATUS.GOOD, request.bidRequests[0]), bid));
expect(prebidBids[0].adId).to.not.equal(prebidBids[1].adId);
});
});

describe('cryptoVerify', function () {
Expand Down