From eaa66170a5a84c2b1dfc353d43c07656117c5d04 Mon Sep 17 00:00:00 2001 From: Chris Lemaire Date: Wed, 13 Mar 2024 12:54:30 +0100 Subject: [PATCH] [gitlab] Make sure the same ID is used when storing a target account (IDEA-346082) #IDEA-346082 Fixed Seems the account was not overridden because a new ID was generated for the 'updated' account, but it should still override the old account. GitOrigin-RevId: 36a6dcc6118f0cd23b1d3e96af8282e6393cb884 --- .../plugins/gitlab/authentication/GitLabLoginUtil.kt | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/authentication/GitLabLoginUtil.kt b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/authentication/GitLabLoginUtil.kt index 764bf3be5409..d373fc54ba78 100644 --- a/plugins/gitlab/src/org/jetbrains/plugins/gitlab/authentication/GitLabLoginUtil.kt +++ b/plugins/gitlab/src/org/jetbrains/plugins/gitlab/authentication/GitLabLoginUtil.kt @@ -78,7 +78,10 @@ object GitLabLoginUtil { val exitState = showLoginDialog(project, parentComponent, model, title, true) val loginState = model.loginState.value if (exitState == DialogWrapper.OK_EXIT_CODE && loginState is LoginModel.LoginState.Connected) { - return LoginResult.Success(GitLabAccount(name = loginState.username, server = model.getServerPath()), model.token) + return LoginResult.Success( + GitLabAccount(id = account.id, name = loginState.username, server = model.getServerPath()), + model.token + ) } return LoginResult.Failure