Skip to content
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.

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

EoC should only be handled when coming from parent in RunAsync #3540

Merged
merged 3 commits into from
Mar 12, 2020

Conversation

gabog
Copy link
Contributor

@gabog gabog commented Mar 12, 2020

Fixes #3541

Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).

The issue was that this affected part of the code was being triggered when a skill responds with an EoC to a caller (EoCs are routed back to the pipeline in SkillHandler).

This PR also applies the urn format to CallerId as per OBI Spec

Copy link
Member

@stevengum stevengum left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

:shipit:

@gabog gabog merged commit 3730963 into master Mar 12, 2020
@gabog gabog deleted the gabog/FixEoCHandlingInRunAsync branch March 12, 2020 04:48
gabog added a commit that referenced this pull request Mar 12, 2020
* Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).
* Applied URI prefix to caller ID as per OBI spec
https://github.com/microsoft/botframework-obi/blob/master/protocols/botframework-activity/botframework-activity.md#bot-calling-skill

(cherry picked from commit 3730963)
stevengum pushed a commit that referenced this pull request Mar 12, 2020
#3543)

* Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).
* Applied URI prefix to caller ID as per OBI spec
https://github.com/microsoft/botframework-obi/blob/master/protocols/botframework-activity/botframework-activity.md#bot-calling-skill

(cherry picked from commit 3730963)
garypretty added a commit that referenced this pull request Apr 16, 2020
* Fix AdaptiveTesting to have correct preview labels

* Proactive auth: trust incoming token url conditionally (#3533)

* Add unit test for CancelAllDialogs and fix eventName and eventValue could be null (#3536)

* fix lack of a generic typed method for posting activities to skills (#3539) (#3542)

* fix lack of a generic typed method for posting activities to skills

* remove duplicated code

Co-authored-by: Swagat Mishra <swagatm@microsoft.com>

Co-authored-by: swagat mishra <swagatmishra2007@gmail.com>
Co-authored-by: Swagat Mishra <swagatm@microsoft.com>

* EoC should only be handled when coming from parent in RunAsync (#3540) (#3543)

* Added check to only cancel dialogs in RunAsync when EoC comes from a parent bot (root or skill).
* Applied URI prefix to caller ID as per OBI spec
https://github.com/microsoft/botframework-obi/blob/master/protocols/botframework-activity/botframework-activity.md#bot-calling-skill

(cherry picked from commit 3730963)

* Merge pull request #3564 from microsoft/tedlee/fix-oauth-credentials (#3571)

[OAuth]do not set signInLink to empty when OAuthAppCredentials is set

* Address QnAMaker / recognizer telemetry across dialogs / adaptive

* Fixes following merge from master

* Added comments to the TrackRecognizerResult method on the Recognizer class.

* More comments.

Co-authored-by: Tom Laird-McConnell <tomlm@microsoft.com>
Co-authored-by: Carlos Castro <carlosscastro@users.noreply.github.com>
Co-authored-by: Steven Gum <14935595+stevengum@users.noreply.github.com>
Co-authored-by: swagat mishra <swagatmishra2007@gmail.com>
Co-authored-by: Swagat Mishra <swagatm@microsoft.com>
Co-authored-by: Gabo Gilabert <gabog@users.noreply.github.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

EoC should only be handled when coming from parent in RunAsync
2 participants