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

…3571) [OAuth]do not set signInLink to empty when OAuthAppCredentials is set
microsoft · Mar 16, 2020 · d14795f · d14795f
1 parent 2acec1c
commit d14795f
Showing 1 changed file with 6 additions and 1 deletion.
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)
                     {