Compare commits
5
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a74d0cece5 | ||
|
|
b5cd7b1bc9 | ||
|
|
3249dbd4aa | ||
|
|
189c513677 | ||
|
|
05e66b22d1 |
@@ -14,6 +14,7 @@ public class AppSettings
|
|||||||
public int RefreshInterval { get; set; } = 120;
|
public int RefreshInterval { get; set; } = 120;
|
||||||
public bool ShowInTaskbar { get; set; } = true;
|
public bool ShowInTaskbar { get; set; } = true;
|
||||||
public bool BetaChannel { get; set; } = false;
|
public bool BetaChannel { get; set; } = false;
|
||||||
|
public string DebugInfo { get; set; } = "";
|
||||||
|
|
||||||
private static readonly string FilePath = Path.Combine(
|
private static readonly string FilePath = Path.Combine(
|
||||||
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData),
|
||||||
|
|||||||
@@ -73,20 +73,23 @@ public partial class LoginWindow : Window
|
|||||||
const string script = @"(async()=>{try{
|
const string script = @"(async()=>{try{
|
||||||
const h={headers:{accept:'application/json'}};
|
const h={headers:{accept:'application/json'}};
|
||||||
const b=await(await fetch('/api/bootstrap',h)).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
|
let id=b?.memberships?.[0]?.organization?.uuid||b?.organizations?.[0]?.uuid
|
||||||
||b?.default_organization?.uuid||null;
|
||b?.default_organization?.uuid||null;
|
||||||
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
const e=b?.account?.email_address||b?.account?.email||b?.email||null;
|
||||||
|
let orgSrc='bootstrap';
|
||||||
if(!id){
|
if(!id){
|
||||||
try{const ol=await(await fetch('/api/organizations',h)).json();
|
try{const ol=await(await fetch('/api/organizations',h)).json();
|
||||||
if(Array.isArray(ol)&&ol.length>0)id=ol[0]?.uuid||null;}catch(e2){}
|
if(Array.isArray(ol)&&ol.length>0){id=ol[0]?.uuid||null;orgSrc='orgs-list';}}catch(e2){}
|
||||||
}
|
}
|
||||||
if(!id){
|
if(!id){
|
||||||
try{const pu=await(await fetch('/api/usage',h)).json();
|
try{const pu=await(await fetch('/api/usage',h)).json();
|
||||||
if(pu&&!pu.error)return{email:e,orgId:null,usage:pu};}catch(e3){}
|
if(pu&&!pu.error)return{email:e,orgId:null,usage:pu,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};}catch(e3){}
|
||||||
return{email:e,orgId:null,usage:null};
|
return{email:e,orgId:null,usage:null,debug:'no-org|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||||
}
|
}
|
||||||
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
const u=await(await fetch('/api/organizations/'+id+'/usage',h)).json();
|
||||||
return{email:e,orgId:id,usage:u};
|
return{email:e,orgId:id,usage:u,debug:'orgSrc:'+orgSrc+'|bkeys:'+bkeys+'|akeys:'+akeys};
|
||||||
}catch(ex){return{error:String(ex)};}})()";
|
}catch(ex){return{error:String(ex)};}})()";
|
||||||
|
|
||||||
var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
var json = await Browser.CoreWebView2.ExecuteScriptAsync(script);
|
||||||
@@ -104,6 +107,11 @@ public partial class LoginWindow : Window
|
|||||||
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
if (root.TryGetProperty("usage", out var us) && us.ValueKind == JsonValueKind.Object)
|
||||||
AppSettings.Default.UsageJson = us.GetRawText();
|
AppSettings.Default.UsageJson = us.GetRawText();
|
||||||
|
|
||||||
|
if (root.TryGetProperty("debug", out var dbg) && dbg.ValueKind == JsonValueKind.String)
|
||||||
|
AppSettings.Default.DebugInfo = dbg.GetString() ?? "";
|
||||||
|
else if (root.TryGetProperty("error", out var err))
|
||||||
|
AppSettings.Default.DebugInfo = "error:" + err.GetRawText();
|
||||||
|
|
||||||
AppSettings.Default.Save();
|
AppSettings.Default.Save();
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -185,6 +185,10 @@
|
|||||||
</Grid>
|
</Grid>
|
||||||
</Border>
|
</Border>
|
||||||
|
|
||||||
|
<TextBlock x:Name="DebugText" FontSize="10" Foreground="{DynamicResource SecondaryBrush}"
|
||||||
|
TextWrapping="Wrap" Margin="0,12,0,0" FontFamily="Consolas"
|
||||||
|
Visibility="Collapsed"/>
|
||||||
|
|
||||||
</StackPanel>
|
</StackPanel>
|
||||||
</ScrollViewer>
|
</ScrollViewer>
|
||||||
</DockPanel>
|
</DockPanel>
|
||||||
|
|||||||
@@ -283,6 +283,17 @@ public partial class PopupWindow : Window
|
|||||||
|
|
||||||
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
SignOutButton.Visibility = VM.IsSignedIn ? Visibility.Visible : Visibility.Collapsed;
|
||||||
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
SignInButton.Content = VM.IsSignedIn ? "Re-authenticate" : "Sign In";
|
||||||
|
|
||||||
|
var dbg = AppSettings.Default.DebugInfo;
|
||||||
|
if (!string.IsNullOrEmpty(dbg))
|
||||||
|
{
|
||||||
|
DebugText.Text = dbg;
|
||||||
|
DebugText.Visibility = Visibility.Visible;
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
DebugText.Visibility = Visibility.Collapsed;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ── Event handlers ───────────────────────────────────────────────
|
// ── Event handlers ───────────────────────────────────────────────
|
||||||
|
|||||||
@@ -1,6 +1,3 @@
|
|||||||
## What's new in beta.24
|
## What's new in beta.25
|
||||||
|
|
||||||
- Sign-in now shows email and data immediately after login (loads from cache set during login flow)
|
- Debug: Settings panel now shows bootstrap diagnostic info after sign-in (helps diagnose missing data)
|
||||||
- Background refresh runs 3 seconds after login — avoids WebView2 user data folder lock race
|
|
||||||
- Added /api/organizations and personal /api/usage fallbacks when bootstrap has no org ID
|
|
||||||
- Broader JS paths for email and org ID
|
|
||||||
|
|||||||
Reference in New Issue
Block a user