Merge pull request #1942 from Expensify/main

Update expensify_prod branch
Expensify · Nov 5, 2024 · 113ab5a · 113ab5a
2 parents 1ef8352 + 0b3defd
commit 113ab5a
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/libstuff/SLog.cpp b/libstuff/SLog.cpp
@@ -57,6 +57,8 @@ static const set<string> PARAMS_WHITELIST = {
     "policyAccountID",
     "policyID",
     "reportID",
+    "shouldCompleteOnboarding",
+    "shouldDismissHybridAppOnboarding",
     "token",
     "transactionID",
     "type",

diff --git a/test/lib/BedrockTester.cpp b/test/lib/BedrockTester.cpp
@@ -576,7 +576,14 @@ 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 commandResult = executeWaitMultipleData({command});
+        auto row0 = SParseJSONObject(commandResult[0].content)["rows"];
+        auto headerString = SParseJSONObject(commandResult[0].content)["headers"];
+
+        list<string> headers = SParseJSONArray(headerString);
+        for (const auto& h : headers) {
+            result.headers.push_back(h);
+        }
 
         list<string> rows = SParseJSONArray(row0);
         for (const string& rowStr : rows) {