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

Jump to bottom

Tappx Bid Adapter: Fix/os and vendor #9468

Merged
merged 15 commits into from
Feb 28, 2023
Merged

Tappx Bid Adapter: Fix/os and vendor #9468

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
bcca521
Fix: creating host correctly when http or https are added from the be…
Aug 23, 2022
f910999
Merge pull request #2 from prebid/master
prebidtappx Aug 23, 2022
ac570de
Fix :: Changed double quotes for single quotes
Aug 24, 2022
ead6e49
Fix :: Getting the full page URL
Oct 28, 2022
1445550
Fix :: Changed order params
Oct 28, 2022
52b196d
Fix :: Replaced quotes from double to simple
Oct 28, 2022
687ad42
Fix :: Adapting format to lint
Oct 28, 2022
4e6bd52
Remove TODO comment
Nov 2, 2022
61df4bc
Added more controls
Ruben-Tappx Nov 10, 2022
9f7d94d
camelcase fix
Ruben-Tappx Nov 10, 2022
0ba3328
Changed test
Ruben-Tappx Nov 10, 2022
bebfce8
Merge branch 'prebid:master' into fix/getCorrectSitePage
prebidtappx Nov 15, 2022
1bd9bed
Remove "inIframe" util
Ruben-Tappx Nov 15, 2022
f75940b
Fix: solved error getOs and created getVendor functions
Jan 26, 2023
73a0978
Fix: Solved CircelCI format problems
Jan 26, 2023
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
36 changes: 28 additions & 8 deletions modules/tappxBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const BIDDER_CODE = 'tappx';
const GVLID_CODE = 628;
const TTL = 360;
const CUR = 'USD';
const TAPPX_BIDDER_VERSION = '0.1.1005';
const TAPPX_BIDDER_VERSION = '0.1.2';
const TYPE_CNN = 'prebidjs';
const LOG_PREFIX = '[TAPPX]: ';
const VIDEO_SUPPORT = ['instream', 'outstream'];
Expand Down Expand Up @@ -271,12 +271,28 @@ function buildOneRequest(validBidRequests, bidderRequest) {
api[0] = deepAccess(validBidRequests, 'params.api') ? deepAccess(validBidRequests, 'params.api') : [3, 5];
} else {
let bundle = _extractPageUrl(validBidRequests, bidderRequest);
let site = {};
let site = deepAccess(validBidRequests, 'params.site') || {};
site.name = bundle;
site.page = bidderRequest?.refererInfo?.page || deepAccess(validBidRequests, 'params.site.page') || bidderRequest?.refererInfo?.topmostLocation || window.location.href || bundle;
site.domain = bundle;
site.ref = bidderRequest?.refererInfo?.ref || window.top.document.referrer || '';
site.ext = {};
site.ext.is_amp = bidderRequest?.refererInfo?.isAmp || 0;
site.ext.page_da = deepAccess(validBidRequests, 'params.site.page') || '-';
site.ext.page_rip = bidderRequest?.refererInfo?.page || '-';
site.ext.page_rit = bidderRequest?.refererInfo?.topmostLocation || '-';
site.ext.page_wlh = window.location.href || '-';
publisher.name = bundle;
publisher.domain = bundle;
let sitename = document.getElementsByTagName('meta')['title'];
if (sitename && sitename.content) {
site.name = sitename.content;
}
tagid = `${site.name}_typeAdBanVid_${getOs()}`;
let keywords = document.getElementsByTagName('meta')['keywords'];
if (keywords && keywords.content) {
site.keywords = keywords.content;
}
payload.site = site;
}
// < App/Site object
Expand All @@ -295,9 +311,9 @@ function buildOneRequest(validBidRequests, bidderRequest) {
if (
((bannerMediaType.sizes[0].indexOf(480) >= 0) && (bannerMediaType.sizes[0].indexOf(320) >= 0)) ||
((bannerMediaType.sizes[0].indexOf(768) >= 0) && (bannerMediaType.sizes[0].indexOf(1024) >= 0))) {
banner.pos = 7;
banner.pos = 0;
} else {
banner.pos = 4;
banner.pos = 0;
}

banner.api = api;
Expand Down Expand Up @@ -388,7 +404,7 @@ function buildOneRequest(validBidRequests, bidderRequest) {
device.w = screen.width;
device.dnt = getDNT() ? 1 : 0;
device.language = getLanguage();
device.make = navigator.vendor ? navigator.vendor : '';
device.make = getVendor();

let geo = {};
geo.country = deepAccess(validBidRequests, 'params.geo.country');
Expand Down Expand Up @@ -474,7 +490,12 @@ function getLanguage() {

function getOs() {
let ua = navigator.userAgent;
if (ua == null) { return 'unknown'; } else if (ua.match(/(iPhone|iPod|iPad)/)) { return 'ios'; } else if (ua.match(/Android/)) { return 'android'; } else if (ua.match(/Window/)) { return 'windows'; } else { return 'unknown'; }
if (ua.indexOf('Windows') != -1) { return 'Windows'; } else if (ua.indexOf('Mac OS X') != -1) { return 'macOS'; } else if (ua.match(/Android/)) { return 'Android'; } else if (ua.match(/(iPhone|iPod|iPad)/)) { return 'iOS'; } else if (ua.indexOf('Linux') != -1) { return 'Linux'; } else { return 'Unknown'; }
}

function getVendor() {
let ua = navigator.userAgent;
if (ua.indexOf('Chrome') != -1) { return 'Google'; } else if (ua.indexOf('Firefox') != -1) { return 'Mozilla'; } else if (ua.indexOf('Safari') != -1) { return 'Apple'; } else if (ua.indexOf('Edge') != -1) { return 'Microsoft'; } else if (ua.indexOf('MSIE') != -1 || ua.indexOf('Trident') != -1) { return 'Microsoft'; } else { return ''; }
}

export function _getHostInfo(validBidRequests) {
Expand Down Expand Up @@ -565,8 +586,7 @@ export function _checkParamDataType(key, value, datatype) {
}

export function _extractPageUrl(validBidRequests, bidderRequest) {
// TODO: does the fallback make sense?
let url = bidderRequest?.refererInfo?.page || bidderRequest.refererInfo?.topmostLocation;
let url = bidderRequest?.refererInfo?.page || bidderRequest?.refererInfo?.topmostLocation;
return parseDomain(url, {noLeadingWww: true});
}

Expand Down