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

Admixer ID System: add userId submodule #6238

Merged
merged 26 commits into from
Apr 6, 2021
Merged
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
26 commits
Select commit Hold shift + click to select a range
0b48ea9
Migrating to Prebid 1.0
Oct 24, 2017
6ec18f4
Migrating to Prebid 1.0
Dec 11, 2017
63928ed
Fix spec
Dec 11, 2017
1adaf95
Merge branch 'master1'
Dec 19, 2017
f24a281
Merge remote-tracking branch 'Prebid.js/master'
Galphimbl Apr 27, 2020
961c25f
add gdpr and usp
Galphimbl Apr 27, 2020
81b156e
remove changes in gdpr_hello_world.html
Galphimbl Apr 27, 2020
c5831c7
Merge remote-tracking branch 'Prebid.js/master'
Galphimbl Apr 28, 2020
3315d3c
Update gdpr_hello_world.html
Galphimbl May 5, 2020
020d732
Merge branch 'prebid.js-master'
Galphimbl Sep 7, 2020
9a99ceb
Merge branch 'prebid.js-master'
Galphimbl Nov 23, 2020
891faba
add user syncs
Galphimbl Nov 24, 2020
ee38d00
remove comments
Galphimbl Nov 24, 2020
dfd97f6
tests
Galphimbl Nov 25, 2020
b377bb0
Merge branch 'prebid.js-master'
Galphimbl Nov 27, 2020
50b7b8f
Merge branch 'prebid.js-master'
Galphimbl Dec 4, 2020
d27a7ed
Merge branch 'prebid.js-master'
Galphimbl Jan 14, 2021
0dd729c
admixer id system
Galphimbl Jan 28, 2021
4f02a79
Merge branch 'prebid.js-master'
Galphimbl Jan 28, 2021
c1932b6
Merge branch 'master' into id-system
Galphimbl Jan 28, 2021
713d23e
admixer id system
Galphimbl Jan 28, 2021
517a397
admixer id system eids.md userId.md
Galphimbl Jan 31, 2021
0387a68
admixer id system .submodules.json
Galphimbl Jan 31, 2021
cefe9d1
admixer id system
Galphimbl Apr 5, 2021
86ce4e5
Merge branch 'prebid.js-master' into id-system
Galphimbl Apr 5, 2021
f496e22
Merge branch 'prebid.js-master' into id-system
Galphimbl Apr 6, 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
Prev Previous commit
Next Next commit
admixer id system eids.md userId.md
  • Loading branch information
Galphimbl committed Jan 31, 2021
commit 517a397f082c477bc82371ac7b607a6c652ef3f1
7 changes: 7 additions & 0 deletions modules/userId/eids.md
Original file line number Diff line number Diff line change
Expand Up @@ -148,6 +148,13 @@ userIdAsEids = [
id: 'some-random-id-value',
atype: 1
}]
},
{
source: 'admixer.net',
uids: [{
id: 'some-random-id-value',
atype: 1
}]
}
]
```
24 changes: 24 additions & 0 deletions modules/userId/userId.md
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,18 @@ pbjs.setConfig({
name: '_criteoId',
expires: 1
}
}, {
name: 'admixerId',
params: {
pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
},
storage: {
type: 'cookie',
name: '__adm__admixer',
expires: 30
}
}],
syncDelay: 5000,
auctionDelay: 1000
Expand Down Expand Up @@ -155,6 +167,18 @@ pbjs.setConfig({
name: '_criteoId',
expires: 1
}
}, {
name: 'admixerId',
params: {
pid: "4D393FAC-B6BB-4E19-8396-0A4813607316", // example id
e: "3d400b57e069c993babea0bd9efa79e5dc698e16c042686569faae20391fd7ea", // example hashed email (sha256)
p: "05de6c07eb3ea4bce45adca4e0182e771d80fbb99e12401416ca84ddf94c3eb9" //example hashed phone (sha256)
},
storage: {
type: 'html5',
name: '__adm__admixer',
expires: 30
}
}],
syncDelay: 5000
}
Expand Down