Skip to content

Fix org sync cache on refresh and signout-signin #4398

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 16, 2025
+16 −4
Merged

Fix org sync cache on refresh and signout-signin #4398

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f1c5202
Clears organization settings when user signs out
sergeibbb Jun 16, 2025
9bd5284
Updates organization permissions on manual sync
sergeibbb Jun 16, 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: 16 additions & 4 deletions src/plus/gk/organizationService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,6 +34,7 @@ export class OrganizationService implements Disposable {
const orgId = await this.getActiveOrganizationId();
void this.updateOrganizationPermissions(orgId);
}),
container.subscription.onDidCheckIn(this.onUserCheckedIn, this),
container.subscription.onDidChange(this.onSubscriptionChanged, this),
);
}
Expand Down Expand Up @@ -128,11 +129,19 @@ export class OrganizationService implements Disposable {
});
}

private async onUserCheckedIn(): Promise<void> {
const orgId = await this.getActiveOrganizationId();
if (orgId == null) return;

await this.updateOrganizationPermissions(orgId, { force: true });
}

private async onSubscriptionChanged(e: SubscriptionChangeEvent): Promise<void> {
if (e.current?.account?.id == null) {
this.updateOrganizations(undefined);
this._organizationSettings = undefined;
await this.clearAllStoredOrganizationsSettings();
}
await this.clearAllStoredOrganizationsSettings();
await this.updateOrganizationPermissions(e.current?.activeOrganization?.id);
}

Expand All @@ -141,8 +150,11 @@ export class OrganizationService implements Disposable {
void setContext('gitlens:gk:hasOrganizations', (organizations ?? []).length > 1);
}

private async updateOrganizationPermissions(orgId: string | undefined): Promise<void> {
const settings = orgId != null ? await this.getOrganizationSettings(orgId) : undefined;
private async updateOrganizationPermissions(
orgId: string | undefined,
options?: { force?: boolean },
): Promise<void> {
const settings = orgId != null ? await this.getOrganizationSettings(orgId, options) : undefined;
let aiProviders;
try {
aiProviders = fromGKDevAIProviders(settings?.aiProviders);
Expand Down Expand Up @@ -274,7 +286,7 @@ export class OrganizationService implements Disposable {
}

private async clearAllStoredOrganizationsSettings(): Promise<void> {
return this.container.storage.deleteWithPrefix(`plus:organization:`);
return this.container.storage.deleteWithPrefix(`plus:organization`);
}

private async deleteStoredOrganizationSettings(id: string): Promise<void> {
Expand Down