From e9bf65e854ae0dd9a4617697cb4e4309c6c4ab1d Mon Sep 17 00:00:00 2001
From: Abdelilah El Aissaoui <aeab13@gmail.com>
Date: Fri, 5 Nov 2021 04:29:33 +0100
Subject: [PATCH] Code cleanup

---
 .../kotlin/app/credentials/GRemoteSession.kt  | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/main/kotlin/app/credentials/GRemoteSession.kt b/src/main/kotlin/app/credentials/GRemoteSession.kt
index b4c6957..49acc08 100644
--- a/src/main/kotlin/app/credentials/GRemoteSession.kt
+++ b/src/main/kotlin/app/credentials/GRemoteSession.kt
@@ -1,24 +1,11 @@
 package app.credentials
 
-import org.apache.sshd.agent.SshAgent
-import org.apache.sshd.agent.local.AgentImpl
-import org.apache.sshd.agent.local.LocalAgentFactory
 import org.apache.sshd.client.SshClient
-import org.apache.sshd.client.auth.keyboard.UserAuthKeyboardInteractive
-import org.apache.sshd.client.auth.keyboard.UserAuthKeyboardInteractiveFactory
-import org.apache.sshd.client.auth.keyboard.UserInteraction
-import org.apache.sshd.client.auth.password.PasswordAuthenticationReporter
-import org.apache.sshd.client.auth.password.UserAuthPassword
 import org.apache.sshd.client.future.ConnectFuture
 import org.apache.sshd.client.session.ClientSession
-import org.apache.sshd.common.NamedResource
 import org.apache.sshd.common.config.keys.FilePasswordProvider
-import org.apache.sshd.common.keyprovider.FileKeyPairProvider
-import org.apache.sshd.common.session.SessionContext
 import org.eclipse.jgit.transport.RemoteSession
 import org.eclipse.jgit.transport.URIish
-import java.lang.Exception
-import java.security.KeyPair
 import java.time.Duration
 import javax.inject.Inject
 import javax.inject.Provider
@@ -74,8 +61,8 @@ class GRemoteSession @Inject constructor(
         } else
             uri.port
 
-        val filePasswordProvider = object : FilePasswordProvider {
-            override fun getPassword(session: SessionContext?, resourceKey: NamedResource?, retryIndex: Int): String? {
+        val filePasswordProvider =
+            FilePasswordProvider { session, resourceKey, retryIndex ->
                 credentialsStateManager.updateState(CredentialsState.SshCredentialsRequested)
 
                 var credentials = credentialsStateManager.currentCredentialsState
@@ -84,12 +71,11 @@ class GRemoteSession @Inject constructor(
                     credentials = credentialsStateManager.currentCredentialsState
                 }
 
-                return if(credentials !is CredentialsState.SshCredentialsAccepted)
+                if(credentials !is CredentialsState.SshCredentialsAccepted)
                     null
                 else
                     credentials.password
             }
-        }
 
         client.filePasswordProvider = filePasswordProvider