From f1e0f5634cd4973c07a08d0fd24f246878f11d7a Mon Sep 17 00:00:00 2001 From: Francois Laithier Date: Mon, 4 Nov 2024 19:07:42 -0800 Subject: [PATCH 1/3] Add new params to log allowlist --- libstuff/SLog.cpp | 2 ++ 1 file changed, 2 insertions(+) diff --git a/libstuff/SLog.cpp b/libstuff/SLog.cpp index 4cc571bef..397bf8a9c 100644 --- a/libstuff/SLog.cpp +++ b/libstuff/SLog.cpp @@ -57,6 +57,8 @@ static const set PARAMS_WHITELIST = { "policyAccountID", "policyID", "reportID", + "shouldCompleteOnboarding", + "shouldDismissHybridAppOnboarding", "token", "transactionID", "type", From fb19ed9419ed81f23bd88bef6a36d14134c2013f Mon Sep 17 00:00:00 2001 From: Tyler Karaszewski Date: Tue, 5 Nov 2024 11:28:55 -0800 Subject: [PATCH 2/3] Add header info to readDB even in HCTree mode --- test/lib/BedrockTester.cpp | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/test/lib/BedrockTester.cpp b/test/lib/BedrockTester.cpp index 8f1e3ac05..305254dd0 100644 --- a/test/lib/BedrockTester.cpp +++ b/test/lib/BedrockTester.cpp @@ -577,6 +577,12 @@ bool BedrockTester::readDB(const string& query, SQResult& result, bool online) command["Query"] = fixedQuery; command["Format"] = "JSON"; auto row0 = SParseJSONObject(executeWaitMultipleData({command})[0].content)["rows"]; + auto headerString = SParseJSONObject(executeWaitMultipleData({command})[0].content)["headers"]; + + list headers = SParseJSONArray(headerString); + for (const auto& h : headers) { + result.headers.push_back(h); + } list rows = SParseJSONArray(row0); for (const string& rowStr : rows) { From fd832ca10cb7a37609a31997ba53ecab8e4aa212 Mon Sep 17 00:00:00 2001 From: Tyler Karaszewski Date: Tue, 5 Nov 2024 11:38:58 -0800 Subject: [PATCH 3/3] Don't call the command twice --- test/lib/BedrockTester.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/test/lib/BedrockTester.cpp b/test/lib/BedrockTester.cpp index 305254dd0..53f0afc9e 100644 --- a/test/lib/BedrockTester.cpp +++ b/test/lib/BedrockTester.cpp @@ -576,8 +576,9 @@ bool BedrockTester::readDB(const string& query, SQResult& result, bool online) SData command("Query"); command["Query"] = fixedQuery; command["Format"] = "JSON"; - auto row0 = SParseJSONObject(executeWaitMultipleData({command})[0].content)["rows"]; - auto headerString = SParseJSONObject(executeWaitMultipleData({command})[0].content)["headers"]; + auto commandResult = executeWaitMultipleData({command}); + auto row0 = SParseJSONObject(commandResult[0].content)["rows"]; + auto headerString = SParseJSONObject(commandResult[0].content)["headers"]; list headers = SParseJSONArray(headerString); for (const auto& h : headers) {