Merge pull request #5406 from microsoft/bugfix-sp-clipboard

Fix bug: clip board doesn't work for sp login

Author: andxu

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/ui/ServicePrincipalLoginDialog.java

@@ -25,6 +25,7 @@
 import com.intellij.ui.EditorTextField;
 import com.intellij.ui.EditorTextFieldProvider;
 import com.intellij.ui.SoftWrapsEditorCustomization;
+import com.intellij.util.ui.UIUtil;
 import com.microsoft.azure.toolkit.intellij.common.AzureCommentLabel;
 import com.microsoft.azure.toolkit.intellij.common.AzureDialog;
 import com.microsoft.azure.toolkit.intellij.common.TextDocumentListenerAdapter;
@@ -90,8 +91,7 @@ protected ServicePrincipalLoginDialog(@Nonnull Project project) {
         init();
         super.setOKButtonText("Sign In");
 
-        pasteFromClipboard();
-        uiTextComponents2Json();
+        initJsonData();
 
         // initialize cert file select
         FileChooserDescriptor pem = FileChooserDescriptorFactory.createSingleFileDescriptor("pem");
@@ -221,13 +221,15 @@ public List<AzureValidationInfo> validateData() {
         return Collections.emptyList();
     }
 
-    private void pasteFromClipboard() {
+    private void initJsonData() {
         String textFromClip = findTextInClipboard(str ->
-            StringUtils.contains(str, "appId") && StringUtils.contains(str, "tenant") && StringUtils.contains(str, "password")
+            StringUtils.contains(str, "appId") && StringUtils.contains(str, "tenant") &&
+                (StringUtils.contains(str, "password") || StringUtils.contains(str, "fileWithCertAndPrivateKey"))
         );
         if (StringUtils.isNotBlank(textFromClip)) {
             json2UIComponents(textFromClip);
         }
+        uiTextComponents2Json();
     }
 
     @javax.annotation.Nullable
@@ -279,7 +281,7 @@ private void json2UIComponents(String json) {
         try {
             Map<String, String> map = JsonUtils.fromJson(json, HashMap.class);
             if (map != null) {
-                ApplicationManager.getApplication().invokeLater(() -> {
+                UIUtil.invokeLaterIfNeeded(() -> {
                     intermediateState = true;
                     try {
                         if (map.containsKey("appId")) {

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/ui/SignInWindow.java

@@ -13,6 +13,7 @@
 import com.intellij.openapi.project.Project;
 import com.intellij.openapi.ui.DialogWrapper;
 import com.intellij.ui.AnimatedIcon;
+import com.intellij.util.ui.UIUtil;
 import com.microsoft.azure.toolkit.lib.Azure;
 import com.microsoft.azure.toolkit.lib.auth.Account;
 import com.microsoft.azure.toolkit.lib.auth.AzureAccount;
@@ -171,11 +172,7 @@ public Single<AuthMethodDetails> login() {
             properties.putAll(signInSPProp);
             EventUtil.logEvent(EventType.info, ACCOUNT, SIGNIN, properties, null);
 
-            if (ApplicationManager.getApplication().isDispatchThread()) {
-                call(this::doServicePrincipalLogin, "sp");
-            } else {
-                AzureTaskManager.getInstance().runAndWait(() -> call(this::doServicePrincipalLogin, "sp"));
-            }
+            UIUtil.invokeAndWaitIfNeeded(() -> call(this::doServicePrincipalLogin, "sp"));
         } else if (deviceLoginRadioButton.isSelected()) {
             authMethodDetailsResult = call(this::doDeviceLogin, "dc");
         } else if (azureCliRadioButton.isSelected()) {