Merge branch 'release-3.50.1' into release

Author: Flanker32

PluginsAndFeatures/azure-toolkit-for-intellij/src/com/microsoft/azure/toolkit/intellij/function/runner/core/FunctionUtils.java

@@ -81,14 +81,14 @@ public static void saveAppSettingsToSecurityStorage(String key, Map<String, Stri
             return;
         }
         final String appSettingsJsonValue = JsonUtils.toJsonString(appSettings);
-        IdeaSecureStore.getInstance().savePassword(FunctionApp.class.getName(), key, appSettingsJsonValue);
+        IdeaSecureStore.getInstance().savePassword(key, appSettingsJsonValue);
     }
 
     public static Map<String, String> loadAppSettingsFromSecurityStorage(String key) {
         if (StringUtils.isEmpty(key)) {
             return new HashMap<>();
         }
-        final String value = IdeaSecureStore.getInstance().loadPassword(FunctionApp.class.getName(), key);
+        final String value = IdeaSecureStore.getInstance().loadPassword(key);
         return StringUtils.isEmpty(value) ? new HashMap<>() : JsonUtils.fromJson(value, Map.class);
     }
 

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

@@ -35,4 +35,12 @@ public void savePassword(@NotNull String serviceName, @NotNull String userName,
     public String loadPassword(@NotNull String serviceName, @NotNull String userName) {
         return passwordSafe.getPassword(new CredentialAttributes(serviceName, userName));
     }
+
+    public void savePassword(@NotNull String key, @NotNull String password) {
+        passwordSafe.setPassword(new CredentialAttributes(key), password);
+    }
+
+    public String loadPassword(@NotNull String key) {
+        return passwordSafe.getPassword(new CredentialAttributes(key));
+    }
 }