From 1b08335245744c7bc172a42eb2e35171229ba23c Mon Sep 17 00:00:00 2001 From: Bernd Schoolmann Date: Wed, 8 Jan 2025 14:08:52 +0100 Subject: [PATCH] Fix ssh generation and import not being available when agent feature-flag is disabled (#12741) --- .../platform/main/main-ssh-agent.service.ts | 33 ++++++++++--------- 1 file changed, 17 insertions(+), 16 deletions(-) diff --git a/apps/desktop/src/platform/main/main-ssh-agent.service.ts b/apps/desktop/src/platform/main/main-ssh-agent.service.ts index 8858134a6be..f06324c0db1 100644 --- a/apps/desktop/src/platform/main/main-ssh-agent.service.ts +++ b/apps/desktop/src/platform/main/main-ssh-agent.service.ts @@ -24,7 +24,23 @@ export class MainSshAgentService { constructor( private logService: LogService, private messagingService: MessagingService, - ) {} + ) { + ipcMain.handle( + "sshagent.generatekey", + async (event: any, { keyAlgorithm }: { keyAlgorithm: string }): Promise => { + return await sshagent.generateKeypair(keyAlgorithm); + }, + ); + ipcMain.handle( + "sshagent.importkey", + async ( + event: any, + { privateKey, password }: { privateKey: string; password?: string }, + ): Promise => { + return sshagent.importKey(privateKey, password); + }, + ); + } init() { // handle sign request passing to UI @@ -94,21 +110,6 @@ export class MainSshAgentService { this.requestResponses.push({ requestId, accepted, timestamp: new Date() }); }, ); - ipcMain.handle( - "sshagent.generatekey", - async (event: any, { keyAlgorithm }: { keyAlgorithm: string }): Promise => { - return await sshagent.generateKeypair(keyAlgorithm); - }, - ); - ipcMain.handle( - "sshagent.importkey", - async ( - event: any, - { privateKey, password }: { privateKey: string; password?: string }, - ): Promise => { - return sshagent.importKey(privateKey, password); - }, - ); ipcMain.handle("sshagent.lock", async (event: any) => { if (this.agentState != null && (await sshagent.isRunning(this.agentState))) {