Skip to content

Fetch settings only when ready #5052

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 23, 2025
Merged

Fetch settings only when ready #5052

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2015290
Cloud: only fetch settings when the session is available
jr Jun 23, 2025
c7dafc6
Cloud: actually track settings fetch success
jr Jun 23, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 9 additions & 11 deletions packages/cloud/src/SettingsService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,7 @@ export class SettingsService {

this.timer = new RefreshTimer({
callback: async () => {
await this.fetchSettings(callback)
return true
return await this.fetchSettings(callback)
},
successInterval: 30000,
initialBackoffMs: 1000,
Expand All @@ -42,10 +41,6 @@ export class SettingsService {
this.removeSettings()
}

this.authService.on("attempting-session", () => {
this.timer.start()
})

this.authService.on("active-session", () => {
this.timer.start()
})
Expand All @@ -55,16 +50,16 @@ export class SettingsService {
this.removeSettings()
})

if (this.authService.hasOrIsAcquiringActiveSession()) {
if (this.authService.hasActiveSession()) {
this.timer.start()
}
}

private async fetchSettings(callback: () => void): Promise<void> {
private async fetchSettings(callback: () => void): Promise<boolean> {
const token = this.authService.getSessionToken()

if (!token) {
return
return false
}

try {
Expand All @@ -76,15 +71,15 @@ export class SettingsService {

if (!response.ok) {
console.error(`Failed to fetch organization settings: ${response.status} ${response.statusText}`)
return
return false
}

const data = await response.json()
const result = organizationSettingsSchema.safeParse(data)

if (!result.success) {
console.error("Invalid organization settings format:", result.error)
return
return false
}

const newSettings = result.data
Expand All @@ -94,8 +89,11 @@ export class SettingsService {
await this.cacheSettings()
callback()
}

return true
} catch (error) {
console.error("Error fetching organization settings:", error)
return false
}
}

Expand Down
Loading