repertory/repertory/include/ui/handlers.hpp

@@ -57,18 +57,13 @@ private:
 
   void handle_get_mount_status(auto &&req, auto &&res) const;
 
-  void handle_post_add_mount(auto &&req, auto &&res) const;
-
   void handle_post_mount(auto &&req, auto &&res) const;
 
-  void handle_put_set_value_by_name(auto &&req, auto &&res) const;
+  void handle_put_set_value_by_name(auto &&req, auto &&res);
 
   auto launch_process(provider_type prov, std::string_view name,
                       std::string_view args, bool background = false) const
       -> std::vector<std::string>;
-
-  void set_key_value(provider_type prov, std::string_view name,
-                     std::string_view key, std::string_view value) const;
 };
 } // namespace repertory::ui
 

repertory/repertory/src/ui/handlers.cpp

@@ -101,10 +101,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
                 handle_get_mount_status(req, res);
               });
 
-  server->Post("/api/v1/add_mount", [this](auto &&req, auto &&res) {
-    handle_post_add_mount(req, res);
-  });
-
   server->Post("/api/v1/mount",
                [this](auto &&req, auto &&res) { handle_post_mount(req, res); });
 
@@ -150,16 +146,6 @@ handlers::handlers(mgmt_app_config *config, httplib::Server *server)
 
 handlers::~handlers() { event_system::instance().stop(); }
 
-void handlers::set_key_value(provider_type prov, std::string_view name,
-                             std::string_view key,
-                             std::string_view value) const {
-#if defined(_WIN32)
-  launch_process(prov, name, fmt::format(R"(-set {} "{}")", key, value));
-#else  // !defined(_WIN32)
-  launch_process(prov, name, fmt::format("-set {} '{}'", key, value));
-#endif // defined(_WIN32)
-}
-
 void handlers::handle_get_mount(auto &&req, auto &&res) const {
   REPERTORY_USES_FUNCTION_NAME();
 
@@ -267,26 +253,6 @@ void handlers::handle_get_mount_status(auto &&req, auto &&res) const {
   res.status = http_error_codes::ok;
 }
 
-void handlers::handle_post_add_mount(auto &&req, auto &&res) const {
-  auto name = req.get_param_value("name");
-  auto prov = provider_type_from_string(req.get_param_value("type"));
-  auto cfg = nlohmann::json::parse(req.get_param_value("config"));
-
-  launch_process(prov, name, "-gc");
-  for (const auto &[key, value] : cfg.items()) {
-    if (value.is_object()) {
-      for (const auto &[key2, value2] : value.items()) {
-        set_key_value(prov, name, fmt::format("{}.{}", key, key2),
-                      value2.template get<std::string>());
-      }
-    } else {
-      set_key_value(prov, name, key, value.template get<std::string>());
-    }
-  }
-
-  res.status = http_error_codes::ok;
-}
-
 void handlers::handle_post_mount(auto &&req, auto &&res) const {
   auto location = utils::path::absolute(req.get_param_value("location"));
   auto name = req.get_param_value("name");
@@ -302,13 +268,17 @@ void handlers::handle_post_mount(auto &&req, auto &&res) const {
   res.status = http_error_codes::ok;
 }
 
-void handlers::handle_put_set_value_by_name(auto &&req, auto &&res) const {
+void handlers::handle_put_set_value_by_name(auto &&req, auto &&res) {
   auto key = req.get_param_value("key");
   auto name = req.get_param_value("name");
   auto prov = provider_type_from_string(req.get_param_value("type"));
   auto value = req.get_param_value("value");
 
-  set_key_value(prov, name, key, value);
+#if defined(_WIN32)
+  launch_process(prov, name, fmt::format(R"(-set {} "{}")", key, value));
+#else  //! defined(_WIN32)
+  launch_process(prov, name, fmt::format("-set {} '{}'", key, value));
+#endif // defined(_WIN32)
 
   res.status = http_error_codes::ok;
 }

web/repertory/lib/helpers.dart

@@ -175,35 +175,21 @@ bool validateSettings(
 }) {
   settings.forEach((key, value) {
     final settingKey = rootKey == null ? key : '$rootKey.$key';
-    if (value is Map<String, dynamic>) {
-      validateSettings(value, failed, rootKey: settingKey);
-      return;
-    }
-
-    for (var validator in getSettingValidators(settingKey)) {
-      if (validator(value.toString())) {
-        continue;
+    if (value is Map) {
+      validateSettings(
+        value as Map<String, dynamic>,
+        failed,
+        rootKey: settingKey,
+      );
+    } else {
+      for (var validator in getSettingValidators(settingKey)) {
+        if (validator(value.toString())) {
+          continue;
+        }
+        failed.add(settingKey);
       }
-      failed.add(settingKey);
     }
   });
 
   return failed.isEmpty;
 }
-
-Map<String, dynamic> convertAllToString(Map<String, dynamic> settings) {
-  settings.forEach((key, value) {
-    if (value is Map<String, dynamic>) {
-      convertAllToString(value);
-      return;
-    }
-
-    if (value is String) {
-      return;
-    }
-
-    settings[key] = value.toString();
-  });
-
-  return settings;
-}

web/repertory/lib/models/mount_list.dart

@@ -61,7 +61,7 @@ class MountList with ChangeNotifier {
       await http.post(
         Uri.parse(
           Uri.encodeFull(
-            '${getBaseUri()}/api/v1/add_mount?name=$name&type=$type&config=${jsonEncode(convertAllToString(mountConfig))}',
+            '${getBaseUri()}/api/v1/add_mount?name=$name&type=$type&config=${jsonEncode(mountConfig)}',
           ),
         ),
       );