persistent keys with right service name, key and username.

Author: andxu

PluginsAndFeatures/azure-toolkit-for-intellij/resources/META-INF/plugin.xml

@@ -70,6 +70,7 @@
           id="Azure Activity Log"
           canCloseContents="true"
           icon="/icons/Common/AzureActivityLog.svg"/>
+    <applicationService serviceImplementation="com.microsoft.intellij.configuration.IdeaSecureStoreSettings"/>
     <projectConfigurable groupId="root"
                          id="com.microsoft.intellij.AzureConfigurable"
                          provider="com.microsoft.intellij.AzureConfigurableProvider"

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/secure/IdeaSecureStore.java

@@ -16,11 +16,8 @@
 import static com.intellij.credentialStore.CredentialAttributesKt.generateServiceName;
 
 public class IdeaSecureStore implements SecureStore {
-    private IdeaSecureStore() {
-    }
-
-    // Leverage IntelliJ PasswordSafe component
     private PasswordSafe passwordSafe = PasswordSafe.getInstance();
+    private final CredentialAttributes keysEntry = makeKey("SecureStore", "keys", null);
 
     private static class LazyHolder {
         static final IdeaSecureStore INSTANCE = new IdeaSecureStore();
@@ -32,6 +29,13 @@ public static IdeaSecureStore getInstance() {
 
     @Override
     public void savePassword(@Nonnull String serviceName, @Nullable String key, @Nullable String userName, @Nonnull String password) {
+        final String compositeKey = StringUtils.joinWith("|", serviceName, StringUtils.defaultString(key), StringUtils.defaultString(userName));
+        String savedKeys = passwordSafe.getPassword(keysEntry);
+        if (StringUtils.contains(savedKeys, compositeKey) && StringUtils.isNotBlank(password)) {
+            savedKeys = StringUtils.defaultString(savedKeys) + "\n" + compositeKey;
+            passwordSafe.setPassword(keysEntry, savedKeys);
+        }
+
         passwordSafe.setPassword(makeKey(serviceName, key, userName), password);
     }
 
@@ -58,11 +62,11 @@ public void migratePassword(@Nonnull String oldKeyOrServiceName, @Nullable Strin
         if (StringUtils.isBlank(passwordSafe.getPassword(newKey))) {
             passwordSafe.setPassword(newKey, passwordSafe.getPassword(oldKey));
         }
-        passwordSafe.set(oldKey, null);
+        passwordSafe.setPassword(oldKey, null);
     }
 
     @Nonnull
-    private CredentialAttributes makeKey(String serviceName, @Nullable String key, @Nullable String userName) {
+    private static CredentialAttributes makeKey(String serviceName, @Nullable String key, @Nullable String userName) {
         String serverNameWithPrefix = serviceName;
         if (!StringUtils.contains(serviceName, "Azure IntelliJ Plugin")) {
             serverNameWithPrefix = StringUtils.join("Azure IntelliJ Plugin | " + serviceName);