Skip to content

Override MSAL's system webview handling #2258

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
mjcheetham merged 1 commit into from
Feb 5, 2026
Merged

Override MSAL's system webview handling #2258

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
41 changes: 32 additions & 9 deletions src/shared/Core/Authentication/MicrosoftAuthentication.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -754,10 +754,33 @@ private static EmbeddedWebViewOptions GetEmbeddedWebViewOptions()
};
}

private static SystemWebViewOptions GetSystemWebViewOptions()
private SystemWebViewOptions GetSystemWebViewOptions()
{
// TODO: add nicer HTML success and error pages
return new SystemWebViewOptions();
return new SystemWebViewOptions
{
OpenBrowserAsync = OpenBrowserFunc
};

// We have special handling for Linux and WSL to open the system browser
// so we need to use our own function here. Sorry MSAL!
Task OpenBrowserFunc(Uri uri)
{
try
{
Context.SessionManager.OpenBrowser(uri);
}
catch (Exception ex)
{
Context.Trace.WriteLine("Failed to open system web browser - using MSAL fallback");
Context.Trace.WriteException(ex);

// Fallback to MSAL's default browser opening logic, preferring Edge.
return SystemWebViewOptions.OpenWithChromeEdgeBrowserAsync(uri);
}

return Task.CompletedTask;
}
}

private Task ShowDeviceCodeInTty(DeviceCodeResult dcr)
Expand Down Expand Up @@ -859,8 +882,14 @@ private void EnsureCanUseEmbeddedWebView()

private bool CanUseSystemWebView(IPublicClientApplication app, Uri redirectUri)
{
//
// MSAL requires the application redirect URI is a loopback address to use the System WebView
return Context.SessionManager.IsWebBrowserAvailable && app.IsSystemWebViewAvailable && redirectUri.IsLoopback;
//
// Note: we do NOT check the MSAL 'IsSystemWebViewAvailable' property as it only
// looks for the presence of the DISPLAY environment variable on UNIX systems.
// This is insufficient as we instead handle launching the default browser ourselves.
//
return Context.SessionManager.IsWebBrowserAvailable && redirectUri.IsLoopback;
}

private void EnsureCanUseSystemWebView(IPublicClientApplication app, Uri redirectUri)
Expand All @@ -871,12 +900,6 @@ private void EnsureCanUseSystemWebView(IPublicClientApplication app, Uri redirec
"System web view is not available without a way to start a browser.");
}

if (!app.IsSystemWebViewAvailable)
{
throw new Trace2InvalidOperationException(Context.Trace2,
"System web view is not available on this platform.");
}

if (!redirectUri.IsLoopback)
{
throw new Trace2InvalidOperationException(Context.Trace2,
Expand Down
Loading