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

Eids uid string only #5047

Merged
merged 38 commits into from
Apr 1, 2020
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
33762d1
added support for pubcommon, digitrust, id5id
pm-harshad-mane Sep 12, 2019
0722354
added support for IdentityLink
pm-harshad-mane Sep 13, 2019
f2c32c0
changed the source for id5
pm-harshad-mane Sep 13, 2019
37163d1
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Sep 13, 2019
eaed987
added unit test cases
pm-harshad-mane Sep 13, 2019
602ee7e
changed source param for identityLink
pm-harshad-mane Sep 16, 2019
b6fcd36
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Sep 23, 2019
58381f3
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Sep 26, 2019
c9fb11b
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Oct 10, 2019
8ece7fd
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Oct 16, 2019
28d12a0
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Oct 16, 2019
05a55e1
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Oct 31, 2019
e8b10d5
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Nov 5, 2019
870085f
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Nov 12, 2019
844ce4e
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Nov 12, 2019
704eca3
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Nov 13, 2019
2565cb9
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Dec 4, 2019
1d75bd4
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Dec 4, 2019
6adde1e
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Dec 6, 2019
477c98a
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Dec 9, 2019
cef5422
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Dec 10, 2019
c110a7d
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Jan 9, 2020
e8fb062
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Feb 5, 2020
d77cd71
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Feb 17, 2020
817ce3f
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Feb 24, 2020
cda825e
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Feb 26, 2020
f34a3ec
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Feb 27, 2020
f106dc8
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 4, 2020
1f6937e
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 6, 2020
06ffe84
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 6, 2020
5448ceb
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 6, 2020
e9b90fe
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 11, 2020
a7a1d12
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 11, 2020
30b72df
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 26, 2020
76adbc9
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 30, 2020
50e13bc
Merge remote-tracking branch 'upstream/master'
pm-harshad-mane Mar 30, 2020
ad012dc
the user-id in eid should be string only
pm-harshad-mane Mar 30, 2020
d16b8ec
updated conversant bidder spec for eid-uid to be string
pm-harshad-mane Mar 30, 2020
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
2 changes: 1 addition & 1 deletion modules/userId/eids.js
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ function createEidObject(userIdData, subModuleKey) {
let eid = {};
eid.source = conf['source'];
const value = utils.isFn(conf['getValue']) ? conf['getValue'](userIdData) : userIdData;
if (value) {
if (utils.isStr(value)) {
const uid = { id: value, atype: conf['atype'] };
// getUidExt
if (utils.isFn(conf['getUidExt'])) {
Expand Down
6 changes: 3 additions & 3 deletions test/spec/modules/conversantBidAdapter_spec.js
Original file line number Diff line number Diff line change
Expand Up @@ -470,14 +470,14 @@ describe('Conversant adapter tests', function() {

// add pubcid to every entry
requests.forEach((unit) => {
Object.assign(unit, {userId: {pubcid: 112233, tdid: 223344, idl_env: 334455}});
Object.assign(unit, {userId: {pubcid: '112233', tdid: '223344', idl_env: '334455'}});
Object.assign(unit, {userIdAsEids: createEidsArray(unit.userId)});
});
// construct http post payload
const payload = spec.buildRequests(requests).data;
expect(payload).to.have.deep.nested.property('user.ext.eids', [
{source: 'adserver.org', uids: [{id: 223344, atype: 1, ext: {rtiPartner: 'TDID'}}]},
{source: 'liveramp.com', uids: [{id: 334455, atype: 1}]}
{source: 'adserver.org', uids: [{id: '223344', atype: 1, ext: {rtiPartner: 'TDID'}}]},
{source: 'liveramp.com', uids: [{id: '334455', atype: 1}]}
]);
});
});
Expand Down
22 changes: 17 additions & 5 deletions test/spec/modules/eids_spec.js
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
import {createEidsArray} from 'modules/userId/eids.js';
import {expect} from 'chai';

// Note: In unit tets cases for bidders, call the createEidsArray function over userId object that is used for calling fetchBids
// this way the request will stay consistent and unit test cases will not need lots of changes.
// Note: In unit tets cases for bidders, call the createEidsArray function over userId object that is used for calling fetchBids
// this way the request will stay consistent and unit test cases will not need lots of changes.

describe('eids array generation for known sub-modules', function() {
it('pubCommonId', function() {
Expand Down Expand Up @@ -158,12 +158,24 @@ describe('Negative case', function() {
expect(newEids.length).to.equal(0);
});

it('eids array generation for known sub-module with undefined value', function() {
it('eids array generation for known sub-module with non-string value', function() {
// pubCommonId
const userId = {
let userId = {
pubcid: undefined
};
const newEids = createEidsArray(userId);
let newEids = createEidsArray(userId);
expect(newEids.length).to.equal(0);
userId.pubcid = 123;
newEids = createEidsArray(userId);
expect(newEids.length).to.equal(0);
userId.pubcid = [];
newEids = createEidsArray(userId);
expect(newEids.length).to.equal(0);
userId.pubcid = {};
newEids = createEidsArray(userId);
expect(newEids.length).to.equal(0);
userId.pubcid = null;
newEids = createEidsArray(userId);
expect(newEids.length).to.equal(0);
});
});