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

Revert "gptPreAuction: fix missing gpid when using mcmEnabled" #12360

Merged
merged 1 commit into from
Oct 23, 2024
Merged

Revert "gptPreAuction: fix missing gpid when using mcmEnabled" #12360

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
16 changes: 6 additions & 10 deletions modules/gptPreAuction.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,25 +76,21 @@ export const appendGptSlots = adUnits => {
return acc;
}, {});

const adUnitPaths = {};

window.googletag.pubads().getSlots().forEach(slot => {
const matchingAdUnitCode = find(Object.keys(adUnitMap), customGptSlotMatching
? customGptSlotMatching(slot)
: isAdUnitCodeMatchingSlot(slot));

if (matchingAdUnitCode) {
const path = adUnitPaths[matchingAdUnitCode] = slot.getAdUnitPath();
const adserver = {
name: 'gam',
adslot: sanitizeSlotPath(path)
adslot: sanitizeSlotPath(slot.getAdUnitPath())
};
adUnitMap[matchingAdUnitCode].forEach((adUnit) => {
deepSetValue(adUnit, 'ortb2Imp.ext.data.adserver', Object.assign({}, adUnit.ortb2Imp?.ext?.data?.adserver, adserver));
});
}
});
return adUnitPaths;
};

const sanitizeSlotPath = (path) => {
Expand All @@ -107,7 +103,7 @@ const sanitizeSlotPath = (path) => {
return path;
}

const defaultPreAuction = (adUnit, adServerAdSlot, adUnitPath) => {
const defaultPreAuction = (adUnit, adServerAdSlot) => {
const context = adUnit.ortb2Imp.ext.data;

// use pbadslot if supplied
Expand All @@ -121,7 +117,7 @@ const defaultPreAuction = (adUnit, adServerAdSlot, adUnitPath) => {
}

// find all GPT slots with this name
var gptSlots = window.googletag.pubads().getSlots().filter(slot => slot.getAdUnitPath() === adUnitPath);
var gptSlots = window.googletag.pubads().getSlots().filter(slot => slot.getAdUnitPath() === adServerAdSlot);

if (gptSlots.length === 0) {
return; // should never happen
Expand Down Expand Up @@ -171,7 +167,7 @@ function warnDeprecation(adUnit) {
}

export const makeBidRequestsHook = (fn, adUnits, ...args) => {
const adUnitPaths = appendGptSlots(adUnits);
appendGptSlots(adUnits);
const { useDefaultPreAuction, customPreAuction } = _currentConfig;
adUnits.forEach(adUnit => {
// init the ortb2Imp if not done yet
Expand All @@ -194,9 +190,9 @@ export const makeBidRequestsHook = (fn, adUnits, ...args) => {
let adserverSlot = deepAccess(context, 'data.adserver.adslot');
let result;
if (customPreAuction) {
result = customPreAuction(adUnit, adserverSlot, adUnitPaths[adUnit.code]);
result = customPreAuction(adUnit, adserverSlot);
} else if (useDefaultPreAuction) {
result = defaultPreAuction(adUnit, adserverSlot, adUnitPaths[adUnit.code]);
result = defaultPreAuction(adUnit, adserverSlot);
}
if (result) {
context.gpid = context.data.pbadslot = result;
Expand Down
38 changes: 0 additions & 38 deletions test/spec/modules/gptPreAuction_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,17 +209,6 @@ describe('GPT pre-auction module', () => {
expect(adUnit.ortb2Imp.ext.data.adserver).to.deep.equal({ name: 'gam', adslot: '/12345/slotCode2' });
});

it('returns full ad unit path even if mcmEnabled is true', () => {
config.setConfig({ gptPreAuction: { enabled: true, mcmEnabled: true } });
window.googletag.pubads().setSlots([
makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
]);
const adUnit = {code: '/12345,21212/slot'};
expect(appendGptSlots([adUnit])).to.eql({
'/12345,21212/slot': '/12345,21212/slot'
})
})

it('will not trim child id if mcmEnabled is not set to true', () => {
window.googletag.pubads().setSlots([
makeSlot({ code: '/12345,21212/slotCode1', divId: 'div1' }),
Expand Down Expand Up @@ -470,23 +459,6 @@ describe('GPT pre-auction module', () => {
expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
});

it('should pass full slot path to customPreAuction when mcmEnabled is true', () => {
const customPreAuction = sinon.stub();
config.setConfig({
gptPreAuction: {
enabled: true,
mcmEnabled: true,
customPreAuction
}
});
window.googletag.pubads().setSlots([
makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
]);
const adUnit = {code: '/12345,21212/slot'};
makeBidRequestsHook(sinon.stub(), [adUnit]);
sinon.assert.calledWith(customPreAuction, adUnit, '/12345/slot', adUnit.code);
});

it('should use useDefaultPreAuction logic', () => {
config.setConfig({
gptPreAuction: {
Expand Down Expand Up @@ -568,16 +540,6 @@ describe('GPT pre-auction module', () => {
runMakeBidRequests(testAdUnits);
expect(returnedAdUnits).to.deep.equal(expectedAdUnits);
});

it('sets gpid when mcmEnabled: true', () => {
config.setConfig({ gptPreAuction: { enabled: true, mcmEnabled: true } });
window.googletag.pubads().setSlots([
makeSlot({ code: '/12345,21212/slot', divId: 'div1' }),
]);
const adUnit = {code: '/12345,21212/slot'};
makeBidRequestsHook(sinon.stub(), [adUnit]);
expect(adUnit.ortb2Imp.ext.gpid).to.eql('/12345/slot');
});
});

describe('pps gpt config', () => {
Expand Down