Skip to content

Feature/2026 06 04 #36

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
Idddd merged 4 commits into from
Jun 4, 2026
Merged

Feature/2026 06 04 #36

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
37e49b5
Revert "fix: login SSO HTTP client also reads TLS disable setting"
Idddd Jun 4, 2026
a04eb52
Revert "fix: default disable TLS verification, auto-pull on check upd…
Idddd Jun 4, 2026
a7294e8
Reapply "fix: default disable TLS verification, auto-pull on check up…
Idddd Jun 4, 2026
46cf10d
fix: remove shared SSO token, store tokens per-service
Idddd Jun 4, 2026
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
21 changes: 5 additions & 16 deletions plugin-idea/src/main/kotlin/org/openprojectx/ai/plugin/AuthManager.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ class AuthManager(private val project: Project) {
companion object {
fun getInstance(project: Project): AuthManager = project.service()

private const val SSO_TOKEN_KEY = "OpenProjectX.AI.SSO.Token"
private const val SSO_CREDENTIALS_KEY = "OpenProjectX.AI.SSO.Credentials"
private fun serviceTokenKey(service: String) = "OpenProjectX.AI.SSO.$service.Token"
}
Expand All @@ -36,12 +35,7 @@ class AuthManager(private val project: Project) {
// 1. Service-specific token from PasswordSafe
readToken(serviceTokenKey(service))?.let { return it }

// 2. Shared SSO token from PasswordSafe
if (independentLogin == null) {
readToken(SSO_TOKEN_KEY)?.let { return it }
}

// 3. Independent username/password configured → login with independent or shared template
// 2. Independent username/password configured → login with independent or shared template
if (!independentUsername.isNullOrBlank() && !independentPassword.isNullOrBlank()) {
val loginConfig = independentLogin ?: loadSharedLoginConfig()
?: error("No login template configured. Set llm.auth.login in .ai-test.yaml")
Expand All @@ -57,7 +51,7 @@ class AuthManager(private val project: Project) {
?: error("No login template configured. Set llm.auth.login in .ai-test.yaml")
val token = executeLogin(loginConfig, savedCreds.first, savedCreds.second)
if (token.isNotBlank()) {
saveToken(SSO_TOKEN_KEY, token)
saveToken(serviceTokenKey(service), token)
return token
}
}
Expand All @@ -73,12 +67,8 @@ class AuthManager(private val project: Project) {
independentUsername: String? = null,
independentPassword: String? = null
): String {
// Clear service token
// Clear service-specific token
clearToken(serviceTokenKey(service))
// Also clear shared SSO token (it's the same source)
if (independentLogin == null) {
clearToken(SSO_TOKEN_KEY)
}

// Independent credentials → retry with those
if (!independentUsername.isNullOrBlank() && !independentPassword.isNullOrBlank()) {
Expand All @@ -96,7 +86,7 @@ class AuthManager(private val project: Project) {
?: error("No login template configured")
val token = executeLogin(loginConfig, savedCreds.first, savedCreds.second)
if (token.isNotBlank()) {
saveToken(SSO_TOKEN_KEY, token)
saveToken(serviceTokenKey(service), token)
return token
}
}
Expand All @@ -120,8 +110,7 @@ class AuthManager(private val project: Project) {
error("SSO login returned empty token for $service$hint. Check logs for details.")
}

val targetKey = if (independentLogin != null) serviceTokenKey(service) else SSO_TOKEN_KEY
saveToken(targetKey, token)
saveToken(serviceTokenKey(service), token)
if (credentials.remember) {
saveCredentials(SSO_CREDENTIALS_KEY, credentials.username, credentials.password)
}
Expand Down
Loading