When setting or resetting User ID, do not update the Visitor ID in the first party cookie (#12742)

* When setting or resetting User ID, do not update the Visitor ID in the first party cookie

* Forgot a file

* Fix the JS tracker tests

1 files changed, 4 insertions, 4 deletions

diff --git a/piwik.js b/piwik.js
index e7624d6f7e..92b39626d4 100644
--- a/piwik.js
+++ b/piwik.js
@@ -58,10 +58,10 @@ return false}var c0=ch(cz(c1,c3,cZ,c2),c5,"event");bt(c0,bx,c4)}function bW(cZ,c
 if(!c0||aM(c0)){return}c0=k(c0,ap);if(c0.indexOf("?")>0){c0+="&"}else{c0+="?"}var c1=bh();c0=E(c0,ap,c1);aa.setAnyAttribute(cZ,"href",c0)}function au(c2){var c3=aa.getAttributeValueFromNode(c2,"href");if(!c3){return false}c3=String(c3);var c0=c3.indexOf("//")===0||c3.indexOf("http://")===0||c3.indexOf("https://")===0;if(!c0){return false}var cZ=c2.pathname||b9(c2.href);var c1=(c2.hostname||d(c2.href)).toLowerCase();if(am(c1,cZ)){if(!ct(cE,K(c1))){return true}return false}return false}function cs(cZ){var c0=cT(cZ);if(c0&&c0.type){c0.href=p(c0.href);cK(c0.href,c0.type,undefined,null,cZ);return}if(cx){cZ=ao(cZ);if(au(cZ)){b7(cZ)}}}function ck(){return F.all&&!F.addEventListener}function cF(cZ){var c1=cZ.which;var c0=(typeof cZ.button);if(!c1&&c0!=="undefined"){if(ck()){if(cZ.button&1){c1=1}else{if(cZ.button&2){c1=3}else{if(cZ.button&4){c1=2}}}}else{if(cZ.button===0||cZ.button==="0"){c1=1}else{if(cZ.button&1){c1=2}else{if(cZ.button&2){c1=3}}}}}return c1}function bH(cZ){switch(cF(cZ)){case 1:return"left";
 case 2:return"middle";case 3:return"right"}}function aT(cZ){return cZ.target||cZ.srcElement}function av(cZ){return function(c2){c2=c2||S.event;var c1=bH(c2);var c3=aT(c2);if(c2.type==="click"){var c0=false;if(cZ&&c1==="middle"){c0=true}if(c3&&!c0){cs(c3)}}else{if(c2.type==="mousedown"){if(c1==="middle"&&c3){aJ=c1;bq=c3}else{aJ=bq=null}}else{if(c2.type==="mouseup"){if(c1===aJ&&c3===bq){cs(c3)}aJ=bq=null}else{if(c2.type==="contextmenu"){cs(c3)}}}}}}function al(c1,c0){var cZ=typeof c0;if(cZ==="undefined"){c0=true}ai(c1,"click",av(c0),false);if(c0){ai(c1,"mouseup",av(c0),false);ai(c1,"mousedown",av(c0),false);ai(c1,"contextmenu",av(c0),false)}}function br(c1,c3){ak=true;var c2,c0=aS(bp,"ignore"),c4=F.links,cZ=null,c5=null;if(c4){for(c2=0;c2<c4.length;c2++){cZ=c4[c2];if(!c0.test(cZ.className)){c5=typeof cZ.piwikTrackers;if("undefined"===c5){cZ.piwikTrackers=[]}if(-1===L(cZ.piwikTrackers,c3)){cZ.piwikTrackers.push(c3);al(cZ,c1)}}}}}function aK(c0,c3,c4){if(b3){return true}b3=true;var c5=false;
 var c2,c1;function cZ(){c5=true}n(function(){function c6(c8){setTimeout(function(){if(!b3){return}c5=false;c4.trackVisibleContentImpressions();c6(c8)},c8)}function c7(c8){setTimeout(function(){if(!b3){return}if(c5){c5=false;c4.trackVisibleContentImpressions()}c7(c8)},c8)}if(c0){c2=["scroll","resize"];for(c1=0;c1<c2.length;c1++){if(F.addEventListener){F.addEventListener(c2[c1],cZ)}else{S.attachEvent("on"+c2[c1],cZ)}}c7(100)}if(c3&&c3>0){c3=parseInt(c3,10);c6(c3)}})}function cr(){var c0,c2,c3={pdf:"application/pdf",qt:"video/quicktime",realp:"audio/x-pn-realaudio-plugin",wma:"application/x-mplayer2",dir:"application/x-director",fla:"application/x-shockwave-flash",java:"application/x-java-vm",gears:"application/x-googlegears",ag:"application/x-silverlight"};if(!((new RegExp("MSIE")).test(h.userAgent))){if(h.mimeTypes&&h.mimeTypes.length){for(c0 in c3){if(Object.prototype.hasOwnProperty.call(c3,c0)){c2=h.mimeTypes[c3[c0]];cP[c0]=(c2&&c2.enabledPlugin)?"1":"0"}}}if(!((new RegExp("Edge[ /](\\d+[\\.\\d]+)")).test(h.userAgent))&&typeof navigator.javaEnabled!=="unknown"&&I(h.javaEnabled)&&h.javaEnabled()){cP.java="1"
-}if(z(S.GearsFactory)){cP.gears="1"}cP.cookie=bT()}var c1=parseInt(V.width,10);var cZ=parseInt(V.height,10);cP.res=parseInt(c1,10)+"x"+parseInt(cZ,10)}cr();a8();aE();this.getVisitorId=function(){return aP().uuid};this.getVisitorInfo=function(){return cy()};this.getAttributionInfo=function(){return bA()};this.getAttributionCampaignName=function(){return bA()[0]};this.getAttributionCampaignKeyword=function(){return bA()[1]};this.getAttributionReferrerTimestamp=function(){return bA()[2]};this.getAttributionReferrerUrl=function(){return bA()[3]};this.setTrackerUrl=function(cZ){ax=cZ};this.getTrackerUrl=function(){return ax};this.getPiwikUrl=function(){return N(this.getTrackerUrl(),bv)};this.addTracker=function(cZ,c1){if(!c1){throw new Error("A siteId must be given to add a new tracker")}if(!I(cZ)||null===cZ){cZ=this.getTrackerUrl()}var c0=new P(cZ,c1);H.push(c0);return c0};this.getSiteId=function(){return bU};this.setSiteId=function(cZ){bR(cZ)};this.resetUserId=function(){bo="";bC=cB()};this.setUserId=function(cZ){if(!I(cZ)||!cZ.length){return
-}bo=cZ;bC=bV(bo).substr(0,16)};this.getUserId=function(){return bo};this.setCustomData=function(cZ,c0){if(U(cZ)){aj=cZ}else{if(!aj){aj={}}aj[cZ]=c0}};this.getCustomData=function(){return aj};this.setCustomRequestProcessing=function(cZ){bZ=cZ};this.appendToTrackingUrl=function(cZ){cI=cZ};this.getRequest=function(cZ){return ch(cZ)};this.addPlugin=function(cZ,c0){b[cZ]=c0};this.setCustomDimension=function(cZ,c0){cZ=parseInt(cZ,10);if(cZ>0){if(!I(c0)){c0=""}if(!w(c0)){c0=String(c0)}bc[cZ]=c0}};this.getCustomDimension=function(cZ){cZ=parseInt(cZ,10);if(cZ>0&&Object.prototype.hasOwnProperty.call(bc,cZ)){return bc[cZ]}};this.deleteCustomDimension=function(cZ){cZ=parseInt(cZ,10);if(cZ>0){delete bc[cZ]}};this.setCustomVariable=function(c0,cZ,c3,c1){var c2;if(!I(c1)){c1="visit"}if(!I(cZ)){return}if(!I(c3)){c3=""}if(c0>0){cZ=!w(cZ)?String(cZ):cZ;c3=!w(c3)?String(c3):c3;c2=[cZ.slice(0,bj),c3.slice(0,bj)];if(c1==="visit"||c1===2){cq();aI[c0]=c2}else{if(c1==="page"||c1===3){bK[c0]=c2}else{if(c1==="event"){ca[c0]=c2
-}}}}};this.getCustomVariable=function(c0,c1){var cZ;if(!I(c1)){c1="visit"}if(c1==="page"||c1===3){cZ=bK[c0]}else{if(c1==="event"){cZ=ca[c0]}else{if(c1==="visit"||c1===2){cq();cZ=aI[c0]}}}if(!I(cZ)||(cZ&&cZ[0]==="")){return false}return cZ};this.deleteCustomVariable=function(cZ,c0){if(this.getCustomVariable(cZ,c0)){this.setCustomVariable(cZ,"","",c0)}};this.deleteCustomVariables=function(cZ){if(cZ==="page"||cZ===3){bK={}}else{if(cZ==="event"){ca={}}else{if(cZ==="visit"||cZ===2){aI={}}}}};this.storeCustomVariablesInCookie=function(){bE=true};this.setLinkTrackingTimer=function(cZ){bx=cZ};this.getLinkTrackingTimer=function(){return bx};this.setDownloadExtensions=function(cZ){if(w(cZ)){cZ=cZ.split("|")}cO=cZ};this.addDownloadExtensions=function(c0){var cZ;if(w(c0)){c0=c0.split("|")}for(cZ=0;cZ<c0.length;cZ++){cO.push(c0[cZ])}};this.removeDownloadExtensions=function(c1){var c0,cZ=[];if(w(c1)){c1=c1.split("|")}for(c0=0;c0<cO.length;c0++){if(L(c1,cO[c0])===-1){cZ.push(cO[c0])}}cO=cZ};this.setDomains=function(cZ){aq=w(cZ)?[cZ]:cZ;
-var c3=false,c1=0,c0;for(c1;c1<aq.length;c1++){c0=String(aq[c1]);if(ct(cE,K(c0))){c3=true;break}var c2=b9(c0);if(c2&&c2!=="/"&&c2!=="/*"){c3=true;break}}if(!c3){aq.push(cE)}};this.enableCrossDomainLinking=function(){cx=true};this.disableCrossDomainLinking=function(){cx=false};this.isCrossDomainLinkingEnabled=function(){return cx};this.setCrossDomainLinkingTimeout=function(cZ){aR=cZ};this.getCrossDomainLinkingUrlParameter=function(){return t(ap)+"="+t(bh())};this.setIgnoreClasses=function(cZ){bp=w(cZ)?[cZ]:cZ};this.setRequestMethod=function(cZ){cR=cZ||b6};this.setRequestContentType=function(cZ){cl=cZ||aB};this.setReferrerUrl=function(cZ){bd=cZ};this.setCustomUrl=function(cZ){aW=bJ(bB,cZ)};this.getCurrentUrl=function(){return aW||bB};this.setDocumentTitle=function(cZ){a9=cZ};this.setAPIUrl=function(cZ){bv=cZ};this.setDownloadClasses=function(cZ){bz=w(cZ)?[cZ]:cZ};this.setLinkClasses=function(cZ){a0=w(cZ)?[cZ]:cZ};this.setCampaignNameKey=function(cZ){cf=w(cZ)?[cZ]:cZ};this.setCampaignKeywordKey=function(cZ){bu=w(cZ)?[cZ]:cZ
+}if(z(S.GearsFactory)){cP.gears="1"}cP.cookie=bT()}var c1=parseInt(V.width,10);var cZ=parseInt(V.height,10);cP.res=parseInt(c1,10)+"x"+parseInt(cZ,10)}cr();a8();aE();this.getVisitorId=function(){return aP().uuid};this.getVisitorInfo=function(){return cy()};this.getAttributionInfo=function(){return bA()};this.getAttributionCampaignName=function(){return bA()[0]};this.getAttributionCampaignKeyword=function(){return bA()[1]};this.getAttributionReferrerTimestamp=function(){return bA()[2]};this.getAttributionReferrerUrl=function(){return bA()[3]};this.setTrackerUrl=function(cZ){ax=cZ};this.getTrackerUrl=function(){return ax};this.getPiwikUrl=function(){return N(this.getTrackerUrl(),bv)};this.addTracker=function(cZ,c1){if(!c1){throw new Error("A siteId must be given to add a new tracker")}if(!I(cZ)||null===cZ){cZ=this.getTrackerUrl()}var c0=new P(cZ,c1);H.push(c0);return c0};this.getSiteId=function(){return bU};this.setSiteId=function(cZ){bR(cZ)};this.resetUserId=function(){bo=""};this.setUserId=function(cZ){if(!I(cZ)||!cZ.length){return
+}bo=cZ};this.getUserId=function(){return bo};this.setCustomData=function(cZ,c0){if(U(cZ)){aj=cZ}else{if(!aj){aj={}}aj[cZ]=c0}};this.getCustomData=function(){return aj};this.setCustomRequestProcessing=function(cZ){bZ=cZ};this.appendToTrackingUrl=function(cZ){cI=cZ};this.getRequest=function(cZ){return ch(cZ)};this.addPlugin=function(cZ,c0){b[cZ]=c0};this.setCustomDimension=function(cZ,c0){cZ=parseInt(cZ,10);if(cZ>0){if(!I(c0)){c0=""}if(!w(c0)){c0=String(c0)}bc[cZ]=c0}};this.getCustomDimension=function(cZ){cZ=parseInt(cZ,10);if(cZ>0&&Object.prototype.hasOwnProperty.call(bc,cZ)){return bc[cZ]}};this.deleteCustomDimension=function(cZ){cZ=parseInt(cZ,10);if(cZ>0){delete bc[cZ]}};this.setCustomVariable=function(c0,cZ,c3,c1){var c2;if(!I(c1)){c1="visit"}if(!I(cZ)){return}if(!I(c3)){c3=""}if(c0>0){cZ=!w(cZ)?String(cZ):cZ;c3=!w(c3)?String(c3):c3;c2=[cZ.slice(0,bj),c3.slice(0,bj)];if(c1==="visit"||c1===2){cq();aI[c0]=c2}else{if(c1==="page"||c1===3){bK[c0]=c2}else{if(c1==="event"){ca[c0]=c2}}}}};this.getCustomVariable=function(c0,c1){var cZ;
+if(!I(c1)){c1="visit"}if(c1==="page"||c1===3){cZ=bK[c0]}else{if(c1==="event"){cZ=ca[c0]}else{if(c1==="visit"||c1===2){cq();cZ=aI[c0]}}}if(!I(cZ)||(cZ&&cZ[0]==="")){return false}return cZ};this.deleteCustomVariable=function(cZ,c0){if(this.getCustomVariable(cZ,c0)){this.setCustomVariable(cZ,"","",c0)}};this.deleteCustomVariables=function(cZ){if(cZ==="page"||cZ===3){bK={}}else{if(cZ==="event"){ca={}}else{if(cZ==="visit"||cZ===2){aI={}}}}};this.storeCustomVariablesInCookie=function(){bE=true};this.setLinkTrackingTimer=function(cZ){bx=cZ};this.getLinkTrackingTimer=function(){return bx};this.setDownloadExtensions=function(cZ){if(w(cZ)){cZ=cZ.split("|")}cO=cZ};this.addDownloadExtensions=function(c0){var cZ;if(w(c0)){c0=c0.split("|")}for(cZ=0;cZ<c0.length;cZ++){cO.push(c0[cZ])}};this.removeDownloadExtensions=function(c1){var c0,cZ=[];if(w(c1)){c1=c1.split("|")}for(c0=0;c0<cO.length;c0++){if(L(c1,cO[c0])===-1){cZ.push(cO[c0])}}cO=cZ};this.setDomains=function(cZ){aq=w(cZ)?[cZ]:cZ;var c3=false,c1=0,c0;
+for(c1;c1<aq.length;c1++){c0=String(aq[c1]);if(ct(cE,K(c0))){c3=true;break}var c2=b9(c0);if(c2&&c2!=="/"&&c2!=="/*"){c3=true;break}}if(!c3){aq.push(cE)}};this.enableCrossDomainLinking=function(){cx=true};this.disableCrossDomainLinking=function(){cx=false};this.isCrossDomainLinkingEnabled=function(){return cx};this.setCrossDomainLinkingTimeout=function(cZ){aR=cZ};this.getCrossDomainLinkingUrlParameter=function(){return t(ap)+"="+t(bh())};this.setIgnoreClasses=function(cZ){bp=w(cZ)?[cZ]:cZ};this.setRequestMethod=function(cZ){cR=cZ||b6};this.setRequestContentType=function(cZ){cl=cZ||aB};this.setReferrerUrl=function(cZ){bd=cZ};this.setCustomUrl=function(cZ){aW=bJ(bB,cZ)};this.getCurrentUrl=function(){return aW||bB};this.setDocumentTitle=function(cZ){a9=cZ};this.setAPIUrl=function(cZ){bv=cZ};this.setDownloadClasses=function(cZ){bz=w(cZ)?[cZ]:cZ};this.setLinkClasses=function(cZ){a0=w(cZ)?[cZ]:cZ};this.setCampaignNameKey=function(cZ){cf=w(cZ)?[cZ]:cZ};this.setCampaignKeywordKey=function(cZ){bu=w(cZ)?[cZ]:cZ
 };this.discardHashTag=function(cZ){bD=cZ};this.setCookieNamePrefix=function(cZ){ba=cZ;aI=bL()};this.setCookieDomain=function(cZ){var c0=K(cZ);if(bm(c0)){cG=c0;a8()}};this.getCookieDomain=function(){return cG};this.hasCookies=function(){return"1"===bT()};this.setSessionCookie=function(c1,c0,cZ){if(!c1){throw new Error("Missing cookie name")}if(!I(cZ)){cZ=cd}bk.push(c1);cU(aL(c1),c0,cZ,bf,cG)};this.getCookie=function(c0){var cZ=aw(aL(c0));if(cZ===0){return null}return cZ};this.setCookiePath=function(cZ){bf=cZ;a8()};this.getCookiePath=function(cZ){return bf};this.setVisitorCookieTimeout=function(cZ){cv=cZ*1000};this.setSessionCookieTimeout=function(cZ){cd=cZ*1000};this.getSessionCookieTimeout=function(){return cd};this.setReferralCookieTimeout=function(cZ){cN=cZ*1000};this.setConversionAttributionFirstReferrer=function(cZ){bl=cZ};this.setSecureCookie=function(cZ){bG=cZ};this.disableCookies=function(){bb=true;cP.cookie="0";if(bU){ay()}};this.deleteCookies=function(){ay()};this.setDoNotTrack=function(c0){var cZ=h.doNotTrack||h.msDoNotTrack;
 cA=c0&&(cZ==="yes"||cZ==="1");if(cA){this.disableCookies()}};this.addListener=function(c0,cZ){al(c0,cZ)};this.enableLinkTracking=function(c0){cQ=true;var cZ=this;b5(function(){q(function(){br(c0,cZ)})})};this.enableJSErrorTracking=function(){if(cC){return}cC=true;var cZ=S.onerror;S.onerror=function(c4,c2,c1,c3,c0){b5(function(){var c5="JavaScript Errors";var c6=c2+":"+c1;if(c3){c6+=":"+c3}an(c5,c6,c4)});if(cZ){return cZ(c4,c2,c1,c3,c0)}return false}};this.disablePerformanceTracking=function(){aU=false};this.setGenerationTimeMs=function(cZ){cb=parseInt(cZ,10)};this.enableHeartBeatTimer=function(cZ){cZ=Math.max(cZ,1);aX=(cZ||15)*1000;if(cH!==null){cW()}};this.disableHeartBeatTimer=function(){by();if(aX||aG){if(S.removeEventListener){S.removeEventListener("focus",a2,true);S.removeEventListener("blur",ar,true)}else{if(S.detachEvent){S.detachEvent("onfocus",a2);S.detachEvent("onblur",ar)}}}aX=null;aG=false};this.killFrame=function(){if(S.location!==S.top.location){S.top.location=S.location}};
 this.redirectFile=function(cZ){if(S.location.protocol==="file:"){S.location=cZ}};this.setCountPreRendered=function(cZ){a5=cZ};this.trackGoal=function(cZ,c1,c0){b5(function(){cD(cZ,c1,c0)})};this.trackLink=function(c0,cZ,c2,c1){b5(function(){cK(c0,cZ,c2,c1)})};this.getNumTrackedPageViews=function(){return cg};this.trackPageView=function(cZ,c1,c0){bY=[];if(M(bU)){b5(function(){W(ax,bv,bU)})}else{b5(function(){cg++;bO(cZ,c1,c0)})}};this.trackAllContentImpressions=function(){if(M(bU)){return}b5(function(){q(function(){var cZ=v.findContentNodes();var c0=cn(cZ);cV(c0,bx)})})};this.trackVisibleContentImpressions=function(cZ,c0){if(M(bU)){return}if(!I(cZ)){cZ=true}if(!I(c0)){c0=750}aK(cZ,c0,this);b5(function(){n(function(){var c1=v.findContentNodes();var c2=a1(c1);cV(c2,bx)})})};this.trackContentImpression=function(c1,cZ,c0){if(M(bU)){return}c1=a(c1);cZ=a(cZ);c0=a(c0);if(!c1){return}cZ=cZ||"Unknown";b5(function(){var c2=az(c1,cZ,c0);bt(c2,bx)})};this.trackContentImpressionsWithinNode=function(cZ){if(M(bU)||!cZ){return