GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-09-09 18:50:39 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Rename sync.server.encryption_secret to sync.encryption_secret. (#3249)

Browse source 
* Rename `sync.server.encryption_secret` to `sync.encryption_secret`.

* move pwgen
This commit is contained in:
Dustin J. Mitchell 2024-01-21 19:11:24 -05:00 • committed by GitHub
parent 082b6084fa
commit daca37806e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 15 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

7
src/commands/CmdSync.cpp
View file

@ -65,13 +65,13 @@ int CmdSync::execute (std::string& output)
std::string origin = Context::getContext ().config.get ("sync.server.origin");
std::string server_dir = Context::getContext ().config.get ("sync.local.server_dir");
std::string gcp_bucket = Context::getContext ().config.get ("sync.gcp.bucket");
std::string encryption_secret = Context::getContext ().config.get ("sync.encryption_secret");
if (server_dir != "") {
server = tc::Server::new_local (server_dir);
server_ident = server_dir;
} else if (gcp_bucket != "") {
std::string encryption_secret = Context::getContext ().config.get ("sync.gcp.encryption_secret");
if (encryption_secret == "") {
throw std::string ("sync.gcp.encryption_secret is required");
throw std::string ("sync.encryption_secret is required");
}
server = tc::Server::new_gcp (gcp_bucket, encryption_secret);
std::ostringstream os;
@ -79,9 +79,8 @@ int CmdSync::execute (std::string& output)
server_ident = os.str();
} else if (origin != "") {
std::string client_id = Context::getContext ().config.get ("sync.server.client_id");
std::string encryption_secret = Context::getContext ().config.get ("sync.server.encryption_secret");
if (client_id == "" || encryption_secret == "") {
throw std::string ("sync.server.client_id and encryption_secret are required");
throw std::string ("sync.server.client_id and sync.encryption_secret are required");
}
server = tc::Server::new_sync (origin, client_id, encryption_secret);
std::ostringstream os;