Skip to content

Fix JSR310 serialization error when preparing login panel #5216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
rli merged 2 commits into from
Jan 9, 2025
Merged

Fix JSR310 serialization error when preparing login panel #5216

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5670162
Fix JSR310 serialization error when preparing login panel
rli Dec 20, 2024
ff4e335
Update TelemetryHelperTest.kt
rli Dec 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions .changes/next-release/bugfix-213273c1-12a5-47d1-b973-499d25e1d68e.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
{
"type" : "bugfix",
"description" : "Fix issue where users are unable to login to Amazon Q if they have previously authenticated (#5214)"
}
1 change: 1 addition & 0 deletions ...ins-community/tst/software/aws/toolkits/jetbrains/services/amazonq/TelemetryHelperTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ import software.aws.toolkits.jetbrains.services.cwc.messages.LinkType
import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionInfo
import software.aws.toolkits.jetbrains.services.cwc.storage.ChatSessionStorage
import software.aws.toolkits.jetbrains.services.telemetry.MockTelemetryServiceExtension
import software.aws.toolkits.jetbrains.services.telemetry.TelemetryService
import software.aws.toolkits.jetbrains.settings.CodeWhispererSettings
import software.aws.toolkits.telemetry.CwsprChatConversationType
import software.aws.toolkits.telemetry.CwsprChatInteractionType
Expand Down
3 changes: 3 additions & 0 deletions ...-community/src/software/aws/toolkits/jetbrains/core/credentials/ToolkitConnectionImpls.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

package software.aws.toolkits.jetbrains.core.credentials

import com.fasterxml.jackson.annotation.JsonIgnore
import com.intellij.openapi.Disposable
import com.intellij.openapi.util.Disposer
import software.aws.toolkits.core.TokenConnectionSettings
Expand Down Expand Up @@ -73,6 +74,7 @@ sealed class ManagedBearerSsoConnection(
region
)

@JsonIgnore
override fun getConnectionSettings(): TokenConnectionSettings = provider

override fun dispose() {
Expand All @@ -99,6 +101,7 @@ class DetectedDiskSsoSessionConnection(
region
)

@JsonIgnore
override fun getConnectionSettings(): TokenConnectionSettings = provider

override fun dispose() {
Expand Down
17 changes: 17 additions & 0 deletions ...ity/tst/software/aws/toolkits/jetbrains/core/credentials/DefaultToolkitAuthManagerTest.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@

package software.aws.toolkits.jetbrains.core.credentials

import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.ApplicationManager
import com.intellij.testFramework.ProjectExtension
Expand Down Expand Up @@ -453,6 +454,22 @@ class DefaultToolkitAuthManagerTest {
}
}

@Test
fun `serializing LegacyManagedBearerSsoConnection does not include connectionSettings`() {
val profile = ManagedSsoProfile("us-east-1", "startUrl000", listOf("scopes"))
val connection = sut.createConnection(profile) as LegacyManagedBearerSsoConnection

assertThat(jacksonObjectMapper().writeValueAsString(connection)).doesNotContain("connectionSettings")
}

@Test
fun `serializing ProfileSsoManagedBearerSsoConnection does not include connectionSettings`() {
val profile = UserConfigSsoSessionProfile("sessionName", "us-east-1", "startUrl000", listOf("scopes"))
val connection = sut.createConnection(profile) as ProfileSsoManagedBearerSsoConnection

assertThat(jacksonObjectMapper().writeValueAsString(connection)).doesNotContain("connectionSettings")
}

private companion object {
@ExtendWith(ProjectExtension::class)
val projectRule = ProjectRule()
Expand Down
Loading