Skip to content

fix: handle omitted evaluation result value when deserializing client-side JSON payload #368

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Mar 13, 2024
Merged

fix: handle omitted evaluation result value when deserializing client-side JSON payload #368

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3fc7b87
fix(client-sdk): handle omitted evaluation result value when deserial…
cwaldren-ld Feb 7, 2024
bb2b99f
add a story ID
cwaldren-ld Mar 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
35 changes: 20 additions & 15 deletions libs/internal/src/serialization/json_evaluation_result.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
#include <boost/json.hpp>

namespace launchdarkly {

tl::expected<std::optional<EvaluationResult>, JsonError> tag_invoke(
boost::json::value_to_tag<
tl::expected<std::optional<EvaluationResult>, JsonError>> const& unused,
Expand Down Expand Up @@ -56,15 +55,22 @@ tl::expected<std::optional<EvaluationResult>, JsonError> tag_invoke(
// when deserializing FlagMeta. Primarily `variation` not
// `variationIndex`.

auto* value_iter = json_obj.find("value");
if (value_iter == json_obj.end()) {
return tl::unexpected(JsonError::kSchemaFailure);
}

auto maybe_value = boost::json::value_to<tl::expected<Value, JsonError>>(
value_iter->value());
if (!maybe_value) {
return tl::unexpected(maybe_value.error());
// todo(cwaldren): SC-203949 + SC-236165
// We're looking for the evaluated value. If it's not there, we should treat
// it as null and *not* a schema error. This is because the server-side SDK
// that produced the EvaluationResult may have omitted the 'null' value.
// Otherwise, if it is there, it must deserialize to a valid Value (which
// might itself be null.)
Value value = Value::Null();
if (auto* value_iter = json_obj.find("value");
value_iter != json_obj.end()) {
auto maybe_value =
boost::json::value_to<tl::expected<Value, JsonError>>(
value_iter->value());
if (!maybe_value) {
return tl::unexpected(maybe_value.error());
}
value = *maybe_value;
}

auto* variation_iter = json_obj.find("variation");
Expand All @@ -85,7 +91,7 @@ tl::expected<std::optional<EvaluationResult>, JsonError> tag_invoke(
track_events,
track_reason,
debug_events_until_date,
EvaluationDetailInternal(*maybe_value, variation,
EvaluationDetailInternal(std::move(value), variation,
std::make_optional(reason.value()))};
}
// We could not parse the reason.
Expand All @@ -99,7 +105,7 @@ tl::expected<std::optional<EvaluationResult>, JsonError> tag_invoke(
track_events,
track_reason,
debug_events_until_date,
EvaluationDetailInternal(*maybe_value, variation, std::nullopt)};
EvaluationDetailInternal(std::move(value), variation, std::nullopt)};
}

void tag_invoke(boost::json::value_from_tag const& unused,
Expand Down Expand Up @@ -127,7 +133,7 @@ void tag_invoke(boost::json::value_from_tag const& unused,
"debugEventsUntilDate",
std::chrono::duration_cast<std::chrono::milliseconds>(
evaluation_result.DebugEventsUntilDate()->time_since_epoch())
.count());
.count());
}

auto& detail = evaluation_result.Detail();
Expand All @@ -143,5 +149,4 @@ void tag_invoke(boost::json::value_from_tag const& unused,
obj.emplace("reason", reason_json);
}
}

} // namespace launchdarkly
} // namespace launchdarkly