Removed api key.

Author: shajen

sources/config.cpp

@@ -55,7 +55,6 @@ std::string Config::mqttUrl() const { return m_argConfig.mqttUrl; }
 std::string Config::mqttUsername() const { return m_argConfig.mqttUser; }
 std::string Config::mqttPassword() const { return m_argConfig.mqttPassword; }
 
-std::string Config::apiKey() const { return m_fileConfig.api_key; }
 std::string Config::latitude() const { return m_fileConfig.position.latitude; }
 std::string Config::longitude() const { return m_fileConfig.position.longitude; }
 int Config::altitude() const { return m_fileConfig.position.altitude; }

sources/config.h

@@ -59,7 +59,6 @@ class Config {
   std::string mqttUsername() const;
   std::string mqttPassword() const;
 
-  std::string apiKey() const;
   std::string latitude() const;
   std::string longitude() const;
   int altitude() const;

sources/file_config.cpp

@@ -23,9 +23,6 @@ nlohmann::json FileConfig::toSave(nlohmann::json json) {
 
 nlohmann::json FileConfig::toPrint(nlohmann::json json) {
   try {
-    if (!json["api_key"].empty()) {
-      json["api_key"] = "******";
-    }
     std::regex regex(R"(^(\d+)\.\d+)");
     json["position"]["latitude"] = std::regex_replace(json["position"]["latitude"].get<std::string>(), regex, "$1.********");
     json["position"]["longitude"] = std::regex_replace(json["position"]["longitude"].get<std::string>(), regex, "$1.********");

sources/file_config.h

@@ -35,7 +35,6 @@ struct RecordingConfig {
 NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(RecordingConfig, min_sample_rate, min_time_ms, max_noise_time_ms, step)
 
 struct FileConfig {
-  std::string api_key;
   std::vector<Device> devices;
   std::vector<IgnoredFrequency> ignored_frequencies;
   OutputConfig output;
@@ -48,4 +47,4 @@ struct FileConfig {
   static nlohmann::json toSave(nlohmann::json json);
   static nlohmann::json toPrint(nlohmann::json json);
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(FileConfig, api_key, devices, ignored_frequencies, output, position, recording, version, workers)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(FileConfig, devices, ignored_frequencies, output, position, recording, version, workers)

sources/network/query.h

@@ -7,11 +7,10 @@ struct SchedulerQuery {
   std::string latitude;
   std::string longitude;
   int altitude;
-  std::string api_key;
   std::vector<Satellite> satellites;
   std::vector<Crontab> crontabs;
 };
-NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(SchedulerQuery, latitude, longitude, altitude, api_key, satellites, crontabs)
+NLOHMANN_DEFINE_TYPE_NON_INTRUSIVE(SchedulerQuery, latitude, longitude, altitude, satellites, crontabs)
 
 struct ScheduledTransmission {
   std::string name;

sources/radio/scheduler.cpp

@@ -78,7 +78,7 @@ void Scheduler::worker() {
 
 void Scheduler::query() {
   Logger::info(LABEL, "send query");
-  const SchedulerQuery query(m_config.latitude(), m_config.longitude(), m_config.altitude(), m_config.apiKey(), m_device.satellites, m_device.crontabs);
+  const SchedulerQuery query(m_config.latitude(), m_config.longitude(), m_config.altitude(), m_device.satellites, m_device.crontabs);
   m_remoteController.schedulerQuery(m_device.getName(), static_cast<nlohmann::json>(query).dump());
 }