Zach Nelson
6f7f4c592a
## Summary Relative includes can hide inappropriate dependency relationships. In this case, I found that lib/KOReaderSync/KOReaderCredentialStore.cpp was dependent on src/JsonSettingsIO.h -- a lib -> app dependency, the opposite direction dependencies should flow in this project. This change replaces all relative includes with root-relative includes, and corrects the KOReaderCredentialStore dependency by moving its JSON settings serialization local to the KOReaderSync library. --- ### AI Usage While CrossPoint doesn't have restrictions on AI tools in contributing, please be transparent about their usage as it helps set the right context for reviewers. Did you use AI tools to help write this code? _**PARTIALLY**_
52 lines
1.4 KiB
C++
52 lines
1.4 KiB
C++
#include "KOReaderJsonIO.h"
|
|
|
|
#include <ArduinoJson.h>
|
|
#include <HalStorage.h>
|
|
#include <Logging.h>
|
|
#include <ObfuscationUtils.h>
|
|
|
|
#include "KOReaderCredentialStore.h"
|
|
|
|
namespace KOReaderJsonIO {
|
|
|
|
bool save(const KOReaderCredentialStore& store, const char* path) {
|
|
JsonDocument doc;
|
|
doc["username"] = store.getUsername();
|
|
doc["password_obf"] = obfuscation::obfuscateToBase64(store.getPassword());
|
|
doc["serverUrl"] = store.getServerUrl();
|
|
doc["matchMethod"] = static_cast<uint8_t>(store.getMatchMethod());
|
|
|
|
String json;
|
|
serializeJson(doc, json);
|
|
return Storage.writeFile(path, json);
|
|
}
|
|
|
|
bool load(KOReaderCredentialStore& store, const char* json, bool* needsResave) {
|
|
if (needsResave) *needsResave = false;
|
|
JsonDocument doc;
|
|
auto error = deserializeJson(doc, json);
|
|
if (error) {
|
|
LOG_ERR("KRS", "JSON parse error: %s", error.c_str());
|
|
return false;
|
|
}
|
|
|
|
std::string user = doc["username"] | std::string("");
|
|
|
|
bool ok = false;
|
|
std::string pass = obfuscation::deobfuscateFromBase64(doc["password_obf"] | "", &ok);
|
|
if (!ok || pass.empty()) {
|
|
pass = doc["password"] | std::string("");
|
|
if (!pass.empty() && needsResave) *needsResave = true;
|
|
}
|
|
|
|
store.setCredentials(user, pass);
|
|
store.setServerUrl(doc["serverUrl"] | std::string(""));
|
|
|
|
uint8_t method = doc["matchMethod"] | (uint8_t)0;
|
|
store.setMatchMethod(static_cast<DocumentMatchMethod>(method));
|
|
|
|
return true;
|
|
}
|
|
|
|
} // namespace KOReaderJsonIO
|