jason/DigitalConsumer.FixMyGlass
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #344 from Safelite/feature/CSR-394

Browse source 
Cookie sometimes contains more than one value
This commit is contained in:
Frank Rua 2022-04-14 12:00:26 -04:00 committed by GitHub
commit e5384bcd5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/helpers/heritage-integration/cookie-helper.js
View file

@ -57,9 +57,16 @@ export function getCookieDomainValue() {
Returns empty string if cookie not found or "did" string not present. Returns empty string if cookie not found or "did" string not present.
*/ */
export function getDeviceIdValue(){ export function getDeviceIdValue(){
const cookieValue = getCookieByName(cookieNames.DXDEV); // Sometimes these cookie contains more than the device ID.
const cookieValueMatch = cookieValue.match("(?<=did=).*?(?=&)"); const cookieValue = getCookieValueByName(cookieNames.DXDEV);
const cookieValuesSplit = cookieValue.split('=');
// If this is the only value, just use that.
if(cookieValuesSplit.length === 2 && cookieValuesSplit[0] === 'did'){
return cookieValuesSplit[1];
}
const cookieValueMatch = cookieValue.match("(?<=did=).*?(?=&)");
if(cookieValueMatch){ if(cookieValueMatch){
return cookieValueMatch[0]; return cookieValueMatch[0];
} }
@ -71,7 +78,7 @@ export function getDeviceIdValue(){
Gets value of sid cookie, returns empty string if not found. Gets value of sid cookie, returns empty string if not found.
*/ */
export function getSessionIdValue(){ export function getSessionIdValue(){
const cookieValue = getCookieByName(cookieNames.SESSION_ID); const cookieValue = getCookieValueByName(cookieNames.SESSION_ID);
if(cookieValue){ if(cookieValue){
return cookieValue; return cookieValue;
@ -84,7 +91,7 @@ export function getSessionIdValue(){
Gets value of skey cookie, returns 0 if not found. Gets value of skey cookie, returns 0 if not found.
*/ */
export function getSessionKeyValue(){ export function getSessionKeyValue(){
const cookieValue = getCookieByName(cookieNames.SESSION_KEY); const cookieValue = getCookieValueByName(cookieNames.SESSION_KEY);
if(cookieValue){ if(cookieValue){
return cookieValue; return cookieValue;
@ -140,7 +147,7 @@ function getDomainWithoutSubdomain() {
/* /*
Gets cookie value by name, returns empty string if not found. Gets cookie value by name, returns empty string if not found.
*/ */
function getCookieByName(name) { function getCookieValueByName(name) {
const value = "; " + document.cookie; const value = "; " + document.cookie;
const parts = value.split("; " + name + "="); const parts = value.split("; " + name + "=");