fix: broaden JS orgId/email paths, URL-only auto-close

This commit is contained in:
SuperDooper
2026-05-08 15:49:45 +02:00
parent 4e154bcaa7
commit 1e4cdc09b3
+5 -4
View File
@@ -47,8 +47,8 @@ public partial class LoginWindow : Window
: "Complete sign-in, then click Done."; : "Complete sign-in, then click Done.";
}); });
// Auto-close as soon as we detect sign-in on any claude.ai page // Auto-close once we land on any claude.ai page that isn't the login flow
if (signedIn && !uri.Contains("/login") && !uri.Contains("/signin")) if (!uri.Contains("/login") && !uri.Contains("/signin") && signedIn)
await SaveAndClose(cookies); await SaveAndClose(cookies);
}; };
} }
@@ -72,8 +72,9 @@ public partial class LoginWindow : Window
{ {
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 e=b?.account?.email_address||null; ||b?.default_organization?.uuid||null;
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
if(!id)return{email:e,orgId:null,usage:null}; if(!id)return{email:e,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:e,orgId:id,usage:u}; return{email:e,orgId:id,usage:u};