Skip to content

Fix the timeout login in OAuthInput #4607

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 2 commits into from
Sep 15, 2020
Merged

Fix the timeout login in OAuthInput #4607

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5805ccb
Fix the timeout login in OAuthInput
luhan2017 Sep 8, 2020
7381f62
Update OAuthInput.cs
luhan2017 Sep 14, 2020
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
8 changes: 6 additions & 2 deletions libraries/Microsoft.Bot.Builder.Dialogs.Adaptive/Input/OAuthInput.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ public class OAuthInput : InputDialog
{ AttemptCountKey, 0 },
};

state[PersistedExpires] = DateTime.Now.AddMilliseconds(Timeout.GetValue(dc.State));
state[PersistedExpires] = DateTime.UtcNow.AddMilliseconds(Timeout.GetValue(dc.State));

// Attempt to get the users token
if (!(dc.Context.Adapter is IUserTokenProvider adapter))
Expand Down Expand Up @@ -186,7 +186,11 @@ public class OAuthInput : InputDialog
var state = dc.ActiveDialog.State;
var expires = (DateTime)state[PersistedExpires];
var isMessage = dc.Context.Activity.Type == ActivityTypes.Message;
var hasTimedOut = isMessage && (DateTime.Compare(DateTime.Now, expires) > 0);
var isTimeoutActivityType = isMessage
|| IsTokenResponseEvent(dc.Context)
|| IsTeamsVerificationInvoke(dc.Context)
|| IsTokenExchangeRequestInvoke(dc.Context);
var hasTimedOut = isTimeoutActivityType && (DateTime.Compare(DateTime.UtcNow, expires) > 0);

if (hasTimedOut)
{
Expand Down