coder/claudechecker
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases 121 Wiki Activity

fix: trust cookies/cached auth for IsSignedIn, wider cookie domain filter

Browse Source
This commit is contained in:
SuperDooper
2026-05-08 15:49:47 +02:00
parent 7d465c13d8
commit 5a78a021cb
1 changed files with 21 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
windows/UsageViewModel.cs
+21 -27
View File
@@ -78,7 +78,13 @@ public class UsageViewModel : INotifyPropertyChanged
try try
{ {
var cookies = await GetCookiesAsync(); var cookies = await GetCookiesAsync();
if (cookies.Count == 0)
// Check if we have any persistent proof that the user authenticated
bool hasCookies = cookies.Count > 0;
bool hasCachedAuth = !string.IsNullOrEmpty(AppSettings.Default.Email) ||
!string.IsNullOrEmpty(AppSettings.Default.OrgId);
if (!hasCookies && !hasCachedAuth)
{ {
await Application.Current.Dispatcher.InvokeAsync(() => await Application.Current.Dispatcher.InvokeAsync(() =>
{ {
@@ -89,20 +95,18 @@ public class UsageViewModel : INotifyPropertyChanged
return; return;
} }
// Try HttpClient first (fast path) // Try HttpClient first (fast path) — may be rejected by server CORS/header checks
var (limits, overage, prepaid, email, orgId, ok) = await TryHttpRefreshAsync(cookies); var (limits, overage, prepaid, email, orgId, ok) = hasCookies
? await TryHttpRefreshAsync(cookies)
: ([], null, null, null, null, false);
// If HttpClient failed, fall back to WebView2 (uses existing browser session) // Fall back to WebView2 (uses the shared browser session, not HttpClient)
if (!ok) if (!ok)
(limits, email, orgId) = await TryWebView2RefreshAsync(); (limits, email, orgId) = await TryWebView2RefreshAsync();
// Still no org ID? Use cached values from last successful login // Fill in any blanks from cached values saved at login time
if (string.IsNullOrEmpty(orgId) && !string.IsNullOrEmpty(AppSettings.Default.OrgId)) if (string.IsNullOrEmpty(email)) email = AppSettings.Default.Email;
orgId = AppSettings.Default.OrgId; if (string.IsNullOrEmpty(orgId)) orgId = AppSettings.Default.OrgId;
if (string.IsNullOrEmpty(email) && !string.IsNullOrEmpty(AppSettings.Default.Email))
email = AppSettings.Default.Email;
// If we have cached usage from login and still got nothing live, use that
if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson)) if (limits.Count == 0 && !string.IsNullOrEmpty(AppSettings.Default.UsageJson))
{ {
try try
@@ -114,19 +118,6 @@ public class UsageViewModel : INotifyPropertyChanged
catch { } catch { }
} }
bool isAuth = !string.IsNullOrEmpty(email) || !string.IsNullOrEmpty(orgId) || limits.Count > 0;
if (!isAuth && cookies.Count > 0)
{
// Cookies exist but nothing worked — session likely expired
await Application.Current.Dispatcher.InvokeAsync(() =>
{
IsSignedIn = false;
ErrorMessage = "Session expired — click Sign In to re-authenticate.";
IsLoading = false;
});
return;
}
foreach (var limit in limits) foreach (var limit in limits)
{ {
var key = limit.Window.ToString(); var key = limit.Window.ToString();
@@ -144,6 +135,8 @@ public class UsageViewModel : INotifyPropertyChanged
Overage = overage; Overage = overage;
Prepaid = prepaid; Prepaid = prepaid;
if (!string.IsNullOrEmpty(email)) UserEmail = email; if (!string.IsNullOrEmpty(email)) UserEmail = email;
// Trust that cookies / cached auth mean the user IS signed in,
// even if the live fetch failed this cycle.
IsSignedIn = true; IsSignedIn = true;
ErrorMessage = null; ErrorMessage = null;
LastUpdated = DateTime.Now; LastUpdated = DateTime.Now;
@@ -199,8 +192,9 @@ public class UsageViewModel : INotifyPropertyChanged
{ {
const string script = @"(async()=>{try{ const string script = @"(async()=>{try{
const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json(); const b=await(await fetch('/api/bootstrap',{headers:{accept:'application/json'}})).json();
const id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid||null; const id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
const em=b?.account?.email_address||null; ||b?.default_organization?.uuid||null;
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
if(!id)return{email:em,orgId:null,usage:null}; if(!id)return{email:em,orgId:null,usage:null};
const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json(); const u=await(await fetch('/api/organizations/'+id+'/usage',{headers:{accept:'application/json'}})).json();
return{email:em,orgId:id,usage:u}; return{email:em,orgId:id,usage:u};
@@ -276,7 +270,7 @@ public class UsageViewModel : INotifyPropertyChanged
public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies) public static void SaveCookies(IEnumerable<CoreWebView2Cookie> cookies)
{ {
var entries = cookies var entries = cookies
.Where(c => c.Domain.Contains("claude.ai")) .Where(c => c.Domain.Contains("claude.ai") || c.Domain.Contains("anthropic.com"))
.Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path }) .Select(c => new CookieEntry { Name = c.Name, Value = c.Value, Domain = c.Domain, Path = c.Path })
.ToList(); .ToList();
AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries); AppSettings.Default.CookieStore = JsonSerializer.Serialize(entries);