Merge pull request #4206 from kubeshop/f1ames/fix/synchronizer-client-id

Add client data to synchronizer instances

electron/app/services/cloud/authenticator.ts

@@ -2,12 +2,15 @@ import {app} from 'electron';
 
 import {join} from 'path';
 
-import {Authenticator, StorageHandlerAuth, createDefaultMonokleAuthenticator} from '@monokle/synchronizer';
+import {Authenticator, StorageHandlerAuth, createMonokleAuthenticatorFromOrigin} from '@monokle/synchronizer';
+import {getClientConfig} from './client-config';
+
+export const AUTH_CLIENT_ID = 'mc-cli';
 
 let authenticator: Authenticator | undefined;
 
 const initAuthenticator = async (cloudStorageDir: string) => {
-  const newAuthenticator = createDefaultMonokleAuthenticator(new StorageHandlerAuth(cloudStorageDir));
+  const newAuthenticator = await createMonokleAuthenticatorFromOrigin(AUTH_CLIENT_ID, getClientConfig(), undefined, new StorageHandlerAuth(cloudStorageDir));
   authenticator = newAuthenticator;
   return newAuthenticator;
 };

electron/app/services/cloud/client-config.ts

@@ -0,0 +1,18 @@
+import {type, release} from 'os';
+import {machineIdSync} from 'node-machine-id';
+import {app} from 'electron';
+import electronStore from '@shared/utils/electronStore';
+
+const CLIENT_NAME = 'Monokle Desktop';
+
+export function getClientConfig() {
+	const isTrackingDisabled = Boolean(electronStore.get('appConfig.disableEventTracking'));
+	const additionalData = isTrackingDisabled ? undefined : { machineId: machineIdSync() };
+
+	return {
+		name: CLIENT_NAME,
+		version: app.getVersion(),
+		os: `${type()} ${release()}`,
+		additionalData,
+	};
+}

electron/app/services/cloud/synchronizer.ts

@@ -2,12 +2,13 @@ import {app} from 'electron';
 
 import {join} from 'path';
 
-import {StorageHandlerPolicy, Synchronizer, createDefaultMonokleSynchronizer} from '@monokle/synchronizer';
+import {StorageHandlerPolicy, Synchronizer, createMonokleSynchronizerFromOrigin} from '@monokle/synchronizer';
+import {getClientConfig} from './client-config';
 
 let synchronizer: Synchronizer | undefined;
 
 const initSynchronizer = async (cloudStorageDir: string) => {
-  const newSynchronizer = createDefaultMonokleSynchronizer(new StorageHandlerPolicy(cloudStorageDir));
+  const newSynchronizer = await createMonokleSynchronizerFromOrigin(getClientConfig(), undefined, new StorageHandlerPolicy(cloudStorageDir));
   synchronizer = newSynchronizer;
   return newSynchronizer;
 };

package.json

@@ -101,7 +101,7 @@
     "@dnd-kit/sortable": "7.0.2",
     "@kubernetes/client-node": "0.19.0",
     "@monokle/components": "1.7.0",
-    "@monokle/synchronizer": "^0.6.0",
+    "@monokle/synchronizer": "^0.13.0",
     "@monokle/validation": "0.31.5",
     "@open-policy-agent/opa-wasm": "1.8.0",
     "@reduxjs/toolkit": "1.9.5",