ai_user cookie should use userCookiePostfix for user cookie storage

extensions/applicationinsights-properties-js/Tests/Selenium/properties.tests.ts

@@ -4,6 +4,7 @@ import PropertiesPlugin from "../../src/PropertiesPlugin";
 import { ITelemetryConfig } from "../../src/Interfaces/ITelemetryConfig";
 import { TelemetryContext } from "../../src/TelemetryContext";
 import { TelemetryTrace } from "../../src/Context/TelemetryTrace";
+import { IConfig } from "@microsoft/applicationinsights-common";
 
 export class PropertiesTests extends AITestClass {
     private properties: PropertiesPlugin;
@@ -196,6 +197,30 @@ export class PropertiesTests extends AITestClass {
             }
         });
 
+        this.testCase({
+            name: "ai_user cookie uses name prefix for cookie storage",
+            test: () => {
+                // setup
+                var actualCookieName: string;
+                var actualCookieValue: string;
+
+                var newIdStub = this.sandbox.stub(this as any, "_getNewId").callsFake(() => "newId");
+                var getCookieStub = this.sandbox.stub(this as any, "_getCookie").callsFake(() =>"");
+                var setCookieStub = this.sandbox.stub(this as any, "_setCookie").callsFake((cookieName, cookieValue) => {
+                    actualCookieName = cookieName;
+                    actualCookieValue = cookieValue;
+                });
+
+                // act
+                let config: IConfig & IConfiguration = this.getEmptyConfig();
+                config.namePrefix = 'testNamePrefix';
+                this.properties.initialize(config, this.core, []);
+
+                // verify
+                Assert.equal("ai_usertestNamePrefix", actualCookieName, "ai_user cookie is set");
+            }
+        });
+
         this.testCase({
             name: "Ctor: auth and account id initialize from cookie",
             test: () => {

extensions/applicationinsights-properties-js/src/Context/User.ts

@@ -61,10 +61,14 @@ export class User implements IUserContext {
     constructor(config: ITelemetryConfig, core: IAppInsightsCore) {
         let _logger = safeGetLogger(core);
         let _cookieManager: ICookieMgr = safeGetCookieMgr(core);
+        let _storageNamePrefix: () => string;
 
         dynamicProto(User, this, (_self) => {
+            _self.config = config;
+            _storageNamePrefix = () => _self.config.namePrefix && _self.config.namePrefix() ? User.userCookieName + _self.config.namePrefix() : User.userCookieName;
+
             // get userId or create new one if none exists
-            const cookie = _cookieManager.get(User.userCookieName);
+            const cookie = _cookieManager.get(_storageNamePrefix());
             if (cookie) {
                 _self.isNewUser = false;
                 const params = cookie.split(User.cookieSeparator);
@@ -73,8 +77,6 @@ export class User implements IUserContext {
                 }
             }
 
-            _self.config = config;
-
             if (!_self.id) {
                 let theConfig = (config || {}) as ITelemetryConfig;
                 let getNewId = (theConfig.getNewId ? theConfig.getNewId() : null) || newId;
@@ -88,7 +90,7 @@ export class User implements IUserContext {
                 _self.isNewUser = true;
                 const newCookie = [_self.id, acqStr];
 
-                _cookieManager.set(User.userCookieName, newCookie.join(User.cookieSeparator), oneYear);
+                _cookieManager.set(_storageNamePrefix(), newCookie.join(User.cookieSeparator), oneYear);
 
                 // If we have an config.namePrefix() + ai_session in local storage this means the user actively removed our cookies.
                 // We should respect their wishes and clear ourselves from local storage