Skip to content

[OAuth] small oauth fix #3333

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Feb 5, 2020
Merged

[OAuth] small oauth fix #3333

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 13 additions & 7 deletions libraries/Microsoft.Bot.Builder/BotFrameworkAdapter.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -826,19 +826,25 @@ public virtual async Task<string> GetOauthSignInLinkAsync(ITurnContext turnConte
throw new ArgumentNullException(nameof(userId));
}

var appId = GetBotAppId(turnContext);
var activity = turnContext.Activity;

if (!userId.Equals(activity.From?.Id))
{
throw new ArgumentException("cannot retrieve OAuth signin link for a user that's different from the conversation");
}

var appId = GetBotAppId(turnContext);
var tokenExchangeState = new TokenExchangeState()
{
ConnectionName = connectionName,
Conversation = new ConversationReference()
{
ActivityId = null,
Bot = new ChannelAccount { Role = "bot" },
ChannelId = Channels.Directline,
Conversation = new ConversationAccount(),
ServiceUrl = null,
User = new ChannelAccount { Role = "user", Id = userId, },
ActivityId = activity.Id,
Bot = activity.Recipient, // Activity is from the user to the bot
ChannelId = activity.ChannelId,
Conversation = activity.Conversation,
ServiceUrl = activity.ServiceUrl,
User = activity.From,
},
MsAppId = appId,
};
Expand Down