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

carlosscastro · web-flow · commit 1e99d5edf39f · 2020-03-15T17:06:51.000-07:00
[OAuth]do not set signInLink to empty when OAuthAppCredentials is set
diff --git a/libraries/Microsoft.Bot.Builder.Dialogs/Prompts/OAuthPrompt.cs b/libraries/Microsoft.Bot.Builder.Dialogs/Prompts/OAuthPrompt.cs
@@ -347,8 +347,13 @@ private static bool ChannelSupportsOAuthCard(string channelId)
                 var signInResource = await adapter.GetSignInResourceAsync(turnContext, _settings.OAuthAppCredentials, _settings.ConnectionName, turnContext.Activity.From.Id, null, cancellationToken).ConfigureAwait(false);
                 var value = signInResource.SignInLink;
 
+                // use the SignInLink when 
+                //   in speech channel or
+                //   bot is a skill or
+                //   an extra OAuthAppCredentials is being passed in
                 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)) ||
+                    _settings.OAuthAppCredentials != null)
                 {
                     if (turnContext.Activity.ChannelId == Channels.Emulator)
                     {

Original file line number	Diff line number	Diff line change
`@@ -347,8 +347,13 @@ private static bool ChannelSupportsOAuthCard(string channelId)`
`347`	`347`	`var signInResource = await adapter.GetSignInResourceAsync(turnContext, _settings.OAuthAppCredentials, _settings.ConnectionName, turnContext.Activity.From.Id, null, cancellationToken).ConfigureAwait(false);`
`348`	`348`	`var value = signInResource.SignInLink;`
`349`	`349`
	`350`	`+ // use the SignInLink when`
	`351`	`+ // in speech channel or`
	`352`	`+ // bot is a skill or`
	`353`	`+ // an extra OAuthAppCredentials is being passed in`
`350`	`354`	`if (turnContext.Activity.IsFromStreamingConnection() \|\|`
`351`		`- (turnContext.TurnState.Get<ClaimsIdentity>(BotAdapter.BotIdentityKey) is ClaimsIdentity botIdentity && SkillValidation.IsSkillClaim(botIdentity.Claims)))`
	`355`	`+ (turnContext.TurnState.Get<ClaimsIdentity>(BotAdapter.BotIdentityKey) is ClaimsIdentity botIdentity && SkillValidation.IsSkillClaim(botIdentity.Claims)) \|\|`
	`356`	`+ _settings.OAuthAppCredentials != null)`
`352`	`357`	`{`
`353`	`358`	`if (turnContext.Activity.ChannelId == Channels.Emulator)`
`354`	`359`	`{`