Skip to content

Commit 94a5c5d

Browse files
authored
Fix regression with connection source metadata (#4931)
Dropped in #4819
1 parent 5b375f7 commit 94a5c5d

File tree

1 file changed

+11
-6
lines changed
  • plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials

1 file changed

+11
-6
lines changed

plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitAuthManager.kt

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,6 @@ fun loginSso(
121121
onSuccess: () -> Unit = {},
122122
metadata: ConnectionMetadata? = null
123123
): AwsBearerTokenConnection? {
124-
val source = metadata
125124
fun createAndAuthNewConnection(profile: AuthProfile): AwsBearerTokenConnection? {
126125
val authManager = ToolkitAuthManager.getInstance()
127126
val connection = try {
@@ -130,6 +129,7 @@ fun loginSso(
130129
project = project,
131130
connection = transientConnection,
132131
onPendingToken = onPendingToken,
132+
source = metadata?.sourceId,
133133
)
134134
}
135135
} catch (e: Exception) {
@@ -233,7 +233,8 @@ fun reauthConnectionIfNeeded(
233233
project: Project?,
234234
connection: ToolkitConnection,
235235
onPendingToken: (InteractiveBearerTokenProvider) -> Unit = {},
236-
isReAuth: Boolean = false
236+
isReAuth: Boolean = false,
237+
source: String? = null,
237238
): BearerTokenProvider {
238239
val tokenProvider = (connection.getConnectionSettings() as TokenConnectionSettings).tokenProvider.delegate as BearerTokenProvider
239240
if (tokenProvider is InteractiveBearerTokenProvider) {
@@ -250,12 +251,14 @@ fun reauthConnectionIfNeeded(
250251
credentialStartUrl = startUrl,
251252
credentialSourceId = getCredentialIdForTelemetry(connection),
252253
isReAuth = true,
253-
result = Result.Succeeded
254+
result = Result.Succeeded,
255+
source = source,
254256
)
255257
recordAddConnection(
256258
credentialSourceId = getCredentialIdForTelemetry(connection),
257259
isReAuth = true,
258-
result = Result.Succeeded
260+
result = Result.Succeeded,
261+
source = source,
259262
)
260263
}
261264
} catch (e: Exception) {
@@ -265,12 +268,14 @@ fun reauthConnectionIfNeeded(
265268
credentialStartUrl = startUrl,
266269
credentialSourceId = getCredentialIdForTelemetry(connection),
267270
isReAuth = true,
268-
result = result
271+
result = result,
272+
source = source,
269273
)
270274
recordAddConnection(
271275
credentialSourceId = getCredentialIdForTelemetry(connection),
272276
isReAuth = true,
273-
result = result
277+
result = result,
278+
source = source,
274279
)
275280
}
276281

0 commit comments

Comments
 (0)