10000 Site id missing by DeepthiNeeladri · Pull Request #4467 · prebid/Prebid.js · GitHub
[go: up one dir, main page]
More Web Proxy on the site http://driver.im/
Skip to content

Site id missing #4467

8000
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

Merged
merged 34 commits into from
Nov 28, 2019
Merged

Site id missing #4467

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
34 commits
Select commit Hold shift + click to select a range
62516db
outstream changes
Jun 27, 2019
05e333a
removing global filtet
Jun 27, 2019
054b515
reverting page
Jun 27, 2019
94cbc2d
message
Jul 2, 2019
d49e922
adapter change
Jul 3, 2019
7a43143
remove space
Jul 3, 2019
bc859b3
testcases
Jul 3, 2019
0a8a86c
testpage
Jul 3, 2019
22e4ec9
spaces for test page
Jul 3, 2019
9637b48
renderer exist case
Jul 4, 2019
0e2d31b
reverting package-lock.json
Jul 9, 2019
88ac283
Merge branch 'master' of https://github.com/prebid/Prebid.js
Jul 11, 2019
d81769b
Merge branch 'master' of https://github.com/prebid/Prebid.js
Jul 24, 2019
2d48e1e
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 1, 2019
63a37e3
adding schain object
Aug 2, 2019
873a2c1
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 4, 2019
7e68c35
Merge branch 'master' of https://github.com/prebid/Prebid.js
Aug 7, 2019
e8c40c3
adding tagid
Aug 7, 2019
af32e45
syntaxx error fix
Aug 7, 2019
4bb7c45
video.html
Aug 7, 2019
caf81ac
space trailing
Aug 7, 2019
514f68d
space
Aug 7, 2019
5dc1086
tagid
Aug 7, 2019
606eb96
inventoryId and placement
Aug 14, 2019
4cfb6f4
rewarded video
Sep 3, 2019
e03ff33
added unit test case
Sep 5, 2019
a17b3d3
merge
Nov 14, 2019
f44049a
adding site id
Nov 15, 2019
c914c01
adding placement and siteis
Nov 15, 2019
965f702
site id param test case
Nov 15, 2019
7924222
removing deprecated functions
Nov 26, 2019
b50d184
correcting test cases
Nov 26, 2019
0b71ef2
indentation
Nov 26, 2019
f0c8dc6
test cases fix
Nov 27, 2019
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
17 changes: 10 additions & 7 deletions modules/oneVideoBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
8000 Expand Up @@ -48,7 +48,7 @@ export const spec = {
/** removing adding local protocal since we
* can get cookie data only if we call with https. */
url: spec.ENDPOINT + bid.params.pubId,
data: getRequestData(bid, consentData),
data: getRequestData(bid, consentData, bidRequest),
bidRequest: bid
}
})
Expand Down Expand Up @@ -138,10 +138,10 @@ function isConsentRequired(consentData) {
return !!(consentData && consentData.gdprApplies);
}

function getRequestData(bid, consentData) {
let loc = utils.getTopWindowLocation();
function getRequestData(bid, consentData, bidRequest) {
let loc = bidRequest.refererInfo.referer;
let page = (bid.params.site && bid.params.site.page) ? (bid.params.site.page) : (loc.href);
let ref = (bid.params.site && bid.params.site.referrer) ? bid.params.site.referrer : utils.getTopWindowReferrer();
let ref = (bid.params.site && bid.params.site.referrer) ? bid.params.site.referrer : bidRequest.refererInfo.referer;
let bidData = {
id: utils.generateUUID(),
at: 2,
Expand Down Expand Up @@ -198,16 +198,16 @@ function getRequestData(bid, consentData) {
if (bid.params.video.rewarded) {
bidData.imp[0].ext.rewarded = bid.params.video.rewarded
}
if (bid.params.site && bid.params.site.id) {
bidData.site.id = bid.params.site.id
}
} else if (bid.params.video.display == 1) {
bidData.imp[0].banner = {
mimes: bid.params.video.mimes,
w: bid.params.video.playerWidth,
h: bid.params.video.playerHeight,
pos: bid.params.video.position,
};
if (bid.params.video.placement) {
bidData.imp[0].banner.placement = bid.params.video.placement
}
}
if (bid.params.video.inventoryid) {
bidData.imp[0].ext.inventoryid = bid.params.video.inventoryid
Expand All @@ -225,6 +225,9 @@ function getRequestData(bid, consentData) {
}
}
}
if (bid.params.site && bid.params.site.id) {
bidData.site.id = bid.params.site.id
}
if (isConsentRequired(consentData)) {
bidData.regs = {
ext: {
Expand Down
53 changes: 41 additions & 12 deletions test/spec/modules/oneVideoBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,21 @@ import {config} from 'src/config';

describe('OneVideoBidAdapter', function () {
let bidRequest;
let bidderRequest;
let bidderRequest = {
'bidderCode': 'oneVideo',
'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
'bidderRequestId': '1e498b84fffc39',
'bids': bidRequest,
'auctionStart': 1520001292880,
'timeout': 3000,
'start': 1520001292884,
'doneCbCallCount': 0,
'refererInfo': {
'numIframes': 1,
'reachedTop': true,
'referer': 'test.com'
}
};
let mockConfig;

beforeEach(function () {
Expand Down Expand Up @@ -105,18 +119,18 @@ describe('OneVideoBidAdapter', function () {

describe('spec.buildRequests', function () {
it('should create a POST request for every bid', function () {
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
expect(requests[0].method).to.equal('POST');
expect(requests[0].url).to.equal(spec.ENDPOINT + bidRequest.params.pubId);
});

it('should attach the bid request object', function () {
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
expect(requests[0].bidRequest).to.equal(bidRequest);
});

it('should attach request data', function () {
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
const [ width, height ] = bidRequest.sizes;
const placement = bidRequest.params.video.placement;
Expand All @@ -134,7 +148,7 @@ describe('OneVideoBidAdapter', function () {
const width = 640;
const height = 480;
bidRequest.sizes = [[ width, height ]];
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
expect(data.imp[0].video.w).to.equal(width);
expect(data.imp[0].video.h).to.equal(height);
Expand Down Expand Up @@ -185,9 +199,22 @@ describe('OneVideoBidAdapter', function () {
describe('when GDPR applies', function () {
beforeEach(function () {
bidderRequest = {
gdprConsent: {
consentString: 'test-gdpr-consent-string',
gdprApplies: true
'gdprConsent': {
'consentString': 'test-gdpr-consent-string',
'gdprApplies': true
},
'bidderCode': 'oneVideo',
'auctionId': 'e158486f-8c7f-472f-94ce-b0cbfbb50ab4',
'bidderRequestId': '1e498b84fffc39',
'bids': bidRequest,
'auctionStart': 1520001292880,
'timeout': 3000,
'start': 1520001292884,
'doneCbCallCount': 0,
'refererInfo': {
'numIframes': 1,
'reachedTop': true,
'referer': 'test.com'
}
};

Expand All @@ -211,7 +238,7 @@ describe('OneVideoBidAdapter', function () {
});

it('should send schain object', function () {
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
expect(data.source.ext.schain.nodes[0].sid).to.equal(bidRequest.params.video.sid);
expect(data.source.ext.schain.nodes[0].rid).to.equal(data.id);
Expand Down Expand Up @@ -253,7 +280,7 @@ describe('OneVideoBidAdapter', function () {
pubId: 'OneMDisplay'
}
};
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
const width = bidRequest.params.video.playerWidth;
const height = bidRequest.params.video.playerHeight;
Expand All @@ -264,6 +291,8 @@ describe('OneVideoBidAdapter', function () {
expect(data.imp[0].banner.pos).to.equal(position);
expect(data.imp[0].ext.inventoryid).to.equal(bidRequest.params.video.inventoryid);
expect(data.imp[0].banner.mimes).to.equal(bidRequest.params.video.mimes);
expect(data.imp[0].banner.placement).to.equal(bidRequest.params.video.placement);
expect(data.site.id).to.equal(bidRequest.params.site.id);
});
it('should send video object when display is other than 1', function () {
bidRequest = {
Expand Down Expand Up @@ -299,7 +328,7 @@ describe('OneVideoBidAdapter', function () {
pubId: 'OneMDisplay'
}
};
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
const width = bidRequest.params.video.playerWidth;
const height = bidRequest.params.video.playerHeight;
Expand Down Expand Up @@ -343,7 +372,7 @@ describe('OneVideoBidAdapter', function () {
pubId: 'OneMDisplay'
}
};
const requests = spec.buildRequests([ bidRequest ]);
const requests = spec.buildRequests([ bidRequest ], bidderRequest);
const data = requests[0].data;
const width = bidRequest.params.video.playerWidth;
const height = bidRequest.params.video.playerHeight;
Expand Down
0