Merge branch 'main' into auto-updater

.github/workflows/monokle-build-nightly.yml

@@ -1,8 +1,6 @@
 name: monokle-build-nightly
 
 on:
-  schedule:
-    - cron: '0 2 * * *'
   workflow_dispatch:
     inputs:
       ref:

CHANGELOG.md

@@ -2,6 +2,15 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.4.4](https://github.com/kubeshop/monokle/compare/v2.4.3...v2.4.4) (2024-01-04)
+
+
+### Bug Fixes
+
+* add client data to synchronizer instances ([46ffb9f](https://github.com/kubeshop/monokle/commit/46ffb9fed0dc0b152637485fd8443097ebb8fd0d))
+* fix synchronizer invalid calls ([178b830](https://github.com/kubeshop/monokle/commit/178b83029796fe0163c41d92757052498c04e1bf))
+* send machineId only when tracking enabled ([44c35df](https://github.com/kubeshop/monokle/commit/44c35df10de3884e865ec2d6b1ab568f0694ec1f))
+
 ### [2.4.3](https://github.com/kubeshop/monokle/compare/v2.4.3-nightly-2023-12-08.0...v2.4.3) (2023-12-08)
 
 ### [2.4.2](https://github.com/kubeshop/monokle/compare/v2.4.2-nightly-2023-10-23.0...v2.4.2) (2023-10-23)

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/policy.ts

@@ -6,12 +6,12 @@ import {getUser} from './user';
 export const getPolicy = async (repoPath: string) => {
   const synchronizer = await getSynchronizer();
   const user = await getUser();
-  if (!user?.token || !synchronizer) {
+  if (!user?.tokenInfo || !synchronizer) {
     return null;
   }
 
   try {
-    const policy = await synchronizer.getPolicy(repoPath, true, user.token);
+    const policy = await synchronizer.getPolicy(repoPath, true, user.tokenInfo);
     return policy;
   } catch (e: any) {
     if (e instanceof Error) {

electron/app/services/cloud/project.ts

@@ -8,12 +8,12 @@ export const getInfo = async (
 ): Promise<{projectInfo: CloudProjectInfo; policyInfo: CloudPolicyInfo} | null> => {
   const synchronizer = await getSynchronizer();
   const user = await getUser();
-  if (!user?.token || !synchronizer) {
+  if (!user?.tokenInfo || !synchronizer) {
     return null;
   }
 
   try {
-    const project = await synchronizer?.getProjectInfo(repoPath, user.token, true);
+    const project = await synchronizer?.getProjectInfo(repoPath, user.tokenInfo, true);
     return project
       ? {
           projectInfo: {...project, link: synchronizer.generateDeepLinkProject(project.slug)},

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;
 };