Merge pull request #1443 from akhilmhdh/fix/service-token-email-telemetry

fix(telemetry): added back email for telemetry when using service token

backend/src/server/plugins/auth/inject-identity.ts

@@ -27,7 +27,7 @@ export type TAuthMode =
     }
   | {
       authMode: AuthMode.SERVICE_TOKEN;
-      serviceToken: TServiceTokens;
+      serviceToken: TServiceTokens & { createdByEmail: string };
       actor: ActorType.SERVICE;
       serviceTokenId: string;
     }

backend/src/server/routes/v3/secret-router.ts

@@ -28,7 +28,7 @@ const getDistinctId = (req: FastifyRequest) => {
     return `identity-${req.auth.identityId}`;
   }
   if (req.auth.actor === ActorType.SERVICE) {
-    return `service-token-${req.auth.serviceToken.id}`;
+    return req.auth.serviceToken.createdByEmail || `service-token-null-creator-${req.auth.serviceTokenId}`; // when user gets removed from system
   }
   return "unknown-auth-data";
 };