ever-co
diff --git a/‎.cspell.json‎
Lines changed: 4 additions & 1 deletion b/‎.cspell.json‎
Lines changed: 4 additions & 1 deletion
diff --git a/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-api-server-environment-content.ts‎
Lines changed: 3 additions & 1 deletion b/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-api-server-environment-content.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts‎
Lines changed: 3 additions & 1 deletion b/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-environment-content.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts‎
Lines changed: 3 additions & 1 deletion b/‎.scripts/electron-desktop-environment/concrete-environment-content/desktop-server-environment-content.ts‎
Lines changed: 3 additions & 1 deletion
diff --git a/‎.scripts/electron-desktop-environment/interfaces/i-desktop-environment.ts‎
Lines changed: 2 additions & 0 deletions b/‎.scripts/electron-desktop-environment/interfaces/i-desktop-environment.ts‎
Lines changed: 2 additions & 0 deletions
diff --git a/‎.scripts/env.ts‎
Lines changed: 8 additions & 0 deletions b/‎.scripts/env.ts‎
Lines changed: 8 additions & 0 deletions
diff --git a/‎apps/agent/src/main.ts‎
Lines changed: 4 additions & 7 deletions b/‎apps/agent/src/main.ts‎
Lines changed: 4 additions & 7 deletions
diff --git a/‎apps/desktop-timer/src/main.ts‎
Lines changed: 15 additions & 11 deletions b/‎apps/desktop-timer/src/main.ts‎
Lines changed: 15 additions & 11 deletions
diff --git a/‎apps/desktop/src/app/app.component.ts‎
Lines changed: 1 addition & 0 deletions b/‎apps/desktop/src/app/app.component.ts‎
Lines changed: 1 addition & 0 deletions
diff --git a/‎apps/desktop/src/index.ts‎
Lines changed: 5 additions & 12 deletions b/‎apps/desktop/src/index.ts‎
Lines changed: 5 additions & 12 deletions
@@ -876,7 +876,10 @@
 		"Démarrer",
 		"Neue",
 		"viewports",
-		"sidemenu"
+		"sidemenu",
+		"ptdu",
+		"ptau",
+		"Centralises"
 	],
 	"useGitignore": true,
 	"ignorePaths": [
 
@@ -29,7 +29,9 @@ export class DesktopApiServerEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${false},
 			IS_DESKTOP: ${false},
 			IS_SERVER: ${true},
-			IS_SERVER_API: ${true}
+			IS_SERVER_API: ${true},
+			JWT_SECRET: '${variable.DESKTOP_JWT_SECRET || ''}',
+			JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET || ''}'
 		`;
 	}
 }
@@ -29,7 +29,9 @@ export class DesktopEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${false},
 			IS_DESKTOP: ${true},
 			IS_SERVER: ${false},
-			IS_SERVER_API: ${false}
+			IS_SERVER_API: ${false},
+			JWT_SECRET: '${variable.DESKTOP_JWT_SECRET || ''}',
+			JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET || ''}'
 		`;
 	}
 }
@@ -29,7 +29,9 @@ export class DesktopServerEnvironmentContent implements IContentGenerator {
 			IS_DESKTOP_TIMER: ${false},
 			IS_DESKTOP: ${false},
 			IS_SERVER: ${true},
-			IS_SERVER_API: ${false}
+			IS_SERVER_API: ${false},
+			JWT_SECRET: '${variable.DESKTOP_JWT_SECRET || ''}',
+			JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET || ''}'
 		`;
 	}
 }
@@ -13,4 +13,6 @@ export interface IDesktopEnvironment extends Env {
 	IS_DESKTOP: boolean;
 	IS_SERVER: boolean;
 	IS_SERVER_API: boolean;
+	DESKTOP_JWT_SECRET: string;
+	DESKTOP_JWT_REFRESH_TOKEN_SECRET: string;
 }
@@ -155,6 +155,8 @@ export type Env = Readonly<{
 	AGENT_APP_WELCOME_CONTENT: string;
 	AGENT_POOL_ACTIVITY_INTERVAL: number;
 	GAUZY_DESKTOP_TRAY_ICON: string;
+	DESKTOP_JWT_SECRET: string;
+	DESKTOP_JWT_REFRESH_TOKEN_SECRET: string;
 }>;
 
 export const env: Env = cleanEnv(
@@ -400,6 +402,12 @@ export const env: Env = cleanEnv(
 		}),
 		GAUZY_DESKTOP_TRAY_ICON: str({
 			default: 'assets/icons/default-tray-icon.png'
+		}),
+		DESKTOP_JWT_SECRET: str({
+			default: 'secretKey'
+		}),
+		DESKTOP_JWT_REFRESH_TOKEN_SECRET: str({
+			default: 'refreshTokenSecretKey'
 		})
 	},
 	{ strict: true, dotEnvPath: __dirname + '/../.env' }
 
@@ -1,6 +1,5 @@
 import { HTTP_INTERCEPTORS, provideHttpClient, withInterceptorsFromDi } from '@angular/common/http';
 import {
-	APP_INITIALIZER,
 	ErrorHandler,
 	enableProdMode,
 	importProvidersFrom,
@@ -181,12 +180,10 @@ bootstrapApplication(AppComponent, {
 			provide: Sentry.TraceService,
 			deps: [Router]
 		},
-		{
-			provide: APP_INITIALIZER,
-			useFactory: () => () => {},
-			deps: [Sentry.TraceService],
-			multi: true
-		},
+		// Ensure Sentry TraceService is instantiated during app initialization.
+		provideAppInitializer(() => {
+			inject(Sentry.TraceService);
+		}),
 		{ provide: DEFAULT_TIMEOUT, useValue: 80000 },
 		{
 			provide: GAUZY_ENV,
 
@@ -11,17 +11,6 @@ import { bootstrapApplication, BrowserModule } from '@angular/platform-browser';
 import { provideAnimations } from '@angular/platform-browser/animations';
 import { Router } from '@angular/router';
 import { akitaConfig, enableAkitaProdMode, persistState } from '@datorama/akita';
-import {
-	NbDatepickerModule,
-	NbDialogModule,
-	NbDialogService,
-	NbIconLibraries,
-	NbMenuModule,
-	NbSidebarModule,
-	NbThemeModule,
-	NbToastrModule
-} from '@nebular/theme';
-import * as Sentry from '@sentry/angular';
 import {
 	ActivityWatchInterceptor,
 	APIInterceptor,
@@ -37,6 +26,7 @@ import {
 	LoggerService,
 	NgxDesktopThemeModule,
 	OrganizationInterceptor,
+	providePluginsEffects,
 	RefreshTokenInterceptor,
 	ServerConnectionService,
 	ServerErrorInterceptor,
@@ -48,6 +38,18 @@ import {
 import { environment as gauzyEnvironment } from '@gauzy/ui-config';
 import { provideI18n } from '@gauzy/ui-core/i18n';
 import { TablerIconsModule } from '@gauzy/ui-core/icons';
+import {
+	NbDatepickerModule,
+	NbDialogModule,
+	NbDialogService,
+	NbIconLibraries,
+	NbMenuModule,
+	NbSidebarModule,
+	NbThemeModule,
+	NbToastrModule
+} from '@nebular/theme';
+import { provideEffectsManager } from '@ngneat/effects-ng';
+import * as Sentry from '@sentry/angular';
 import { AppRoutingModule } from './app/app-routing.module';
 import { AppComponent } from './app/app.component';
 import { AppService } from './app/app.service';
@@ -70,6 +72,8 @@ if (environment.SENTRY_DSN) {
 
 bootstrapApplication(AppComponent, {
 	providers: [
+		provideEffectsManager(),
+		providePluginsEffects(),
 		provideZoneChangeDetection(),
 		importProvidersFrom(
 			BrowserModule,
 
@@ -34,6 +34,7 @@ export class AppComponent implements OnInit, AfterViewInit {
 	ngOnInit(): void {
 		this._electronService.ipcRenderer.send('app_is_init');
 		this._isInitialized = true;
+		this.tokenRefreshService.start();
 	}
 
 	ngAfterViewInit(): void {
 
@@ -347,6 +347,8 @@ async function startServer(setupConfig: DesktopSetupConfig, restart = false) {
 		process.env.API_PORT = setupConfig.port ? String(setupConfig.port) : String(environment.API_DEFAULT_PORT);
 		process.env.API_HOST = '0.0.0.0';
 		process.env.API_BASE_URL = `http://127.0.0.1:${setupConfig.port || environment.API_DEFAULT_PORT}`;
+		process.env.JWT_SECRET = setupConfig.secret?.jwt;
+		process.env.JWT_REFRESH_TOKEN_SECRET = setupConfig.secret?.refresh_token;
 
 		console.log('Setting additional environment variables...', process.env.API_PORT);
 		console.log('Setting additional environment variables...', process.env.API_HOST);
@@ -359,7 +361,7 @@ async function startServer(setupConfig: DesktopSetupConfig, restart = false) {
 			await server.start(
 				{ api: path.join(__dirname, 'api/main.js') },
 				process.env,
-				appWindowManager.setupWindow,
+				appWindowManager.setupWindow ?? timeTrackerWindow,
 				signal
 			);
 		} catch (error) {
@@ -585,17 +587,8 @@ app.on('ready', async () => {
 		new AppMenu(timeTrackerWindow, settingsWindow, updaterWindow, knex, pathWindow, null, true);
 
 		if (configs && configs.isSetup) {
-			if (!configs.serverConfigConnected && !configs?.isLocalServer) {
-				await appWindowManager.initSetupWindow(pathWindow.timeTrackerUi);
-				appWindowManager.setupWindow?.show();
-				closeSplashScreen();
-				appWindowManager.setupWindow?.webContents?.send?.('setup-data', {
-					...configs
-				});
-			} else {
-				setGlobalVariable(configs);
-				await startServer(configs);
-			}
+			setGlobalVariable(configs);
+			await startServer(configs);
 		} else {
 			await appWindowManager.initSetupWindow(pathWindow.timeTrackerUi);
 			appWindowManager.setupWindow?.show?.();
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ export class DesktopApiServerEnvironmentContent implements IContentGenerator {`
`29`	`29`	`IS_DESKTOP_TIMER: ${false},`
`30`	`30`	`IS_DESKTOP: ${false},`
`31`	`31`	`IS_SERVER: ${true},`
`32`		`- IS_SERVER_API: ${true}`
	`32`	`+ IS_SERVER_API: ${true},`
	`33`	`+ JWT_SECRET: '${variable.DESKTOP_JWT_SECRET \|\| ''}',`
	`34`	`+ JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET \|\| ''}'`
`33`	`35`	`;
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ export class DesktopEnvironmentContent implements IContentGenerator {`
`29`	`29`	`IS_DESKTOP_TIMER: ${false},`
`30`	`30`	`IS_DESKTOP: ${true},`
`31`	`31`	`IS_SERVER: ${false},`
`32`		`- IS_SERVER_API: ${false}`
	`32`	`+ IS_SERVER_API: ${false},`
	`33`	`+ JWT_SECRET: '${variable.DESKTOP_JWT_SECRET \|\| ''}',`
	`34`	`+ JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET \|\| ''}'`
`33`	`35`	`;
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,9 @@ export class DesktopServerEnvironmentContent implements IContentGenerator {`
`29`	`29`	`IS_DESKTOP_TIMER: ${false},`
`30`	`30`	`IS_DESKTOP: ${false},`
`31`	`31`	`IS_SERVER: ${true},`
`32`		`- IS_SERVER_API: ${false}`
	`32`	`+ IS_SERVER_API: ${false},`
	`33`	`+ JWT_SECRET: '${variable.DESKTOP_JWT_SECRET \|\| ''}',`
	`34`	`+ JWT_REFRESH_TOKEN_SECRET: '${variable.DESKTOP_JWT_REFRESH_TOKEN_SECRET \|\| ''}'`
`33`	`35`	`;
`34`	`36`	`}`
`35`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -13,4 +13,6 @@ export interface IDesktopEnvironment extends Env {`
`13`	`13`	`IS_DESKTOP: boolean;`
`14`	`14`	`IS_SERVER: boolean;`
`15`	`15`	`IS_SERVER_API: boolean;`
	`16`	`+ DESKTOP_JWT_SECRET: string;`
	`17`	`+ DESKTOP_JWT_REFRESH_TOKEN_SECRET: string;`
`16`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -34,6 +34,7 @@ export class AppComponent implements OnInit, AfterViewInit {`
`34`	`34`	`ngOnInit(): void {`
`35`	`35`	`this._electronService.ipcRenderer.send('app_is_init');`
`36`	`36`	`this._isInitialized = true;`
	`37`	`+ this.tokenRefreshService.start();`
`37`	`38`	`}`
`38`	`39`
`39`	`40`	`ngAfterViewInit(): void {`