add per-page timeout for passwordless auth

Brightspace · Oct 22, 2024 · ff10229 · ff10229
1 parent 26b6476
commit ff10229
Showing 1 changed file with 10 additions and 0 deletions.
diff --git a/src/D2L.Bmx/OktaAuthenticator.cs b/src/D2L.Bmx/OktaAuthenticator.cs
@@ -155,6 +155,10 @@ The provided Okta user '{providedLogin}' does not match the system configured pa
 		var sessionIdTcs = new TaskCompletionSource<string?>( TaskCreationOptions.RunContinuationsAsynchronously );
 		cancellationTokenSource.Token.Register( () => sessionIdTcs.TrySetCanceled() );
 
+		// cancel the task if we're stuck on a page for 3 seconds
+		using var pageTimeoutTimer = new System.Timers.Timer( TimeSpan.FromSeconds( 3 ) ) { AutoReset = false };
+		pageTimeoutTimer.Elapsed += ( _, _ ) => sessionIdTcs.TrySetCanceled();
+
 		using var page = await browser.NewPageAsync().WaitAsync( cancellationTokenSource.Token );
 		int attempt = 1;
 
@@ -163,6 +167,12 @@ The provided Okta user '{providedLogin}' does not match the system configured pa
 		return await sessionIdTcs.Task;
 
 		async Task OnPageLoadAsync() {
+			// reset the per-page timeout on every page load
+			lock( pageTimeoutTimer ) {
+				pageTimeoutTimer.Stop();
+				pageTimeoutTimer.Start();
+			}
+
 			var url = new Uri( page.Url );
 			if( url.Host == orgUrl.Host ) {
 				string title = await page.GetTitleAsync().WaitAsync( cancellationTokenSource.Token );