gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

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
4 changed files with 15 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/Context.cpp
View File

@@ -279,8 +279,8 @@ std::string configurationDefaults =
"# WARNING: Please read the documentation (man task-sync) before setting up\n"
"# Taskwarrior for Taskserver synchronization.\n"
"\n"
"#sync.encryption_secret # Encryption secret for sync to a server\n"
"#sync.server.client_id # Client ID for sync to a server\n"
"#sync.server.encryption_secret # Encryption secret for sync to a server\n"
"#sync.server.origin # Origin of the sync server\n"
"#sync.local.server_dir # Directory for local sync\n"
"#sync.gcp.bucket # Bucket for sync to GCP\n"

2
src/commands/CmdShow.cpp
View File

@@ -195,7 +195,7 @@ int CmdShow::execute (std::string& output)
" sync.local.server_dir"
" sync.gcp.bucket"
" sync.server.client_id"
" sync.server.encryption_secret"
" sync.encryption_secret"
" sync.server.origin"
" tag.indicator"
" undo.style"

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;