Compare commits
12
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
bcd208684b | ||
|
|
2bdbe4943d | ||
|
|
1c365a55a8 | ||
|
|
8b367ee539 | ||
|
|
9134b8945d | ||
|
|
19b1751e78 | ||
|
|
a20956cde2 | ||
|
|
659171bf0a | ||
|
|
f5b3accc13 | ||
|
|
22e9096f7c | ||
|
|
6aee17fad2 | ||
|
|
b594889239 |
@@ -75,16 +75,16 @@ public partial class LoginWindow : Window
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
Browser.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsString);
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
Browser.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
const bkeys=Object.keys(b||{}).join(',');
|
||||
const akeys=Object.keys(b?.account||{}).join(',');
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
const rawB=JSON.stringify(b).slice(0,600);
|
||||
let id=b?.account?.memberships?.[0]?.organization?.uuid
|
||||
||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
||b?.default_organization?.uuid||null;
|
||||
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
let orgSrc='bootstrap';
|
||||
@@ -95,12 +95,13 @@ public partial class LoginWindow : Window
|
||||
if(!id){
|
||||
let pu=null;
|
||||
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||
window.chrome.webview.postMessage(JSON.stringify({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys}));
|
||||
window.chrome.webview.postMessage({email:e,orgId:null,usage:(pu&&!pu.error?pu:null),debug:'no-org|raw:'+rawB});
|
||||
return;
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
window.chrome.webview.postMessage(JSON.stringify({email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys}));
|
||||
}catch(ex){window.chrome.webview.postMessage(JSON.stringify({error:String(ex)}));}})()";
|
||||
const rawU=JSON.stringify(u).slice(0,300);
|
||||
window.chrome.webview.postMessage({email:e,orgId:id,usage:u,debug:'src:'+orgSrc+'|ukeys:'+Object.keys(u||{}).join(',')+'|raw:'+rawB});
|
||||
}catch(ex){window.chrome.webview.postMessage({error:String(ex)});}})()";
|
||||
|
||||
await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||
|
||||
|
||||
@@ -66,7 +66,16 @@
|
||||
|
||||
<!-- Cards scroll area -->
|
||||
<ScrollViewer VerticalScrollBarVisibility="Auto">
|
||||
<StackPanel x:Name="CardsPanel" Margin="0,4,0,4"/>
|
||||
<StackPanel Margin="0,4,0,4">
|
||||
<Border x:Name="DebugBanner" Visibility="Collapsed"
|
||||
Background="{DynamicResource CardBrush}"
|
||||
BorderBrush="{DynamicResource BorderBrush}" BorderThickness="1"
|
||||
CornerRadius="6" Margin="12,4,12,4" Padding="12,8">
|
||||
<TextBlock x:Name="DebugBannerText" FontSize="10" FontFamily="Consolas"
|
||||
Foreground="{DynamicResource SecondaryBrush}" TextWrapping="Wrap"/>
|
||||
</Border>
|
||||
<StackPanel x:Name="CardsPanel"/>
|
||||
</StackPanel>
|
||||
</ScrollViewer>
|
||||
</DockPanel>
|
||||
|
||||
|
||||
@@ -287,12 +287,15 @@ public partial class PopupWindow : Window
|
||||
var dbg = AppSettings.Default.DebugInfo;
|
||||
if (!string.IsNullOrEmpty(dbg))
|
||||
{
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
DebugText.Text = dbg;
|
||||
DebugText.Visibility = Visibility.Visible;
|
||||
DebugBannerText.Text = dbg;
|
||||
DebugBanner.Visibility = Visibility.Visible;
|
||||
}
|
||||
else
|
||||
{
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
DebugText.Visibility = Visibility.Collapsed;
|
||||
DebugBanner.Visibility = Visibility.Collapsed;
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,4 +1,4 @@
|
||||
## What's new in beta.26
|
||||
## What's new in beta.29
|
||||
|
||||
- Fixed: script results now use window.chrome.webview.postMessage instead of async IIFE return value — older WebView2 runtimes don't await Promises from ExecuteScriptAsync, so data was never received
|
||||
- Debug text in Settings will now always show what happened during sign-in
|
||||
- Fix: org ID is now correctly read from b.account.memberships[0].organization.uuid — bootstrap nests memberships inside account, not at the root
|
||||
- This was preventing usage limits from loading for all accounts
|
||||
|
||||
+19
-11
@@ -131,12 +131,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
|
||||
await Application.Current.Dispatcher.InvokeAsync(() =>
|
||||
{
|
||||
Limits = limits;
|
||||
Overage = overage;
|
||||
Prepaid = prepaid;
|
||||
if (limits.Count > 0) { Limits = limits; Overage = overage; Prepaid = prepaid; }
|
||||
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;
|
||||
ErrorMessage = null;
|
||||
LastUpdated = DateTime.Now;
|
||||
@@ -193,7 +189,8 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
const string script = @"(async()=>{try{
|
||||
const h={headers:{accept:'application/json'}};
|
||||
const b=await(await fetch('/api/bootstrap',h)).json();
|
||||
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
let id=b?.account?.memberships?.[0]?.organization?.uuid
|
||||
||b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||
||b?.default_organization?.uuid||null;
|
||||
const em=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||
if(!id){
|
||||
@@ -203,11 +200,11 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
if(!id){
|
||||
let pu=null;
|
||||
try{pu=await(await fetch('/api/usage',h)).json();}catch(e3){}
|
||||
window.chrome.webview.postMessage(JSON.stringify({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)}));
|
||||
window.chrome.webview.postMessage({email:em,orgId:null,usage:(pu&&!pu.error?pu:null)});
|
||||
return;
|
||||
}
|
||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||
window.chrome.webview.postMessage(JSON.stringify({email:em,orgId:id,usage:u}));
|
||||
window.chrome.webview.postMessage({email:em,orgId:id,usage:u});
|
||||
}catch(ex){window.chrome.webview.postMessage(null);}})();";
|
||||
|
||||
var resultJson = await Application.Current.Dispatcher.InvokeAsync(async () =>
|
||||
@@ -359,8 +356,9 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
acct.TryGetProperty("email_address", out var em))
|
||||
email = em.GetString();
|
||||
|
||||
// Path 1: memberships[0].organization.uuid
|
||||
if (root.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
// Path 1: account.memberships[0].organization.uuid (Claude.ai personal/pro accounts)
|
||||
if (root.TryGetProperty("account", out var acctNode) &&
|
||||
acctNode.TryGetProperty("memberships", out var mems) && mems.GetArrayLength() > 0)
|
||||
{
|
||||
var first = mems[0];
|
||||
if (first.TryGetProperty("organization", out var org) &&
|
||||
@@ -368,7 +366,17 @@ public class UsageViewModel : INotifyPropertyChanged
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
// Path 2: organizations[0].uuid (flat list on root)
|
||||
// Path 2: memberships[0].organization.uuid (root-level, older API shape)
|
||||
if (string.IsNullOrEmpty(orgId) &&
|
||||
root.TryGetProperty("memberships", out var rootMems) && rootMems.GetArrayLength() > 0)
|
||||
{
|
||||
var first = rootMems[0];
|
||||
if (first.TryGetProperty("organization", out var org) &&
|
||||
org.TryGetProperty("uuid", out var uuid))
|
||||
orgId = uuid.GetString();
|
||||
}
|
||||
|
||||
// Path 3: organizations[0].uuid (flat list on root)
|
||||
if (string.IsNullOrEmpty(orgId) &&
|
||||
root.TryGetProperty("organizations", out var orgs) && orgs.GetArrayLength() > 0)
|
||||
{
|
||||
|
||||
@@ -42,7 +42,7 @@ internal sealed class WebViewFetchWindow : Window
|
||||
msgHandler = (_, args) =>
|
||||
{
|
||||
_wv.CoreWebView2.WebMessageReceived -= msgHandler;
|
||||
tcs.TrySetResult(args.WebMessageAsString);
|
||||
tcs.TrySetResult(args.WebMessageAsJson);
|
||||
};
|
||||
_wv.CoreWebView2.WebMessageReceived += msgHandler;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user