Merge pull request #6 from chaitanyakole/added_userid_tenantid

Bug #236438 [telemetry] user is showing anonymous in telemetry for explore&learn and play&learn.PFA
tekdi · Mar 5, 2025 · 13ed7de · 13ed7de
2 parents 000771a + e4f2d23
commit 13ed7de
Showing 1 changed file with 20 additions and 5 deletions.
diff --git a/src/services/telementryService.js b/src/services/telementryService.js
@@ -28,10 +28,17 @@ if (localStorage.getItem('contentSessionId') !== null) {
   localStorage.setItem('allAppContentSessionId', contentSessionId);
 }
 
+const location = new URLSearchParams(window.location);
+const myCurrectLanguage =
+  getParameter('language', location.search) || process.env.REACT_APP_LANGUAGE;
+
 export const initialize = ({ context, config, metadata }) => {
   context = context;
   config = config;
   playSessionId = uniqueId();
+  const tenantId = localStorage.getItem('tenantId');
+  const cohortId = localStorage.getItem('cohortId');
+
   if (!CsTelemetryModule.instance.isInitialised) {
     CsTelemetryModule.instance.init({});
     const telemetryConfig = {
@@ -52,6 +59,8 @@ export const initialize = ({ context, config, metadata }) => {
         cdata: [
           { id: contentSessionId, type: 'ContentSession' },
           { id: playSessionId, type: 'PlaySession' },
+          ...(tenantId ? [{ id: tenantId, type: 'TenantId' }] : []),
+          ...(cohortId ? [{ id: cohortId, type: 'CohortId' }] : []),
         ],
       },
       userOrgDetails: {},
@@ -171,15 +180,17 @@ function checkTelemetryMode(currentMode) {
   );
 }
 
-const location = new URLSearchParams(window.location);
-const myCurrectLanguage =
-  getParameter('language', location.search) || process.env.REACT_APP_LANGUAGE;
-
 export const getEventOptions = () => {
   var emis_username = 'anonymous';
   var buddyUserId = '';
 
-  if (localStorage.getItem('token') !== null) {
+  const storedUserId = localStorage.getItem('userId');
+  const tenantId = localStorage.getItem('tenantId');
+  const cohortId = localStorage.getItem('cohortId');
+
+  if (storedUserId) {
+    emis_username = storedUserId;
+  } else if (localStorage.getItem('token') !== null) {
     let jwtToken = localStorage.getItem('token');
     var userDetails = jwt(jwtToken);
     emis_username = userDetails.emis_username;
@@ -218,12 +229,16 @@ export const getEventOptions = () => {
               { id: playSessionId, type: 'PlaySession' },
               { id: userId, type: userType },
               { id: myCurrectLanguage, type: 'language' },
+              ...(tenantId ? [{ id: tenantId, type: 'TenantId' }] : []),
+              ...(cohortId ? [{ id: cohortId, type: 'CohortId' }] : []),
             ]
           : [
               { id: contentSessionId, type: 'ContentSession' },
               { id: playSessionId, type: 'PlaySession' },
               { id: userId, type: userType },
               { id: myCurrectLanguage, type: 'language' },
+              ...(tenantId ? [{ id: tenantId, type: 'TenantId' }] : []),
+              ...(cohortId ? [{ id: cohortId, type: 'CohortId' }] : []),
               { id: userDetails?.school_name, type: 'school_name' },
               {
                 id: userDetails?.class_studying_id,