fix: Don't include null traits in transient identifier (#4598)

Co-authored-by: Matthew Elwell <[email protected]>
Flagsmith · Sep 9, 2024 · 4bf7b9d · 4bf7b9d
1 parent 6714384
commit 4bf7b9d
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 2 deletions.
diff --git a/api/environments/sdk/services.py b/api/environments/sdk/services.py
@@ -95,8 +95,9 @@ def get_transient_identifier(sdk_trait_data: list[SDKTraitData]) -> str:
     if sdk_trait_data:
         return hashlib.sha256(
             "".join(
-                f'{trait["trait_key"]}{trait["trait_value"]["value"]}'
+                f'{trait["trait_key"]}{trait_value["value"]}'
                 for trait in sorted(sdk_trait_data, key=itemgetter("trait_key"))
+                if (trait_value := trait["trait_value"]) is not None
             ).encode(),
             usedforsecurity=False,
         ).hexdigest()

diff --git a/api/environments/sdk/types.py b/api/environments/sdk/types.py
@@ -10,5 +10,5 @@ class SDKTraitValueData(typing.TypedDict):
 
 class SDKTraitData(typing.TypedDict):
     trait_key: str
-    trait_value: SDKTraitValueData
+    trait_value: SDKTraitValueData | None
     transient: NotRequired[bool]
diff --git a/api/tests/integration/environments/identities/test_integration_identities.py b/api/tests/integration/environments/identities/test_integration_identities.py
@@ -304,6 +304,7 @@ def test_get_feature_states_for_identity__segment_match_expected(
                         "trait_value": segment_condition_value,
                     },
                     {"trait_key": "a", "trait_value": "value_a"},
+                    {"trait_key": "c", "trait_value": None},
                 ],
             }
         ),
-Original file line number
+Diff line change
@@ Expand Up @@
                             "trait_value": segment_condition_value,
                         },
                         {"trait_key": "a", "trait_value": "value_a"},
+                        {"trait_key": "c", "trait_value": None},
                     ],
                 }
             ),
@@ Expand Down @@