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

Many SNEKs: schain, digitrust, pixel beacons, 3.0 compliance #20

Closed
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
39 commits
Select commit Hold shift + click to select a range
2121f18
Outcon bid adapter. (#4161)
TinchoF Oct 8, 2019
3ee0d97
Adding workflow to run end to end tests (#4230)
jaiminpanchal27 Oct 8, 2019
6af3e5f
update prebid path for e2e test pages (#4274)
jaiminpanchal27 Oct 8, 2019
6b16b73
Prebid 2.35.0 release
Oct 8, 2019
f7e5de7
Increment pre version
Oct 8, 2019
dceba37
Add usersync to adpone adapter (#4245)
seergiioo6 Oct 10, 2019
64f6718
Revert GumGum Adapter 2.28 resizing changes (#4277)
WayneYang1 Oct 10, 2019
57c6666
SpotX Bid Adapter: Support schain, ID5 object, Google consent object,…
codybonney Oct 11, 2019
842e45f
Update Rubicon Analytics Adapter `bidId` to match PBS (#4156)
Oct 11, 2019
b3371df
SmartRTB adapter update (#4246)
evanmsmrtb Oct 14, 2019
ba6c303
Support Vast Track (#4276)
tjeastmond Oct 14, 2019
aafd041
Added 1000x250 size (#4295)
hdeodhar Oct 14, 2019
3f3e743
prepare vidazoo adapter for v3.0 (#4291)
thewizarodofoz Oct 14, 2019
715f7c3
Improve Digital adapter: support schain (#4286)
jbartek25 Oct 14, 2019
b7d9f9f
LiveIntent Identity Module. (#4178)
jankoulaga Oct 14, 2019
e27fc40
updating liveintent eids source (#4300)
bretg Oct 14, 2019
7823e5b
fix appnexusBidAdapter view-script regex (#4289)
jsnellbaker Oct 15, 2019
c3ba14c
33Across adding bidder specific extension field (#4298)
thomas-33across Oct 15, 2019
56b611f
PubMatic to support LiveIntent User Id sub-module (#4306)
pm-harshad-mane Oct 15, 2019
ae63dde
Finteza Analytics Adapter: fix cookies (#4292)
finteza Oct 15, 2019
3965d3a
Update LockerDome adapter to support Prebid 3.0 (#4301)
margsliu Oct 15, 2019
31b3c1d
Returning the `IdResponse` type with an obj + callback. Fix for 4304…
jankoulaga Oct 15, 2019
46bfb02
ShowHeroes adapter - expanded outstream support (#4222)
vadim-mazzherin Oct 15, 2019
e4d3ff5
[Orbidder-Adapter] Add bidRequestCount and remove bid.params.keyValue…
Oct 15, 2019
6fb6706
PulsePoint: remove usage of deprecated utils method / prep for 3.0 (#…
anand-venkatraman Oct 15, 2019
d549a40
Use isArray method (#4288)
jaiminpanchal27 Oct 15, 2019
fceb471
Add Parrable ID submodule (#4266)
eyas-ranjous Oct 15, 2019
29520f3
Prebid 2.36.0 Release
bretg Oct 15, 2019
f498ba8
Increment pre version
bretg Oct 15, 2019
b363e97
Support schain module and send bidfloor param in Sharethrough adapter…
madma Oct 15, 2019
493bd5e
Platform One Analytics Adapter (#4233)
hbanalytics Oct 15, 2019
44192a8
Fix parrable id integration example (#4317)
eyas-ranjous Oct 16, 2019
cb3c457
Improve Digital adapter: support for video (#4318)
jbartek25 Oct 16, 2019
fd865b1
Gamoshi: Update aliases list. Add support for userSync. (#4319)
Oct 16, 2019
f1fa50b
Merge branch 'master' of https://github.com/prebid/Prebid.js
aprakash-sovrn Oct 16, 2019
2da0604
schain and digitrust
aprakash-sovrn Oct 2, 2019
38337c0
pixel beacons
aprakash-sovrn Oct 7, 2019
0dd6eb5
unit tests and fixes from testing
aprakash-sovrn Oct 8, 2019
1bbab9e
Prebid 3.0 updates
aprakash-sovrn Oct 16, 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
133 changes: 86 additions & 47 deletions .circleci/config.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,54 +2,93 @@
#
# Check https://circleci.com/docs/2.0/language-javascript/ for more details
#

aliases:
- &environment
docker:
# specify the version you desire here
- image: circleci/node:8.9.0

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4
working_directory: ~/Prebid.js

- &restore_dep_cache
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- &save_dep_cache
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- &install
name: Install gulp cli
command: sudo npm install -g gulp-cli

- &run_unit_test
name: BrowserStack testing
command: gulp test --browserstack --nolintfix

- &run_endtoend_test
name: BrowserStack End to end testing
command: echo "127.0.0.1 test.localhost" | sudo tee -a /etc/hosts && gulp e2e-test --host=test.localhost

# Download and run BrowserStack local
- &setup_browserstack
name : Download BrowserStack Local binary and start it.
command : |
# Download the browserstack binary file
wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
# Unzip it
unzip BrowserStackLocal-linux-x64.zip
# Run the file with user's access key
./BrowserStackLocal ${BROWSERSTACK_ACCESS_KEY} &

- &unit_test_steps
- checkout
- restore_cache: *restore_dep_cache
- run: npm install
- save_cache: *save_dep_cache
- run: *install
- run: *setup_browserstack
- run: *run_unit_test

- &endtoend_test_steps
- checkout
- restore_cache: *restore_dep_cache
- run: npm install
- save_cache: *save_dep_cache
- run: *install
- run: *setup_browserstack
- run: *run_endtoend_test

version: 2
jobs:
build:
docker:
# specify the version you desire here
- image: circleci/node:8.9.0
<<: *environment
steps: *unit_test_steps

# Specify service dependencies here if necessary
# CircleCI maintains a library of pre-built images
# documented at https://circleci.com/docs/2.0/circleci-images/
# - image: circleci/mongo:3.4.4

working_directory: ~/Prebid.js

steps:
- checkout

# Download and cache dependencies
- restore_cache:
keys:
- v1-dependencies-{{ checksum "package.json" }}
# fallback to using the latest cache if no exact match is found
- v1-dependencies-

- run: npm install

- save_cache:
paths:
- node_modules
key: v1-dependencies-{{ checksum "package.json" }}

- run: sudo npm install -g gulp-cli

# Download and run BrowserStack local
- run:
name : Download BrowserStack Local binary and start it.
command : |
# Download the browserstack binary file
wget "https://www.browserstack.com/browserstack-local/BrowserStackLocal-linux-x64.zip"
# Unzip it
unzip BrowserStackLocal-linux-x64.zip
# Run the file with user's access key
./BrowserStackLocal ${BROWSERSTACK_ACCESS_KEY} &
# run tests!
- run:
name: BrowserStack testing
command: gulp test --browserstack --nolintfix
# run e2e tests
- run:
name: Functional testing
command: echo "127.0.0.1 test.localhost" | sudo tee -a /etc/hosts && gulp e2e-test --host=test.localhost --file=./test/spec/e2e/banner/basic_banner_ad.spec.js
e2etest:
<<: *environment
steps: *endtoend_test_steps

workflows:
version: 2
commit:
jobs:
- build
nightly:
triggers:
- schedule:
cron: "0 0 * * *"
filters:
branches:
only:
- master
jobs:
- e2etest
11 changes: 11 additions & 0 deletions integrationExamples/gpt/userId_example.html
Original file line number Diff line number Diff line change
Expand Up @@ -152,6 +152,17 @@
refreshInSeconds: 8*3600 // Refresh frequency of cookies, defaulting to 'expires'
},

}, {
name: "parrableId",
params: {
// change to Parrable Partner Client ID(s) you received from the Parrable Partners you are using
partner: '30182847-e426-4ff9-b2b5-9ca1324ea09b'
},
storage: {
type: "cookie",
name: "_parrable_eid", // create a cookie with this name
expires: 365 // cookie can last for a year
}
}, {
name: "pubCommonId",
storage: {
Expand Down
2 changes: 1 addition & 1 deletion integrationExamples/longform/basic_w_bidderSettings.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Prebid Freewheel Integration Demo</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
<script src="/build/dev/prebid.js" async=true></script>
<script src="/build/dist/prebid.js" async=true></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
Expand Down
2 changes: 1 addition & 1 deletion integrationExamples/longform/basic_w_priceGran.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
<title>Prebid Freewheel Integration Demo</title>
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<!-- <script async src="//acdn.adnxs.com/prebid/not-for-prod/1/prebid.js"></script> -->
<script src="/build/dev/prebid.js" async=true></script>
<script src="/build/dist/prebid.js" async=true></script>
<script type="text/javascript" src="//ajax.googleapis.com/ajax/libs/jquery/1.7.2/jquery.min.js"></script>
<script src="https://code.jquery.com/jquery-3.3.1.slim.min.js"
integrity="sha384-q8i/X+965DzO0rT7abK41JStQIAqVgRVzpbzo5smXKp4YfRvH+8abtTE1Pi6jizo"
Expand Down
4 changes: 3 additions & 1 deletion modules/.submodules.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,9 @@
"userId": [
"digiTrustIdSystem",
"id5IdSystem",
"criteortusIdSystem"
"criteortusIdSystem",
"parrableIdSystem",
"liveIntentIdSystem"
],
"adpod": [
"freeWheelAdserverVideo",
Expand Down
1 change: 1 addition & 0 deletions modules/33acrossBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,6 +110,7 @@ function _createServerRequest(bidRequest, gdprConsent = {}) {
};
ttxRequest.ext = {
ttx: {
prebidStartedAt: Date.now(),
caller: [{
'name': 'prebidjs',
'version': '$prebid.version$'
Expand Down
29 changes: 26 additions & 3 deletions modules/adponeBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -3,15 +3,29 @@ import {registerBidder} from '../src/adapters/bidderFactory';

const ADPONE_CODE = 'adpone';
const ADPONE_ENDPOINT = 'https://rtb.adpone.com/bid-request';
const ADPONE_SYNC_ENDPOINT = 'https://eu-ads.adpone.com';
const ADPONE_REQUEST_METHOD = 'POST';
const ADPONE_CURRENCY = 'EUR';

function _createSync() {
return {
type: 'iframe',
url: ADPONE_SYNC_ENDPOINT
}
}

function getUserSyncs(syncOptions) {
return (syncOptions && syncOptions.iframeEnabled) ? _createSync() : ([]);
}

export const spec = {
code: ADPONE_CODE,
supportedMediaTypes: [BANNER],

getUserSyncs,

isBidRequestValid: bid => {
return !!bid.params.placementId && !!bid.bidId;
return !!bid.params.placementId && !!bid.bidId && bid.bidder === 'adpone'
},

buildRequests: bidRequests => {
Expand All @@ -30,7 +44,16 @@ export const spec = {
}))
};

return { method: ADPONE_REQUEST_METHOD, url, data }
const options = {
withCredentials: true
};

return {
method: ADPONE_REQUEST_METHOD,
url,
data,
options,
};
});
},

Expand Down Expand Up @@ -66,7 +89,7 @@ export const spec = {
const encodedBuf = window.btoa(bidString);
const img = new Image(1, 1);
img.src = `https://rtb.adpone.com/prebid/analytics?q=${encodedBuf}`;
}
},

};

Expand Down
2 changes: 1 addition & 1 deletion modules/appnexusBidAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ const SOURCE = 'pbjs';
const MAX_IMPS_PER_REQUEST = 15;
const mappingFileUrl = '//acdn.adnxs.com/prebid/appnexus-mapping/mappings.json';
const SCRIPT_TAG_START = '<script';
const VIEWABILITY_URL_START = /http:\/\/cdn\.adnxs\.com\/v/;
const VIEWABILITY_URL_START = /\/\/cdn\.adnxs\.com\/v/;
const VIEWABILITY_FILE_NAME = 'trk.js';

export const spec = {
Expand Down
48 changes: 45 additions & 3 deletions modules/fintezaAnalyticsAdapter.js
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ const SESSION_ID = '_fz_ssn';
const SESSION_DURATION = 30 * 60 * 1000;
const SESSION_RAND_PART = 9;
const TRACK_TIME_KEY = '_fz_tr';
const UNIQ_ID_KEY = '_fz_uniq';

function getPageInfo() {
const pageInfo = {
Expand All @@ -32,6 +33,42 @@ function getPageInfo() {
return pageInfo;
}

function getUniqId() {
let cookies;

try {
cookies = parseCookies(document.cookie);
} catch (a) {
cookies = {};
}

let isUniqFromLS;
let uniq = cookies[ UNIQ_ID_KEY ];
if (!uniq) {
try {
if (window.localStorage) {
uniq = window.localStorage.getItem(UNIQ_ID_KEY) || '';
isUniqFromLS = true;
}
} catch (b) {}
}

if (uniq && isNaN(uniq)) {
uniq = null;
}

if (uniq && isUniqFromLS) {
let expires = new Date();
expires.setFullYear(expires.getFullYear() + 10);

try {
document.cookie = UNIQ_ID_KEY + '=' + uniq + '; path=/; expires=' + expires.toUTCString();
} catch (e) {}
}

return uniq;
}

function initFirstVisit() {
let now;
let visitDate;
Expand Down Expand Up @@ -330,6 +367,10 @@ function prepareTrackData(evtype, args) {
ac: getAntiCacheParam(),
})

if (fntzAnalyticsAdapter.context.uniqId) {
trackData.fz_uniq = fntzAnalyticsAdapter.context.uniqId;
}

if (session.id) {
trackData.ssn = session.id;
}
Expand All @@ -347,12 +388,12 @@ function sendTrackRequest(trackData) {
try {
ajax(
fntzAnalyticsAdapter.context.host,
null, // Callback
null,
trackData,
{
method: 'GET',
contentType: 'application/x-www-form-urlencoded',
// preflight: true,
withCredentials: true,
contentType: 'application/x-www-form-urlencoded'
},
);
saveTrackRequestTime();
Expand Down Expand Up @@ -396,6 +437,7 @@ fntzAnalyticsAdapter.enableAnalytics = function (config) {
bidWonTrack: config.options.bidWonTrack || BID_WON_TRACK,
firstVisit: initFirstVisit(),
screenResolution: `${window.screen.width}x${window.screen.height}`,
uniqId: getUniqId(),
pageInfo: getPageInfo(),
};

Expand Down
Loading