fix apiweb tracking

Author: cstryker

api_server/modules/apiweb/templates/ide_redirect.hbs

@@ -8,18 +8,17 @@
 	{{> partial_html_head }}
 	<script>
 		!function () {
-			CODESTREAM.track("codestream/ide_redirect displayed", {
+			window.CODESTREAM.track("codestream/ide_redirect displayed", {
 				"event_type": "modal_display",
 				"platform": "codestream",
 				"path": "N/A (codestream)",
 				"section": "N/A (codestream)",
-				"userId": "{{nrUserId}}",
 				"meta_data": "content: {{analyticsContentType}}",
 				"meta_data_2": "source: {{src}}",
 				"meta_data_3": "new_to_codestream: {{newToCodeStream}}",
 				"meta_data_4": "item_guid: {{itemGuid}}",
 				"meta_data_5": "ab_test_version: {{abTest}}",
-			});
+			}, "{{nrUserId}}");
 		}();
 	</script>
 	<script>		 

api_server/modules/apiweb/templates/partial_html_head.hbs

@@ -7,13 +7,14 @@
     crossorigin="anonymous"></script>
 <script>
 	window.CODESTREAM = window.CODESTREAM || {};
-    window.CODESTREAM.track = function(e, p) {
+    window.CODESTREAM.track = function(e, p, uid) {
 		var xhr = new XMLHttpRequest();
 		xhr.open('POST', '/web/track', true);
 		xhr.setRequestHeader('Content-Type', 'application/json; charset=UTF-8');
 		xhr.send(JSON.stringify({
 			event: e,
 			properties: p,
+			nrUserId: uid,
 			_csrf: "{{csrf}}"
         }));
 	};

api_server/modules/apiweb/templates/partial_launcher.hbs

@@ -422,28 +422,28 @@ window.CODESTREAM.openEditor = function(ide) {
 			function () {
 				//fail				
 				const source = "{{src}}" || "shared_link";
-				CODESTREAM.track("codestream/ide_redirect failed", { 
+				window.CODESTREAM.track("codestream/ide_redirect failed", { 
 					"event_type": "response",
 					"platform": "codestream",
 					"path": "N/A (codestream)",
 					"section": "N/A (codestream)",
 					"meta_data": `ide_detail: ${moniker}`, 
 					"meta_data_2": `selection_method: ${ideSelection}`,
 					"meta_data_3": `source: ${source}`
-				});
+				}, options.nrUserId);
 				console.log(`CodeStream: failed in ${(new Date() - startTime)/1000}s for Moniker=${moniker} Path=${protocol} IDESelection=${ideSelection}`);
 			}, function () {
 				//success			
 				const source = "{{src}}" || "shared_link";
-				CODESTREAM.track("codestream/ide selected", { 
+				window.CODESTREAM.track("codestream/ide selected", { 
 					"event_type": "response",
 					"platform": "codestream",
 					"path": "N/A (codestream)",
 					"section": "N/A (codestream)",
 					"meta_data": `ide_detail: ${moniker}`, 
 					"meta_data_2": `selection_method: ${ideSelection}`,
 					"meta_data_3": `source: ${source}`
-				});
+				}, options.nrUserId);
 				console.log(`CodeStream: success in ${(new Date() - startTime)/1000}s for Moniker=${moniker} Path=${protocol} IDESelection=${ideSelection}`);
 		});	
 }

api_server/modules/apiweb/templates/partial_launcher_detailed.hbs

@@ -423,30 +423,28 @@ window.CODESTREAM.openEditor = function(ide) {
 			function () {
 				//fail				
 				const source = "{{src}}" || "shared_link";
-				CODESTREAM.track("codestream/ide_redirect failed", { 
+				window.CODESTREAM.track("codestream/ide_redirect failed", { 
 					"event_type": "response",
 					"platform": "codestream",
 					"path": "N/A (codestream)",
 					"section": "N/A (codestream)",
-					"userId": options.nrUserId,
 					"meta_data": `ide_detail: ${moniker}`, 
 					"meta_data_2": `selection_method: ${ideSelection}`,
 					"meta_data_3": `source: ${source}`
-				});
+				}, options.nrUserId);
 				console.log(`CodeStream: failed in ${(new Date() - startTime)/1000}s for Moniker=${moniker} Path=${protocol} IDESelection=${ideSelection}`);
 			}, function () {
 				//success	
 				const source = "{{src}}" || "shared_link";
-				CODESTREAM.track("codestream/ide selected", { 
+				window.CODESTREAM.track("codestream/ide selected", { 
 					"event_type": "response",
 					"platform": "codestream",
 					"path": "N/A (codestream)",
 					"section": "N/A (codestream)",
-					"userId": options.nrUserId,
 					"meta_data": `ide_detail: ${moniker}`, 
 					"meta_data_2": `selection_method: ${ideSelection}`,
 					"meta_data_3": `source: ${source}`
-				});
+				}, options.nrUserId);
 				console.log(`CodeStream: success in ${(new Date() - startTime)/1000}s for Moniker=${moniker} Path=${protocol} IDESelection=${ideSelection}`);
 		});	
 }

api_server/modules/apiweb/web_track_request.js

@@ -26,6 +26,9 @@ class WebTrackRequest extends RestfulRequest {
 					string: ['event'],
 					object:['properties']
 				},
+				optional: {
+					string: ['nrUserId']
+				}
 			}
 		);
 
@@ -38,8 +41,12 @@ class WebTrackRequest extends RestfulRequest {
 	async process () {
 		await this.requireAndAllow();
 
-		const { event, properties } = this.request.body;
-		this.api.services.analytics.track(event, properties, { request: this });
+		const { event, properties, nrUserId } = this.request.body;
+		const options = { request: this };
+		if (nrUserId) {
+			options.nrUserId = nrUserId;
+		}
+		this.api.services.analytics.track(event, properties, options);
 	}
 }