[OAuth]do not set signInLink to empty when OAuthAppCredentials is set #3564
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| if (turnContext.Activity.IsFromStreamingConnection() || | ||
| (turnContext.TurnState.Get<ClaimsIdentity>(BotAdapter.BotIdentityKey) is ClaimsIdentity botIdentity && SkillValidation.IsSkillClaim(botIdentity.Claims))) | ||
| (turnContext.TurnState.Get<ClaimsIdentity>(BotAdapter.BotIdentityKey) is ClaimsIdentity botIdentity && SkillValidation.IsSkillClaim(botIdentity.Claims)) || |
There was a problem hiding this comment.
This 'if' should become a method given how complex it is, but I'm OK doing that for R9
carlosscastro
approved these changes
Mar 15, 2020
This was referenced Mar 15, 2020
carlosscastro
added a commit
that referenced
this pull request
Mar 15, 2020
[OAuth]do not set signInLink to empty when OAuthAppCredentials is set
carlosscastro
added a commit
that referenced
this pull request
Mar 16, 2020
[OAuth]do not set signInLink to empty when OAuthAppCredentials is set
cleemullins
pushed a commit
that referenced
this pull request
Mar 16, 2020
…3571) [OAuth]do not set signInLink to empty when OAuthAppCredentials is set
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>
chrimc62
pushed a commit
that referenced
this pull request
Jul 15, 2020
[OAuth]do not set signInLink to empty when OAuthAppCredentials is set
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
When OAuthAppCredentials is passed in as part OAuthPromptSettings, do not set SignInLink to be empty as Emulator/other first party channels will ignore this and get a SignInLink without the additional OAuthAppCredentials setting.