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

Halo RTD Module: FPD 2.0 Updates & add ID system tests #6505

Merged
merged 16 commits into from
Apr 19, 2021
Merged

Halo RTD Module: FPD 2.0 Updates & add ID system tests #6505

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
28e1ad1
fix appnexus segment field format
Nov 20, 2020
dd39129
Merge remote-tracking branch 'upstream/master'
Nov 23, 2020
5c29988
Merge remote-tracking branch 'upstream/master'
Nov 30, 2020
7a12227
Merge remote-tracking branch 'upstream/master'
Dec 28, 2020
0711496
Merge remote-tracking branch 'upstream/master'
Feb 5, 2021
76d79f1
Merge branch 'master' of https://github.com/prebid/Prebid.js
Feb 17, 2021
b824ce9
Merge remote-tracking branch 'upstream/master'
Mar 22, 2021
155c635
ortb2 fpd updates
Mar 31, 2021
f97eff5
Merge remote-tracking branch 'upstream/master'
Mar 31, 2021
5ae9255
Merge branch 'fpd2spec'
Mar 31, 2021
203ec63
update halo ntegration example
Mar 31, 2021
9ece7b2
fix cached id naming & access
Apr 1, 2021
a32d6ef
gvlid storageManager and get/set update
Apr 15, 2021
1df5d3b
getConfig update
Apr 15, 2021
b6d6bfb
re-order exports
Apr 15, 2021
26a1d32
stub local storage methods
Apr 15, 2021
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
3 changes: 2 additions & 1 deletion modules/haloIdSystem.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,9 @@ import {submodule} from '../src/hook.js';
import * as utils from '../src/utils.js';

const MODULE_NAME = 'haloId';
const AU_GVLID = 561;

export const storage = getStorageManager();
export const storage = getStorageManager(AU_GVLID, 'halo');

/** @type {Submodule} */
export const haloIdSubmodule = {
Expand Down
14 changes: 6 additions & 8 deletions modules/haloRtdProvider.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,10 +12,11 @@ import {getStorageManager} from '../src/storageManager.js';
import {submodule} from '../src/hook.js';
import {isFn, isStr, isPlainObject, mergeDeep, logError} from '../src/utils.js';

export const storage = getStorageManager();

const MODULE_NAME = 'realTimeData';
const SUBMODULE_NAME = 'halo';
const AU_GVLID = 561;

export const storage = getStorageManager(AU_GVLID, SUBMODULE_NAME);

export const HALOID_LOCAL_NAME = 'auHaloId';
export const RTD_LOCAL_NAME = 'auHaloRtd';
Expand Down Expand Up @@ -69,15 +70,12 @@ function paramOrDefault(param, defaultVal) {
* @param {Object} rtdConfig
*/
export function addRealTimeData(bidConfig, rtd, rtdConfig) {
if (!isPlainObject(config.getConfig().ortb2)) {
config.setConfig({ortb2: {}});
}
let ortb2 = config.getConfig().ortb2 || {};
antlauzon marked this conversation as resolved.
Show resolved Hide resolved

if (rtdConfig.params && rtdConfig.params.handleRtd) {
rtdConfig.params.handleRtd(bidConfig, rtd, rtdConfig, config);
} else if (rtd.ortb2) {
let mergedOrtb = mergeLazy(config.getConfig().ortb2, rtd.ortb2);
config.setConfig({ortb2: mergedOrtb});
config.setConfig({ortb2: mergeLazy(ortb2, rtd.ortb2)});
}
}

Expand All @@ -89,7 +87,7 @@ export function addRealTimeData(bidConfig, rtd, rtdConfig) {
* @param {Object} userConsent
*/
export function getRealTimeData(bidConfig, onDone, rtdConfig, userConsent) {
if (isPlainObject(rtdConfig.params) && rtdConfig.params.segmentCache) {
if (rtdConfig && isPlainObject(rtdConfig.params) && rtdConfig.params.segmentCache) {
let jsonData = storage.getDataFromLocalStorage(RTD_LOCAL_NAME);

if (jsonData) {
Expand Down