Skip to content

Handle when an extension hasn't used an auth provider yet #229777

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
TylerLeonhardt merged 1 commit into from
Sep 25, 2024
Merged

Handle when an extension hasn't used an auth provider yet #229777

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
27 changes: 16 additions & 11 deletions ...ench/contrib/authentication/browser/actions/manageAccountPreferencesForExtensionAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,8 +23,8 @@ export class ManageAccountPreferencesForExtensionAction extends Action2 {
});
}

override run(accessor: ServicesAccessor, extensionId?: string) {
return accessor.get(IInstantiationService).createInstance(ManageAccountPreferenceForExtensionActionImpl).run(extensionId);
override run(accessor: ServicesAccessor, extensionId?: string, providerId?: string): Promise<void> {
return accessor.get(IInstantiationService).createInstance(ManageAccountPreferenceForExtensionActionImpl).run(extensionId, providerId);
}
}

Expand All @@ -42,7 +42,7 @@ class ManageAccountPreferenceForExtensionActionImpl {
@IExtensionService private readonly _extensionService: IExtensionService
) { }

async run(extensionId?: string) {
async run(extensionId?: string, providerId?: string) {
if (!extensionId) {
return;
}
Expand All @@ -53,14 +53,19 @@ class ManageAccountPreferenceForExtensionActionImpl {

const providerIds = new Array<string>();
const providerIdToAccounts = new Map<string, ReadonlyArray<AuthenticationSessionAccount>>();
for (const providerId of this._authenticationService.getProviderIds()) {
const accounts = await this._authenticationService.getAccounts(providerId);
for (const account of accounts) {
const usage = this._authenticationUsageService.readAccountUsages(providerId, account.label).find(u => u.extensionId === extensionId.toLowerCase());
if (usage) {
providerIds.push(providerId);
providerIdToAccounts.set(providerId, accounts);
break;
if (providerId) {
providerIds.push(providerId);
providerIdToAccounts.set(providerId, await this._authenticationService.getAccounts(providerId));
} else {
for (const providerId of this._authenticationService.getProviderIds()) {
const accounts = await this._authenticationService.getAccounts(providerId);
for (const account of accounts) {
const usage = this._authenticationUsageService.readAccountUsages(providerId, account.label).find(u => u.extensionId === extensionId.toLowerCase());
if (usage) {
providerIds.push(providerId);
providerIdToAccounts.set(providerId, accounts);
break;
}
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion ...rkbench/contrib/authentication/browser/actions/manageTrustedExtensionsForAccountAction.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,7 @@ class ManageTrustedExtensionsForAccountActionImpl {
quickPick.hide();
}));
disposableStore.add(quickPick.onDidTriggerItemButton(e =>
this._commandService.executeCommand('_manageAccountPreferencesForExtension', e.item.extension.id)
this._commandService.executeCommand('_manageAccountPreferencesForExtension', e.item.extension.id, providerId)
));
return quickPick;
}
Expand Down