Compare commits

..
5 changed files with 39 additions and 23 deletions
+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.1.4-beta.1</string> <string>1.1.4-beta.3</string>
<key>CFBundleVersion</key> <key>CFBundleVersion</key>
<string>41</string> <string>43</string>
<key>LSMinimumSystemVersion</key> <key>LSMinimumSystemVersion</key>
<string>13.0</string> <string>13.0</string>
<key>LSUIElement</key> <key>LSUIElement</key>
+30 -14
View File
@@ -69,10 +69,12 @@ class UsageViewModel: ObservableObject {
do { do {
// Fetch org ID dynamically if not cached // Fetch org ID dynamically if not cached
if cachedOrgId == nil { if cachedOrgId == nil {
cachedOrgId = try await fetchOrgId() let (fetchedOrgId, fetchedPlan) = try await fetchOrgId()
cachedOrgId = fetchedOrgId
if let id = cachedOrgId { if let id = cachedOrgId {
UserDefaults.standard.set(id, forKey: "claude_org_id") UserDefaults.standard.set(id, forKey: "claude_org_id")
} }
if let plan = fetchedPlan { planLabel = plan }
} }
guard let orgId = cachedOrgId else { guard let orgId = cachedOrgId else {
throw AppError.notAuthenticated throw AppError.notAuthenticated
@@ -82,13 +84,13 @@ class UsageViewModel: ObservableObject {
async let prepaidFetch = fetchPrepaidCredits(orgId: orgId) async let prepaidFetch = fetchPrepaidCredits(orgId: orgId)
async let overageFetch = fetchOverageSpendLimit(orgId: orgId) async let overageFetch = fetchOverageSpendLimit(orgId: orgId)
async let emailFetch = fetchUserEmail() async let emailFetch = fetchUserEmail()
let (usage, prepaid, overage, email) = try await (usageFetch, prepaidFetch, overageFetch, emailFetch) let (usage, prepaid, overage, emailResult) = try await (usageFetch, prepaidFetch, overageFetch, emailFetch)
if let email { userEmail = email } if let email = emailResult.email { userEmail = email }
if let plan = emailResult.planLabel { planLabel = plan }
limits = buildLimits(from: usage) limits = buildLimits(from: usage)
extraUsage = usage.extraUsage extraUsage = usage.extraUsage
prepaidCredits = prepaid prepaidCredits = prepaid
overageSpendLimit = overage overageSpendLimit = overage
planLabel = "Pro"
lastUpdated = Date() lastUpdated = Date()
isSignedIn = true isSignedIn = true
@@ -123,7 +125,7 @@ class UsageViewModel: ObservableObject {
// MARK: - Fetch org ID from bootstrap // MARK: - Fetch org ID from bootstrap
private func fetchOrgId() async throws -> String? { private func fetchOrgId() async throws -> (orgId: String?, planLabel: String?) {
let url = URL(string: "https://claude.ai/api/bootstrap")! let url = URL(string: "https://claude.ai/api/bootstrap")!
var req = URLRequest(url: url) var req = URLRequest(url: url)
req.setValue("application/json", forHTTPHeaderField: "accept") req.setValue("application/json", forHTTPHeaderField: "accept")
@@ -137,27 +139,34 @@ class UsageViewModel: ObservableObject {
guard let http = response as? HTTPURLResponse else { throw AppError.networkError } guard let http = response as? HTTPURLResponse else { throw AppError.networkError }
if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated } if http.statusCode == 401 || http.statusCode == 403 { throw AppError.notAuthenticated }
guard http.statusCode == 200 else { throw AppError.networkError } guard http.statusCode == 200 else { throw AppError.networkError }
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return nil } guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any] else { return (nil, nil) }
func planFromOrg(_ org: [String: Any]?) -> String? {
guard let caps = org?["capabilities"] as? [String] else { return nil }
guard let cap = caps.first(where: { $0.hasPrefix("claude_") }) else { return nil }
let name = String(cap.dropFirst("claude_".count))
return name.prefix(1).uppercased() + name.dropFirst().lowercased()
}
// account.memberships[0].organization.uuid // account.memberships[0].organization.uuid
if let account = json["account"] as? [String: Any], if let account = json["account"] as? [String: Any],
let memberships = account["memberships"] as? [[String: Any]], let memberships = account["memberships"] as? [[String: Any]],
let org = memberships.first?["organization"] as? [String: Any], let org = memberships.first?["organization"] as? [String: Any],
let uuid = org["uuid"] as? String { let uuid = org["uuid"] as? String {
return uuid return (uuid, planFromOrg(org))
} }
// root memberships (older API shape) // root memberships (older API shape)
if let memberships = json["memberships"] as? [[String: Any]], if let memberships = json["memberships"] as? [[String: Any]],
let org = memberships.first?["organization"] as? [String: Any], let org = memberships.first?["organization"] as? [String: Any],
let uuid = org["uuid"] as? String { let uuid = org["uuid"] as? String {
return uuid return (uuid, planFromOrg(org))
} }
// root organizations array // root organizations array
if let orgs = json["organizations"] as? [[String: Any]], if let orgs = json["organizations"] as? [[String: Any]],
let uuid = orgs.first?["uuid"] as? String { let uuid = orgs.first?["uuid"] as? String {
return uuid return (uuid, planFromOrg(orgs.first))
} }
return nil return (nil, nil)
} }
// MARK: - Fetch usage // MARK: - Fetch usage
@@ -180,7 +189,7 @@ class UsageViewModel: ObservableObject {
return try JSONDecoder().decode(UsageResponse.self, from: data) return try JSONDecoder().decode(UsageResponse.self, from: data)
} }
private func fetchUserEmail() async throws -> String? { private func fetchUserEmail() async throws -> (email: String?, planLabel: String?) {
let url = URL(string: "https://claude.ai/api/bootstrap")! let url = URL(string: "https://claude.ai/api/bootstrap")!
var req = URLRequest(url: url) var req = URLRequest(url: url)
req.setValue("application/json", forHTTPHeaderField: "accept") req.setValue("application/json", forHTTPHeaderField: "accept")
@@ -188,9 +197,16 @@ class UsageViewModel: ObservableObject {
let (data, response) = try await URLSession.shared.data(for: req) let (data, response) = try await URLSession.shared.data(for: req)
guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil } guard let http = response as? HTTPURLResponse, http.statusCode == 200 else { return nil }
guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any], guard let json = try? JSONSerialization.jsonObject(with: data) as? [String: Any],
let account = json["account"] as? [String: Any], let account = json["account"] as? [String: Any] else { return (nil, nil) }
let email = account["email_address"] as? String else { return nil } let email = account["email_address"] as? String
return email var planLabel: String? = nil
if let memberships = account["memberships"] as? [[String: Any]],
let caps = memberships.first?["organization"]?["capabilities"] as? [String],
let cap = caps.first(where: { $0.hasPrefix("claude_") }) {
let name = String(cap.dropFirst("claude_".count))
planLabel = name.prefix(1).uppercased() + name.dropFirst().lowercased()
}
return (email, planLabel)
} }
private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? { private func fetchPrepaidCredits(orgId: String) async throws -> PrepaidCredits? {
+1 -1
View File
@@ -10,7 +10,7 @@
[![Swift](https://img.shields.io/badge/Swift-5.9-F05138?style=flat&logo=swift&logoColor=white)](https://swift.org) [![Swift](https://img.shields.io/badge/Swift-5.9-F05138?style=flat&logo=swift&logoColor=white)](https://swift.org)
[![Version](https://img.shields.io/badge/version-1.1.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases) [![Version](https://img.shields.io/badge/version-1.1.3-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases)
[![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE) [![License](https://img.shields.io/badge/license-MIT-blue?style=flat)](LICENSE)
<!-- BETA_BADGE --> [![Beta](https://img.shields.io/badge/beta-1.1.4--beta.2-orange?style=flat)](https://github.com/superdooper86/claudechecker/releases/tag/v1.1.4-beta.2) <!-- BETA_BADGE -->
</div> </div>
+2 -2
View File
@@ -1,4 +1,4 @@
## What's new in v1.1.4-beta.1 ## What's new in v1.1.4-beta.3
### Bug fix ### Bug fix
- Org ID is now fetched dynamically from the bootstrap API instead of being hardcoded — the app now works for all users, not just the developer's account - Plan name now updates correctly on every refresh (was only set on first launch)
+4 -4
View File
@@ -1,5 +1,5 @@
{ {
"version": "1.1.3-beta.5", "version": "1.1.4-beta.2",
"url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.3-beta.5/ClaudeChecker.zip", "url": "https://github.com/superdooper86/claudechecker/releases/download/v1.1.4-beta.2/ClaudeChecker.zip",
"notes": "## What's new in v1.1.3\n\n### UI polish\n- Limit headers now read \"5 Hour Limit\" and \"7 Day Limit\" instead of \"5hr\"\n- Tapping anywhere on the blue update banner opens the update window\n\n### Session Diary fix\n- Burn history is persisted across app launches \u2014 the sparkline populates immediately on first open instead of requiring a manual refresh\n\n### Window sizing fixes\n- The popover now resizes correctly when switching between the main view and settings\n- Background colour no longer shows through during the resize animation" "notes": "## What's new in v1.1.4-beta.2\n\n### Improvements\n- Plan name (e.g. Pro, Max) is now read from the API instead of being hardcoded"
} }