Skip to content

Fix constant Gitpod Plugin exception on Gateway startup #20291

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
merged 1 commit into from
Oct 11, 2024
Merged

Fix constant Gitpod Plugin exception on Gateway startup #20291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion ...ains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/auth/GitpodAuthCallbackHandler.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import org.jetbrains.io.response
import java.nio.charset.StandardCharsets

internal class GitpodAuthCallbackHandler : RestService() {
private val service = GitpodAuthService.instance
private val service = GitpodAuthService.instance.get()

override fun getServiceName(): String = service.name

Expand Down
8 changes: 6 additions & 2 deletions ...de/jetbrains/gateway-plugin/src/main/kotlin/io/gitpod/jetbrains/auth/GitpodAuthService.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,10 @@ import com.intellij.credentialStore.CredentialAttributes
import com.intellij.credentialStore.generateServiceName
import com.intellij.ide.passwordSafe.PasswordSafe
import com.intellij.openapi.Disposable
import com.intellij.openapi.application.CachedSingletonsRegistry
import com.intellij.openapi.components.Service
import com.intellij.openapi.components.service
import com.intellij.openapi.diagnostic.thisLogger
import com.intellij.util.EventDispatcher
import com.intellij.util.Url
import com.intellij.util.Urls.encodeParameters
Expand All @@ -35,6 +37,7 @@ import java.net.http.HttpResponse
import java.security.SecureRandom
import java.util.*
import java.util.concurrent.CompletableFuture
import java.util.function.Supplier
import kotlin.math.absoluteValue

@Service
Expand Down Expand Up @@ -148,7 +151,8 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {
}

companion object {
val instance: GitpodAuthService = service()
@Suppress("UnstableApiUsage")
val instance: Supplier<GitpodAuthService> = CachedSingletonsRegistry.lazy { service() }

private const val SERVICE_NAME = "gitpod/oauth"
private const val CLIENT_ID = "jetbrains-gateway-gitpod-plugin"
Expand Down Expand Up @@ -176,7 +180,7 @@ internal class GitpodAuthService : OAuthServiceBase<Credentials>() {
}

suspend fun authorize(gitpodHost: String): String {
val accessToken = instance.authorize(gitpodHost).await().accessToken
val accessToken = instance.get().authorize(gitpodHost).await().accessToken
setAccessToken(gitpodHost, accessToken)
return accessToken
}
Expand Down
Loading