Skip to content
This repository was archived by the owner on Jan 5, 2026. It is now read-only.

Fixing bug if channel sends empty string for a null object #1889

Merged
tracyboehrer merged 2 commits into from
Jan 31, 2022
Merged

Fixing bug if channel sends empty string for a null object #1889

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1b38ff2
Fixing bug if channel sends empty string for a null object
axelsrz Jan 13, 2022
abf800a
Merge branch 'main' into axsuarez/teams-task-fetch-empty-fix
tracyboehrer Jan 31, 2022
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
23 changes: 22 additions & 1 deletion libraries/botbuilder-core/botbuilder/core/serializer_helper.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Copyright (c) Microsoft Corporation. All rights reserved.
# Licensed under the MIT License.

from copy import copy
from inspect import getmembers
from typing import Type
from enum import Enum
Expand All @@ -25,6 +25,9 @@

def deserializer_helper(msrest_cls: Type[Model], dict_to_deserialize: dict) -> Model:
deserializer = Deserializer(DEPENDICIES_DICT)
_clean_data_for_serialization(
deserializer.dependencies[msrest_cls.__name__], dict_to_deserialize
)
return deserializer(msrest_cls.__name__, dict_to_deserialize)


Expand All @@ -35,3 +38,21 @@ def serializer_helper(object_to_serialize: Model) -> dict:
serializer = Serializer(DEPENDICIES_DICT)
# pylint: disable=protected-access
return serializer._serialize(object_to_serialize)


def _clean_data_for_serialization(msrest_cls: Type[Model], dict_to_deserialize: dict):
# pylint: disable=protected-access
# Clean channel response of empty strings for expected objects.
if not isinstance(dict_to_deserialize, dict):
return
serialization_model = copy(msrest_cls._attribute_map)
for key, value in msrest_cls._attribute_map.items():
if key != value["key"]:
serialization_model[value["key"]] = value
for prop, prop_value in dict_to_deserialize.items():
if (
prop in serialization_model
and serialization_model[prop]["type"] in DEPENDICIES_DICT
and not prop_value
):
dict_to_deserialize[prop] = None
19 changes: 19 additions & 0 deletions libraries/botbuilder-core/tests/teams/test_teams_activity_handler.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1003,6 +1003,25 @@ async def test_on_teams_task_module_fetch(self):
assert bot.record[0] == "on_invoke_activity"
assert bot.record[1] == "on_teams_task_module_fetch"

async def test_on_teams_task_module_fetch_none_as_empty(self):
# Arrange
activity = Activity(
type=ActivityTypes.invoke,
name="task/fetch",
value={"data": {"key": "value"}, "context": "",},
)

turn_context = TurnContext(SimpleAdapter(), activity)

# Act
bot = TestingTeamsActivityHandler()
await bot.on_turn(turn_context)

# Assert
assert len(bot.record) == 2
assert bot.record[0] == "on_invoke_activity"
assert bot.record[1] == "on_teams_task_module_fetch"

async def test_on_teams_task_module_submit(self):
# Arrange
activity = Activity(
Expand Down