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

beta.25: read plan label from active org (lastActiveOrg) not first membership

Browse Source
This commit is contained in:
superdooper86
2026-05-11 13:23:23 +02:00
parent 8140831236
commit 60b6c60c0a
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ClaudeChecker/Info.plist
+2 -2
View File
@@ -15,9 +15,9 @@
<key>CFBundlePackageType</key> <key>CFBundlePackageType</key>
<string>APPL</string> <string>APPL</string>
<key>CFBundleShortVersionString</key> <key>CFBundleShortVersionString</key>
<string>1.2.1-beta.24</string> <string>1.2.1-beta.25</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>72</string> <string>73</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>13.0</string> <string>13.0</string>
<key>LSUIElement</key> <key>LSUIElement</key>
ClaudeChecker/UsageViewModel.swift
+7 -4
View File
@@ -248,7 +248,7 @@ class UsageViewModel: ObservableObject {
} }
} }
let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap() let (fetchedOrgId, fetchedEmail, fetchedPlan) = try await fetchBootstrap(preferredOrgId: cookieOrgId)
let orgId: String let orgId: String
if let id = cookieOrgId ?? fetchedOrgId { if let id = cookieOrgId ?? fetchedOrgId {
@@ -306,7 +306,7 @@ class UsageViewModel: ObservableObject {
// MARK: - Bootstrap // MARK: - Bootstrap
private func fetchBootstrap() async throws -> (orgId: String?, email: String?, planLabel: String?) { private func fetchBootstrap(preferredOrgId: String? = nil) async throws -> (orgId: String?, email: String?, planLabel: String?) {
let (status, body) = try await apiFetch("/api/bootstrap") let (status, body) = try await apiFetch("/api/bootstrap")
if status == 401 || status == 403 { if status == 401 || status == 403 {
throw AppError.detail("HTTP \(status) — \(body.prefix(120))") throw AppError.detail("HTTP \(status) — \(body.prefix(120))")
@@ -323,7 +323,8 @@ class UsageViewModel: ObservableObject {
let account = json["account"] as? [String: Any] let account = json["account"] as? [String: Any]
let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]] let memberships = (account?["memberships"] ?? json["memberships"]) as? [[String: Any]]
let firstOrg = memberships?.first?["organization"] as? [String: Any] let allOrgs = memberships?.compactMap { $0["organization"] as? [String: Any] } ?? []
let firstOrg = allOrgs.first
var orgId: String? = firstOrg?["uuid"] as? String var orgId: String? = firstOrg?["uuid"] as? String
if orgId == nil { if orgId == nil {
@@ -340,8 +341,10 @@ class UsageViewModel: ObservableObject {
let email = account?["email_address"] as? String let email = account?["email_address"] as? String
// Read capabilities from the preferred (active) org, falling back to first org.
let capOrg = preferredOrgId.flatMap { id in allOrgs.first(where: { $0["uuid"] as? String == id }) } ?? firstOrg
var planLabel: String? = nil var planLabel: String? = nil
if let caps = firstOrg?["capabilities"] as? [String], if let caps = capOrg?["capabilities"] as? [String],
let cap = caps.first(where: { $0.hasPrefix("claude_") }) { let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
let name = String(cap.dropFirst("claude_".count)) let name = String(cap.dropFirst("claude_".count))
planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased() planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()