call if

Author: evanliu048

plugins/amazonq/chat/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/QLoginWebview.kt

@@ -264,23 +264,6 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
         // TODO: pass "REAUTH" if connection expires
         // Perform the potentially blocking AWS call outside the EDT to fetch available region profiles.
         ApplicationManager.getApplication().executeOnPooledThread {
-            var errorMessage: String? = null
-            val profiles: List<QRegionProfile> = try {
-                QRegionProfileManager.getInstance().listRegionProfiles(project).orEmpty()
-            } catch (e: Exception) {
-                errorMessage = e.message
-                LOG.warn { "Failed to call listRegionProfiles API" }
-                val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
-                Telemetry.amazonq.didSelectProfile.use { span ->
-                    span.source(QProfileSwitchIntent.Auth.value)
-                        .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
-                        .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
-                        .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
-                        .result(MetricResult.Failed)
-                        .reason(e.message)
-                }
-                emptyList()
-            }
 
             val stage = if (isQExpired(project)) {
                 "REAUTH"
@@ -290,6 +273,27 @@ class QWebviewBrowser(val project: Project, private val parentDisposable: Dispos
                 "START"
             }
 
+            var errorMessage: String? = null
+            var profiles: List<QRegionProfile> = emptyList()
+
+            if (stage == "PROFILE_SELECT") {
+                try {
+                    profiles = QRegionProfileManager.getInstance().listRegionProfiles(project).orEmpty()
+                } catch (e: Exception) {
+                    errorMessage = e.message
+                    LOG.warn { "Failed to call listRegionProfiles API" }
+                    val qConn = ToolkitConnectionManager.getInstance(project).activeConnectionForFeature(QConnection.getInstance())
+                    Telemetry.amazonq.didSelectProfile.use { span ->
+                        span.source(QProfileSwitchIntent.Auth.value)
+                            .amazonQProfileRegion(QRegionProfileManager.getInstance().activeProfile(project)?.region ?: "not-set")
+                            .ssoRegion((qConn as? AwsBearerTokenConnection)?.region)
+                            .credentialStartUrl((qConn as? AwsBearerTokenConnection)?.startUrl)
+                            .result(MetricResult.Failed)
+                            .reason(e.message)
+                    }
+                }
+            }
+
             val jsonData = """
             {
                 stage: '$stage',

plugins/amazonq/shared/jetbrains-community/src/software/aws/toolkits/jetbrains/services/amazonq/profile/QRegionProfileManager.kt

@@ -74,7 +74,7 @@ class QRegionProfileManager : PersistentStateComponent<QProfileState>, Disposabl
                         .awsClient<CodeWhispererRuntimeClient>()
                         .listAvailableProfilesPaginator {}
                         .profiles()
-                        .map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName()) }
+                        .map { p -> QRegionProfile(arn = p.arn(), profileName = p.profileName()?: "<no name>") }
                 }
             if (mappedProfiles.size == 1) {
                 switchProfile(project, mappedProfiles.first(), intent = QProfileSwitchIntent.Update)