Skip to content

User sync fixes for 7 25 0 #63

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

Merged
robson-viana merged 16 commits into from
May 2, 2023
Merged

User sync fixes for 7 25 0 #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
cde525f
User sync fixes.
robson-viana Apr 21, 2023
24a9203
Update insticatorBidAdapter.js
robson-viana Apr 21, 2023
76ad376
Merge branch '7.25.0-insticator' into user-sync-fixes-for-7-25-0
robson-viana Apr 21, 2023
ae1397a
Update insticatorBidAdapter_spec.js
robson-viana Apr 21, 2023
60dea85
Merge branch '7.25.0-insticator' into user-sync-fixes-for-7-25-0
robson-viana Apr 21, 2023
314b522
Revert "Update insticatorBidAdapter_spec.js"
robson-viana Apr 21, 2023
0ae7bbf
Revert "User sync fixes for 7 25 0 (#59)"
robson-viana Apr 21, 2023
4d13615
Update insticatorBidAdapter_spec.js
robson-viana Apr 21, 2023
abc10a9
Update insticatorBidAdapter_spec.js
robson-viana Apr 21, 2023
f77693d
User sync fixes.
robson-viana Apr 24, 2023
9e0e12f
Update insticatorBidAdapter.js
robson-viana Apr 24, 2023
45a565c
Update insticatorBidAdapter.js
robson-viana May 2, 2023
3d9fa09
Adding domain in the cookie.
robson-viana May 2, 2023
7f0176c
Merge branch '7.25.0-insticator' into user-sync-fixes-for-7-25-0
robson-viana May 2, 2023
c874721
Fixing unit test.
robson-viana May 2, 2023
10d5916
Adding logic for localhost.
robson-viana May 2, 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
40 changes: 9 additions & 31 deletions modules/insticatorBidAdapter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import {find} from '../src/polyfill.js';

const BIDDER_CODE = 'insticator';
const ENDPOINT = 'https://ex.ingage.tech/v1/openrtb'; // production endpoint
const USER_ID_KEY = 'hb_insticator_uid';
const USER_ID_KEY = 'instUid';
const USER_ID_COOKIE_EXP = 7776000000; // 90 days
const BID_TTL = 300; // 5 minutes
const GVLID = 910;
Expand All @@ -23,14 +23,10 @@ config.setDefaults({

function getUserId() {
let uid = localStorage.getItem(USER_ID_KEY);
if (uid && isUserIdValid(uid)) {
return uid;
}

uid = storage.getCookie(USER_ID_KEY);
if (uid && isUserIdValid(uid)) {
const expireIn = new Date(Date.now() + USER_ID_COOKIE_EXP).toUTCString();
storage.setCookie(USER_ID_KEY, uid, expireIn);
const domain = window.location.hostname.match(/[^.]*\.[^.]{2,3}(?:\.[^.]{2,3})?$/mg);
Copy link

@rohanInsticator rohanInsticator May 2, 2023 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can you add one more logic here to extract the top-level-domain from the hostname & use that as the cookie domain. This way we can share the cookie across publisher's subdomain?

Not sure if that regex match operation is already doing that or not.

Copy link
Author

@robson-viana robson-viana May 2, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, the regex match is taking the top level domain

image

storage.setCookie(USER_ID_KEY, uid, expireIn, 'none', `.${domain}`);
return uid;
}

Expand All @@ -44,36 +40,15 @@ function isUserIdValid(uid) {
function generateUserId() {
const uid = generateUUID();

if (isLocalStoreEnabled()) {
localStorage.setItem(USER_ID_KEY, uid);
return uid;
}

if (isCookieEnabled()) {
const expireIn = new Date(Date.now() + USER_ID_COOKIE_EXP).toUTCString();
storage.setCookie(USER_ID_KEY, uid, expireIn);
const domain = window.location.hostname.match(/[^.]*\.[^.]{2,3}(?:\.[^.]{2,3})?$/mg);
storage.setCookie(USER_ID_KEY, uid, expireIn, 'none', `.${domain}`);
}

return uid;
}

function isLocalStoreEnabled() {
let enabled = false;

try {
localStorage.setItem('prebid.localStoreTest', 'true');
enabled = Boolean(localStorage.getItem('prebid.localStoreTest'));
} catch (err) {
return false
} finally {
if (enabled) {
localStorage.removeItem('insticator.prebid.localStoreTest');
}
}

return enabled;
}

function isCookieEnabled() {
let enabled = false;

Expand Down Expand Up @@ -321,7 +296,10 @@ export const spec = {
buildRequests: function (validBidRequests, bidderRequest) {
const requests = [];
let endpointUrl = config.getConfig('insticator.endpointUrl') || ENDPOINT;
endpointUrl = endpointUrl.replace(/^http:/, 'https:');

if (endpointUrl.indexOf('localhost') === -1) {
endpointUrl = endpointUrl.replace(/^http:/, 'https:');
}

if (validBidRequests.length > 0) {
requests.push({
Expand Down
2 changes: 1 addition & 1 deletion test/spec/modules/insticatorBidAdapter_spec.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -335,7 +335,7 @@ describe('InsticatorBidAdapter', function () {
const requests = spec.buildRequests([bidRequest], bidderRequest);
const data = JSON.parse(requests[0].data);

expect(data.user.buyeruid).to.equal(USER_ID_STUBBED);
expect(data.user.id).to.equal(USER_ID_STUBBED);
});
it('should return empty regs object if no gdprConsent is passed', function () {
const requests = spec.buildRequests([bidRequest], { ...bidderRequest, ...{ gdprConsent: false } });
Expand Down