MDS/openide
1
0
Fork 0
mirror of https://gitflic.ru/project/openide/openide.git synced 2025-12-16 14:23:28 +07:00
Code Issues Packages Projects Releases Wiki Activity

[github] Add a 'listener' to close the current connection if the account is removed

Browse Source 
Same as for gitlab, failed to add this in the initial fix.

#IJPL-148242 Fixed

GitOrigin-RevId: 7e195fa52a700772d9c336eef107f9f9588ea70d
This commit is contained in:
Chris Lemaire
2024-09-17 17:08:00 +02:00
committed by intellij-monorepo-bot
parent 4ac8bdce97
commit b6d9139cad
1 changed files with 30 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
plugins/github/src/org/jetbrains/plugins/github/pullrequest/GHRepositoryConnectionManager.kt
View File

@@ -1,9 +1,12 @@
// Copyright 2000-2022 JetBrains s.r.o. and contributors. Use of this source code is governed by the Apache 2.0 license.
package org.jetbrains.plugins.github.pullrequest
import com.intellij.collaboration.async.classAsCoroutineName
import com.intellij.collaboration.util.serviceGet
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.project.Project
import com.intellij.platform.util.coroutines.childScope
import git4idea.remote.hosting.SingleHostedGitRepositoryConnectionManager
import git4idea.remote.hosting.SingleHostedGitRepositoryConnectionManagerImpl
import git4idea.remote.hosting.ValidatingHostedGitRepositoryConnectionFactory
@@ -23,19 +26,40 @@ import org.jetbrains.plugins.github.util.GHHostedRepositoriesManager
@Service(Service.Level.PROJECT)
internal class GHRepositoryConnectionManager(project: Project, parentCs: CoroutineScope) :
SingleHostedGitRepositoryConnectionManager<GHGitRepositoryMapping, GithubAccount, GHRepositoryConnection> {
private val cs = parentCs.childScope(this.classAsCoroutineName().name)
private val dataContextRepository = project.serviceGet<GHPRDataContextRepository>()
private val repositoriesManager = project.service<GHHostedRepositoriesManager>()
private val accountManager = service<GHAccountManager>()
private val connectionFactory =
ValidatingHostedGitRepositoryConnectionFactory(project.serviceGet<GHHostedRepositoriesManager>(),
serviceGet<GHAccountManager>()) { repo, account, tokenState ->
ValidatingHostedGitRepositoryConnectionFactory({ repositoriesManager }, { accountManager }) { repo, account, tokenState ->
createConnection(this, tokenState, repo, account)
}
private suspend fun createConnection(connectionScope: CoroutineScope,
tokenState: StateFlow<String>,
repo: GHGitRepositoryMapping,
account: GithubAccount): GHRepositoryConnection {
private val delegate = SingleHostedGitRepositoryConnectionManagerImpl(parentCs, connectionFactory)
override val connectionState: StateFlow<GHRepositoryConnection?>
get() = delegate.connectionState
init {
cs.launch {
accountManager.accountsState.collect {
val currentAccount = connectionState.value?.account
if (currentAccount != null && !it.contains(currentAccount)) {
closeConnection()
}
}
}
}
private suspend fun createConnection(
connectionScope: CoroutineScope,
tokenState: StateFlow<String>,
repo: GHGitRepositoryMapping,
account: GithubAccount,
): GHRepositoryConnection {
val tokenSupplier = GithubApiRequestExecutor.MutableTokenSupplier(account.server, tokenState.value)
connectionScope.launch {
tokenState.collect {
@@ -56,11 +80,6 @@ internal class GHRepositoryConnectionManager(project: Project, parentCs: Corouti
return GHRepositoryConnection(connectionScope, repo, account, dataContext)
}
private val delegate = SingleHostedGitRepositoryConnectionManagerImpl(parentCs, connectionFactory)
override val connectionState: StateFlow<GHRepositoryConnection?>
get() = delegate.connectionState
override suspend fun openConnection(repo: GHGitRepositoryMapping, account: GithubAccount): GHRepositoryConnection? =
delegate.openConnection(repo, account)