mirror/insomnia
1
0
Fork 0
mirror of https://github.com/Kong/insomnia.git synced 2026-05-24 16:51:06 -04:00
Code Issues Packages Projects Releases Wiki Activity

fetch accountId from renderer (#6703)

Browse Source 
* fetch accountId from renderer

* tidy up
This commit is contained in:
Jack Kavanagh
2023-10-19 11:37:25 +02:00
committed by GitHub
parent 6bd54b5b70
commit 11a69be7d4
1 changed files with 34 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

56
packages/insomnia/src/main/analytics.ts
View File

@@ -1,8 +1,7 @@
import { Analytics } from '@segment/analytics-node';
import { BrowserWindow } from 'electron';
import { v4 as uuidv4 } from 'uuid';
import * as session from '../account/session';
import { getAccountId } from '../account/session';
import {
getAppPlatform,
getAppVersion,
@@ -43,17 +42,33 @@ export enum SegmentEvent {
vcsAction = 'VCS Action Executed',
buttonClick = 'Button Clicked',
}
// TODO: migrating session state to main would be more suitable than doing this.
const getAccountIdFromRenderer = async () => {
let sessionId = '';
let accountId = '';
try {
const windows = BrowserWindow.getAllWindows();
const mainWindow = windows[0];
sessionId = await mainWindow.webContents.executeJavaScript('localStorage.getItem("currentSessionId");');
const sessionJSON = await mainWindow.webContents.executeJavaScript(`localStorage.getItem("session__${(sessionId).slice(0, 10)}");`);
const sessionData = JSON.parse(sessionJSON);
accountId = sessionData?.accountId ?? '';
} catch (e) {
return { sessionId, accountId };
}
return { sessionId, accountId };
};
export async function trackSegmentEvent(
event: SegmentEvent,
properties?: Record<string, any>,
) {
const settings = await models.settings.get();
const allowAnalytics = settings.enableAnalytics || session.isLoggedIn();
const { accountId } = await getAccountIdFromRenderer();
const allowAnalytics = settings.enableAnalytics || accountId;
if (allowAnalytics) {
try {
const anonymousId = await getDeviceId() ?? '';
const userId = getAccountId();
const context = {
app: { name: getProductName(), version: getAppVersion() },
os: { name: _getOsName(), version: process.getSystemVersion() },
@@ -63,7 +78,7 @@ export async function trackSegmentEvent(
properties,
context,
anonymousId,
userId,
userId: accountId,
}, error => {
if (error) {
console.warn('[analytics] Error sending segment event', error);
@@ -77,39 +92,36 @@ export async function trackSegmentEvent(
export async function trackPageView(name: string) {
const settings = await models.settings.get();
const allowAnalytics = settings.enableAnalytics || session.isLoggedIn();
const { sessionId, accountId } = await getAccountIdFromRenderer();
const allowAnalytics = settings.enableAnalytics || accountId;
if (allowAnalytics) {
try {
const anonymousId = await getDeviceId() ?? '';
const userId = getAccountId();
const context = {
app: { name: getProductName(), version: getAppVersion() },
os: { name: _getOsName(), version: process.getSystemVersion() },
};
analytics.page({ name, context, anonymousId, userId }, error => {
analytics.page({ name, context, anonymousId, userId: accountId }, error => {
if (error) {
console.warn('[analytics] Error sending segment event', error);
}
});
sendTelemetry();
if (sessionId) {
insomniaFetch({
method: 'POST',
path: '/v1/telemetry/',
sessionId,
}).catch((error: unknown) => {
console.warn('[analytics] Unexpected error while sending telemetry', error);
});
}
} catch (error: unknown) {
console.warn('[analytics] Unexpected error while sending segment event', error);
}
}
}
export async function sendTelemetry() {
if (session.isLoggedIn()) {
insomniaFetch({
method: 'POST',
path: '/v1/telemetry/',
sessionId: session.getCurrentSessionId(),
}).catch((error: unknown) => {
console.warn('[analytics] Unexpected error while sending telemetry', error);
});
}
}
// ~~~~~~~~~~~~~~~~~ //
// Private Functions //
// ~~~~~~~~~~~~~~~~~ //