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

airgridRtdProvider: use provided tag insertion method loadExternalScript #9901

Merged
merged 16 commits into from
Jun 1, 2023
Merged

airgridRtdProvider: use provided tag insertion method loadExternalScript #9901

Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
ea68e95
chore: update `getAudiencesAsBidderOrtb2` implementation and test
naripok Mar 27, 2023
56abb14
Merge pull request #1 from AirGrid/chore/update-airgrid-rtd-module
naripok Mar 28, 2023
7b5f106
Merge remote-tracking branch 'upstream/master'
naripok Mar 29, 2023
a885439
chore: use provided tag insertion method
naripok Mar 29, 2023
b2d56ba
fix: add `airgrid` to `_approvedLoadExternalJSList`
naripok May 3, 2023
3209565
fix: use 'sdk' path if no publisherId is provided
naripok May 3, 2023
d5e12e6
Merge pull request #2 from AirGrid/chore/1459-use-tag-insertion-method
naripok May 3, 2023
c6d9fdd
Merge branch 'master' of https://github.com/prebid/Prebid.js
naripok May 3, 2023
665b1aa
Merge branch 'prebid:master' into master
naripok May 5, 2023
7798c95
fix: use accountId as path param for script url
naripok May 5, 2023
20a3926
fix: assign edktInitializor props before `loadExternalScript` call
naripok May 5, 2023
6cc0ac9
fix: set `edktInitializor.invoked` before calling `loadExternalScript`
naripok May 5, 2023
5b0ca57
Merge branch 'prebid:master' into master
naripok May 15, 2023
b2af960
fix: restore method for setting `user.ext.data`
naripok May 15, 2023
7bde0ca
fix: rollback changes to data setting method
naripok May 18, 2023
c4f8e53
Merge branch 'master' into master
naripok May 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
23 changes: 11 additions & 12 deletions modules/airgridRtdProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,9 @@ import {
deepAccess,
} from '../src/utils.js';
import { getGlobal } from '../src/prebidGlobal.js';
import {getStorageManager} from '../src/storageManager.js';
import {MODULE_TYPE_RTD} from '../src/activities/modules.js';
import { getStorageManager } from '../src/storageManager.js';
import { loadExternalScript } from '../src/adloader.js';
import { MODULE_TYPE_RTD } from '../src/activities/modules.js';

const MODULE_NAME = 'realTimeData';
const SUBMODULE_NAME = 'airgrid';
Expand All @@ -25,6 +26,11 @@ export const storage = getStorageManager({
moduleName: SUBMODULE_NAME,
});

function getModuleUrl(accountId) {
const path = accountId ?? 'sdk';
return `https://cdn.edkt.io/${path}/edgekit.min.js`;
}

/**
* Attach script tag to DOM
* @param {Object} rtdConfig
Expand All @@ -33,19 +39,12 @@ export const storage = getStorageManager({
export function attachScriptTagToDOM(rtdConfig) {
var edktInitializor = (window.edktInitializor = window.edktInitializor || {});
if (!edktInitializor.invoked) {
edktInitializor.invoked = true;
edktInitializor.accountId = rtdConfig.params.accountId;
edktInitializor.publisherId = rtdConfig.params.publisherId;
edktInitializor.apiKey = rtdConfig.params.apiKey;
edktInitializor.load = function (e) {
var p = e || 'sdk';
var n = document.createElement('script');
n.type = 'module';
n.async = true;
n.src = 'https://cdn.edkt.io/' + p + '/edgekit.min.js';
document.getElementsByTagName('head')[0].appendChild(n);
};
edktInitializor.load(edktInitializor.accountId);
edktInitializor.invoked = true;
const moduleSrc = getModuleUrl(rtdConfig.params.accountId);
loadExternalScript(moduleSrc, SUBMODULE_NAME);
}
}

Expand Down
3 changes: 2 additions & 1 deletion src/adloader.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,8 @@ const _approvedLoadExternalJSList = [
'improvedigital',
'aaxBlockmeter',
'confiant',
'arcspan'
'arcspan',
'airgrid'
]

/**
Expand Down
2 changes: 2 additions & 0 deletions test/spec/modules/airgridRtdProvider_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@ import { config } from 'src/config.js';
import { deepAccess } from 'src/utils.js';
import { getAdUnits } from '../../fixtures/fixtures.js';
import * as agRTD from 'modules/airgridRtdProvider.js';
import { loadExternalScript } from '../../../src/adloader.js';

const MATCHED_AUDIENCES = ['travel', 'sport'];
const RTD_CONFIG = {
Expand Down Expand Up @@ -40,6 +41,7 @@ describe('airgrid RTD Submodule', function () {
expect(agRTD.airgridSubmodule.init(RTD_CONFIG.dataProviders[0])).to.equal(
true
);
expect(loadExternalScript.called).to.be.true
});

it('should attach script to DOM with correct config', function () {
Expand Down