bump

rli · rli · commit b885ac02469b · 2024-11-18T16:01:40.000-08:00
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoLoginCallbackProvider.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/SsoLoginCallbackProvider.kt
@@ -7,6 +7,7 @@ import com.intellij.ide.BrowserUtil
 import com.intellij.openapi.progress.ProcessCanceledException
 import software.aws.toolkits.jetbrains.core.credentials.sono.SONO_URL
 import software.aws.toolkits.jetbrains.core.credentials.sso.bearer.ConfirmUserCodeLoginDialog
+import software.aws.toolkits.jetbrains.core.gettingstarted.editor.SourceOfEntry
 import software.aws.toolkits.jetbrains.utils.computeOnEdt
 import software.aws.toolkits.jetbrains.utils.isQWebviewsAvailable
 import software.aws.toolkits.jetbrains.utils.notifyError
@@ -39,12 +40,24 @@ class DefaultSsoLoginCallbackProvider : SsoLoginCallbackProvider {
 
 interface SsoPrompt : SsoLoginCallback {
     override fun tokenRetrieved() {
-        AwsTelemetry.loginWithBrowser(project = null, result = Result.Succeeded, credentialType = CredentialType.SsoProfile, authType = AuthType.DeviceCode, source= "")
+        AwsTelemetry.loginWithBrowser(
+            project = null,
+            result = Result.Succeeded,
+            credentialType = CredentialType.SsoProfile,
+            authType = AuthType.DeviceCode,
+            source = SourceOfEntry.UNKNOWN.toString(),
+        )
     }
 
     override fun tokenRetrievalFailure(e: Exception) {
         e.notifyError(AwsCoreBundle.message("credentials.sso.login.failed"))
-        AwsTelemetry.loginWithBrowser(project = null, result = Result.Failed, credentialType = CredentialType.SsoProfile, authType = AuthType.DeviceCode, source= "")
+        AwsTelemetry.loginWithBrowser(
+            project = null,
+            result = Result.Failed,
+            credentialType = CredentialType.SsoProfile,
+            authType = AuthType.DeviceCode,
+            source = SourceOfEntry.UNKNOWN.toString(),
+        )
     }
 }
 
@@ -65,7 +78,7 @@ object DefaultSsoPrompt : SsoPrompt {
                     result = Result.Cancelled,
                     credentialType = CredentialType.SsoProfile,
                     authType = AuthType.DeviceCode,
-                    source= "",
+                    source = SourceOfEntry.UNKNOWN.toString(),
                 )
                 throw ProcessCanceledException(IllegalStateException(AwsCoreBundle.message("credentials.sso.login.cancelled")))
             }
@@ -83,11 +96,23 @@ object SsoPromptWithBrowserSupport : SsoPrompt {
 
 interface BearerTokenPrompt : SsoLoginCallback {
     override fun tokenRetrieved() {
-        AwsTelemetry.loginWithBrowser(project = null, result = Result.Succeeded, credentialType = CredentialType.BearerToken, authType = AuthType.DeviceCode, source= "",)
+        AwsTelemetry.loginWithBrowser(
+            project = null,
+            result = Result.Succeeded,
+            credentialType = CredentialType.BearerToken,
+            authType = AuthType.DeviceCode,
+            source = "",
+        )
     }
 
     override fun tokenRetrievalFailure(e: Exception) {
-        AwsTelemetry.loginWithBrowser(project = null, result = Result.Failed, credentialType = CredentialType.BearerToken, authType = AuthType.DeviceCode, source= "",)
+        AwsTelemetry.loginWithBrowser(
+            project = null,
+            result = Result.Failed,
+            credentialType = CredentialType.BearerToken,
+            authType = AuthType.DeviceCode,
+            source = "",
+        )
     }
 }
 
@@ -108,7 +133,7 @@ object DefaultBearerTokenPrompt : BearerTokenPrompt {
                     result = Result.Cancelled,
                     credentialType = CredentialType.BearerToken,
                     authType = AuthType.DeviceCode,
-                    source= "",
+                    source = SourceOfEntry.UNKNOWN.toString(),
                 )
             }
         }
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/pkce/ToolkitOAuthService.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/credentials/sso/pkce/ToolkitOAuthService.kt
@@ -208,7 +208,7 @@ internal class ToolkitOAuthCallbackHandler : OAuthCallbackHandlerBase() {
                 reason = error,
                 reasonDesc = errorDescription,
                 authType = AuthType.PKCE,
-                source = "",
+                source = SourceOfEntry.UNKNOWN.toString(),
             )
 
             mapOf(
diff --git a/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt b/plugins/core/jetbrains-community/src/software/aws/toolkits/jetbrains/core/webview/LoginBrowser.kt
@@ -330,7 +330,7 @@ abstract class LoginBrowser(
                         reason = error.message,
                         credentialType = CredentialType.StaticProfile,
                         authType = AuthType.IAM,
-                        source = "",
+                        source = SourceOfEntry.LOGIN_BROWSER.toString(),
                     )
                     LOG.error(error) { "Profile file error" }
                     Messages.showErrorDialog(jcefBrowser.component, error.message, AwsCoreBundle.message("gettingstarted.auth.failed"))
@@ -341,7 +341,7 @@ abstract class LoginBrowser(
                         result = Result.Failed,
                         reason = "Profile already exists",
                         authType = AuthType.IAM,
-                        source = "",
+                        source = SourceOfEntry.LOGIN_BROWSER.toString(),
                     )
                 },
                 { error ->
@@ -351,7 +351,7 @@ abstract class LoginBrowser(
                         result = Result.Failed,
                         reason = reason,
                         authType = AuthType.IAM,
-                        source = "",
+                        source = SourceOfEntry.LOGIN_BROWSER.toString(),
                     )
                     LOG.error(error) { reason }
                     Messages.showErrorDialog(jcefBrowser.component, error.message, AwsCoreBundle.message("gettingstarted.auth.failed"))
@@ -365,7 +365,7 @@ abstract class LoginBrowser(
                     result = Result.Succeeded,
                     credentialType = CredentialType.StaticProfile,
                     authType = AuthType.IAM,
-                    source = "",
+                    source = SourceOfEntry.LOGIN_BROWSER.toString(),
                 )
             }
         }

Original file line number	Diff line number	Diff line change
`@@ -208,7 +208,7 @@ internal class ToolkitOAuthCallbackHandler : OAuthCallbackHandlerBase() {`
`208`	`208`	`reason = error,`
`209`	`209`	`reasonDesc = errorDescription,`
`210`	`210`	`authType = AuthType.PKCE,`
`211`		`- source = "",`
	`211`	`+ source = SourceOfEntry.UNKNOWN.toString(),`
`212`	`212`	`)`
`213`	`213`
`214`	`214`	`mapOf(`
Original file line number	Diff line number	Diff line change
`@@ -330,7 +330,7 @@ abstract class LoginBrowser(`
`330`	`330`	`reason = error.message,`
`331`	`331`	`credentialType = CredentialType.StaticProfile,`
`332`	`332`	`authType = AuthType.IAM,`
`333`		`- source = "",`
	`333`	`+ source = SourceOfEntry.LOGIN_BROWSER.toString(),`
`334`	`334`	`)`
`335`	`335`	`LOG.error(error) { "Profile file error" }`
`336`	`336`	`Messages.showErrorDialog(jcefBrowser.component, error.message, AwsCoreBundle.message("gettingstarted.auth.failed"))`
`@@ -341,7 +341,7 @@ abstract class LoginBrowser(`
`341`	`341`	`result = Result.Failed,`
`342`	`342`	`reason = "Profile already exists",`
`343`	`343`	`authType = AuthType.IAM,`
`344`		`- source = "",`
	`344`	`+ source = SourceOfEntry.LOGIN_BROWSER.toString(),`
`345`	`345`	`)`
`346`	`346`	`},`
`347`	`347`	`{ error ->`
`@@ -351,7 +351,7 @@ abstract class LoginBrowser(`
`351`	`351`	`result = Result.Failed,`
`352`	`352`	`reason = reason,`
`353`	`353`	`authType = AuthType.IAM,`
`354`		`- source = "",`
	`354`	`+ source = SourceOfEntry.LOGIN_BROWSER.toString(),`
`355`	`355`	`)`
`356`	`356`	`LOG.error(error) { reason }`
`357`	`357`	`Messages.showErrorDialog(jcefBrowser.component, error.message, AwsCoreBundle.message("gettingstarted.auth.failed"))`
`@@ -365,7 +365,7 @@ abstract class LoginBrowser(`
`365`	`365`	`result = Result.Succeeded,`
`366`	`366`	`credentialType = CredentialType.StaticProfile,`
`367`	`367`	`authType = AuthType.IAM,`
`368`		`- source = "",`
	`368`	`+ source = SourceOfEntry.LOGIN_BROWSER.toString(),`
`369`	`369`	`)`
`370`	`370`	`}`
`371`	`371`	`}`