Mirrored_Repos/wabbajack
1
0
Fork 0
mirror of https://github.com/wabbajack-tools/wabbajack.git synced 2024-08-30 18:42:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix race condition in login

Browse Source
This commit is contained in:
Timothy Baldridge
2021-06-19 15:19:29 -06:00
parent 2b1e0f73cf
commit f982eebc10
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
Wabbajack/View Models/UserInterventionHandlers.cs
View File

@ -110,12 +110,12 @@ namespace Wabbajack
private async Task OAuthLogin(RequestOAuthLogin oa, WebBrowserVM vm, CancellationTokenSource cancel) private async Task OAuthLogin(RequestOAuthLogin oa, WebBrowserVM vm, CancellationTokenSource cancel)
{ {
await vm.Driver.WaitForInitialized(); await vm.Driver.WaitForInitialized();
vm.Instructions = "Please log in and allow Wabbajack to access your account"; vm.Instructions = $"Please log in and allow Wabbajack to access your {oa.SiteName} account";
var wrapper = new CefSharpWrapper(vm.Browser); var wrapper = new CefSharpWrapper(vm.Browser);
var scopes = string.Join(" ", oa.Scopes); var scopes = string.Join(" ", oa.Scopes);
var state = Guid.NewGuid().ToString(); var state = Guid.NewGuid().ToString();
await wrapper.NavigateTo(new Uri(oa.AuthorizationEndpoint + $"?response_type=code&client_id={oa.ClientID}&state={state}&scope={scopes}"));
Helpers.SchemeHandler = (browser, frame, _, request) => Helpers.SchemeHandler = (browser, frame, _, request) =>
{ {
@ -140,6 +140,8 @@ namespace Wabbajack
} }
return new ResourceHandler(); return new ResourceHandler();
}; };
await wrapper.NavigateTo(new Uri(oa.AuthorizationEndpoint + $"?response_type=code&client_id={oa.ClientID}&state={state}&scope={scopes}"));
while (!oa.Task.IsCanceled && !oa.Task.IsCompleted && !cancel.IsCancellationRequested) while (!oa.Task.IsCanceled && !oa.Task.IsCompleted && !cancel.IsCancellationRequested)
await Task.Delay(250); await Task.Delay(250);