impl: go to main page after signing in

fioan89 · fioan89 · commit 5973b0d69b91 · 2025-02-20T22:31:36.000+02:00
- if successfully signed in we go back to the
  main page which shows the environments/workspaces
- similar approach if user hits Cancel during sign in
- `EnvironmentUiPageManager` is an undocumented Toolbox
  component that has more flexibility to navigate between pages
diff --git a/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt b/src/main/kotlin/com/coder/toolbox/CoderRemoteProvider.kt
@@ -18,10 +18,12 @@ import com.coder.toolbox.views.SignInPage
 import com.coder.toolbox.views.TokenPage
 import com.jetbrains.toolbox.api.core.PluginSecretStore
 import com.jetbrains.toolbox.api.core.PluginSettingsStore
+import com.jetbrains.toolbox.api.core.ServiceLocator
 import com.jetbrains.toolbox.api.core.ui.icons.SvgIcon
 import com.jetbrains.toolbox.api.remoteDev.ProviderVisibilityState
 import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
 import com.jetbrains.toolbox.api.remoteDev.RemoteProvider
+import com.jetbrains.toolbox.api.remoteDev.ui.EnvironmentUiPageManager
 import com.jetbrains.toolbox.api.ui.ToolboxUi
 import com.jetbrains.toolbox.api.ui.actions.RunnableActionDescription
 import com.jetbrains.toolbox.api.ui.components.AccountDropdownField
@@ -39,15 +41,17 @@ import kotlin.coroutines.cancellation.CancellationException
 import kotlin.time.Duration.Companion.seconds
 
 class CoderRemoteProvider(
+    private val serviceLocator: ServiceLocator,
     private val httpClient: OkHttpClient,
-    private val consumer: RemoteEnvironmentConsumer,
-    private val coroutineScope: CoroutineScope,
-    private val ui: ToolboxUi,
-    settingsStore: PluginSettingsStore,
-    secretsStore: PluginSecretStore,
 ) : RemoteProvider {
     private val logger = LoggerFactory.getLogger(javaClass)
 
+    private val ui: ToolboxUi = serviceLocator.getService(ToolboxUi::class.java)
+    private val consumer: RemoteEnvironmentConsumer = serviceLocator.getService(RemoteEnvironmentConsumer::class.java)
+    private val coroutineScope: CoroutineScope = serviceLocator.getService(CoroutineScope::class.java)
+    private val settingsStore: PluginSettingsStore = serviceLocator.getService(PluginSettingsStore::class.java)
+    private val secretsStore: PluginSecretStore = serviceLocator.getService(PluginSecretStore::class.java)
+
     // Current polling job.
     private var pollJob: Job? = null
     private var lastEnvironments: Set<CoderRemoteEnvironment>? = null
@@ -60,7 +64,7 @@ class CoderRemoteProvider(
     private val dialogUi = DialogUi(settings, ui)
     private val linkHandler = LinkHandler(settings, httpClient, dialogUi)
 
-    // The REST client, if we are signed in.
+    // The REST client, if we are signed in
     private var client: CoderRestClient? = null
 
     // If we have an error in the polling we store it here before going back to
@@ -146,7 +150,6 @@ class CoderRemoteProvider(
         // rememberMe to false so we do not try to automatically log in.
         secrets.rememberMe = "false"
         close()
-        reset()
     }
 
     /**
@@ -251,9 +254,8 @@ class CoderRemoteProvider(
      * ui.hideUiPage() which stacks and has built-in back navigation, rather
      * than using multiple root pages.
      */
-    private fun reset() {
-        // TODO - check this later
-//        ui.showPluginEnvironmentsPage()
+    private fun goToEnvironmentsPage() {
+        serviceLocator.getService(EnvironmentUiPageManager::class.java).showPluginEnvironmentsPage()
     }
 
     /**
@@ -309,7 +311,7 @@ class CoderRemoteProvider(
         settings,
         httpClient,
         coroutineScope,
-        { reset() },
+        ::goToEnvironmentsPage,
     ) { client, cli ->
         // Store the URL and token for use next time.
         secrets.lastDeploymentURL = client.url.toString()
@@ -320,7 +322,7 @@ class CoderRemoteProvider(
         pollError = null
         pollJob?.cancel()
         pollJob = poll(client, cli)
-        reset()
+        goToEnvironmentsPage()
     }
 
     /**
diff --git a/src/main/kotlin/com/coder/toolbox/CoderToolboxExtension.kt b/src/main/kotlin/com/coder/toolbox/CoderToolboxExtension.kt
@@ -1,13 +1,8 @@
 package com.coder.toolbox
 
-import com.jetbrains.toolbox.api.core.PluginSecretStore
-import com.jetbrains.toolbox.api.core.PluginSettingsStore
 import com.jetbrains.toolbox.api.core.ServiceLocator
 import com.jetbrains.toolbox.api.remoteDev.RemoteDevExtension
-import com.jetbrains.toolbox.api.remoteDev.RemoteEnvironmentConsumer
 import com.jetbrains.toolbox.api.remoteDev.RemoteProvider
-import com.jetbrains.toolbox.api.ui.ToolboxUi
-import kotlinx.coroutines.CoroutineScope
 import okhttp3.OkHttpClient
 
 /**
@@ -17,12 +12,8 @@ class CoderToolboxExtension : RemoteDevExtension {
     // All services must be passed in here and threaded as necessary.
     override fun createRemoteProviderPluginInstance(serviceLocator: ServiceLocator): RemoteProvider {
         return CoderRemoteProvider(
+            serviceLocator,
             OkHttpClient(),
-            serviceLocator.getService(RemoteEnvironmentConsumer::class.java),
-            serviceLocator.getService(CoroutineScope::class.java),
-            serviceLocator.getService(ToolboxUi::class.java),
-            serviceLocator.getService(PluginSettingsStore::class.java),
-            serviceLocator.getService(PluginSecretStore::class.java),
         )
     }
 }
diff --git a/src/main/kotlin/com/coder/toolbox/views/ConnectPage.kt b/src/main/kotlin/com/coder/toolbox/views/ConnectPage.kt
@@ -96,6 +96,7 @@ class ConnectPage(
                     cli.login(client.token)
                 }
                 onConnect(client, cli)
+
             } catch (ex: Exception) {
                 val msg = humanizeConnectionError(url, settings.requireTokenAuth, ex)
                 notify("Failed to configure ${url.host}", ex)

Original file line number	Diff line number	Diff line change
`@@ -96,6 +96,7 @@ class ConnectPage(`
`96`	`96`	`cli.login(client.token)`
`97`	`97`	`}`
`98`	`98`	`onConnect(client, cli)`
	`99`	`+`
`99`	`100`	`} catch (ex: Exception) {`
`100`	`101`	`val msg = humanizeConnectionError(url, settings.requireTokenAuth, ex)`
`101`	`102`	`notify("Failed to configure ${url.host}", ex)`