From ea0506d08a92f9a2716243e0b6c9c034ae0ee936 Mon Sep 17 00:00:00 2001 From: Carlos Castro Date: Sun, 15 Mar 2020 17:07:26 -0700 Subject: [PATCH] do not set signInLink to empty when OAuthAppCredentials is set (#1907) (#1908) Co-authored-by: Ted --- libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts b/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts index 31c280e105..b352e0dd2b 100644 --- a/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts +++ b/libraries/botbuilder-dialogs/src/prompts/oauthPrompt.ts @@ -280,7 +280,12 @@ export class OAuthPrompt extends Dialog { const signInResource = await (context.adapter as ExtendedUserTokenProvider).getSignInResource(context, this.settings.connectionName, context.activity.from.id, null, this.settings.oAuthAppCredentials); let link = signInResource.signInLink; const identity = context.turnState.get((context.adapter as BotAdapter).BotIdentityKey); - if((identity && isSkillClaim(identity.claims)) || OAuthPrompt.isFromStreamingConnection(context.activity)) { + + // use the SignInLink when + // in speech channel or + // bot is a skill or + // an extra OAuthAppCredentials is being passed in + if((identity && isSkillClaim(identity.claims)) || OAuthPrompt.isFromStreamingConnection(context.activity) || this.settings.oAuthAppCredentials) { if(context.activity.channelId === Channels.Emulator) { cardActionType = ActionTypes.OpenUrl; }