Merge branch 'endgame-july' into endgame-july.next

Flanker32 · Flanker32 · commit 49d941e285bf · 2021-07-25T16:59:55.000+08:00
diff --git a/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/secure/IdeaSecureStore.java b/PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/intellij/secure/IdeaSecureStore.java
@@ -58,11 +58,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);

Original file line number	Diff line number	Diff line change
`@@ -58,11 +58,11 @@ public void migratePassword(@Nonnull String oldKeyOrServiceName, @Nullable Strin`
`58`	`58`	`if (StringUtils.isBlank(passwordSafe.getPassword(newKey))) {`
`59`	`59`	`passwordSafe.setPassword(newKey, passwordSafe.getPassword(oldKey));`
`60`	`60`	`}`
`61`		`- passwordSafe.set(oldKey, null);`
	`61`	`+ passwordSafe.setPassword(oldKey, null);`
`62`	`62`	`}`
`63`	`63`
`64`	`64`	`@Nonnull`
`65`		`- private CredentialAttributes makeKey(String serviceName, @Nullable String key, @Nullable String userName) {`
	`65`	`+ private static CredentialAttributes makeKey(String serviceName, @Nullable String key, @Nullable String userName) {`
`66`	`66`	`String serverNameWithPrefix = serviceName;`
`67`	`67`	`if (!StringUtils.contains(serviceName, "Azure IntelliJ Plugin")) {`
`68`	`68`	`serverNameWithPrefix = StringUtils.join("Azure IntelliJ Plugin \| " + serviceName);`