bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2026-02-13 23:13:36 +00:00
Code Issues Releases Wiki Activity

fix(extension-device-approval): [PM-14943] Answering Service Full Implementation - Restructuring some code, adding comments.

Browse Source
This commit is contained in:
Patrick Pimentel
2025-08-28 14:54:49 -04:00
parent 3c1c0d6d26
commit e04daf3a9c
6 changed files with 122 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
libs/angular/src/auth/device-management/device-management.component.ts
View File

@@ -6,12 +6,17 @@ import { firstValueFrom } from "rxjs";
// This import has been flagged as unallowed for this class. It may be involved in a circular dependency loop.
// eslint-disable-next-line no-restricted-imports
import { AuthRequestApiServiceAbstraction } from "@bitwarden/auth/common";
import { AccountService } from "@bitwarden/common/auth/abstractions/account.service";
import { DevicesServiceAbstraction } from "@bitwarden/common/auth/abstractions/devices/devices.service.abstraction";
import {
DevicePendingAuthRequest,
DeviceResponse,
} from "@bitwarden/common/auth/abstractions/devices/responses/device.response";
import { DeviceView } from "@bitwarden/common/auth/abstractions/devices/views/device.view";
import { getUserId } from "@bitwarden/common/auth/services/account.service";
import {
PendingAuthRequestsStateService
} from "@bitwarden/common/auth/services/auth-request-answering/pending-auth-requests.state";
import { DeviceType, DeviceTypeMetadata } from "@bitwarden/common/enums";
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
import { ValidationService } from "@bitwarden/common/platform/abstractions/validation.service";
@@ -66,14 +71,16 @@ export class DeviceManagementComponent implements OnInit {
protected showHeaderInfo = false;
constructor(
private authRequestApiService: AuthRequestApiServiceAbstraction,
private destroyRef: DestroyRef,
private deviceManagementComponentService: DeviceManagementComponentServiceAbstraction,
private devicesService: DevicesServiceAbstraction,
private dialogService: DialogService,
private i18nService: I18nService,
private messageListener: MessageListener,
private validationService: ValidationService,
private readonly accountService: AccountService,
private readonly authRequestApiService: AuthRequestApiServiceAbstraction,
private readonly destroyRef: DestroyRef,
private readonly deviceManagementComponentService: DeviceManagementComponentServiceAbstraction,
private readonly devicesService: DevicesServiceAbstraction,
private readonly dialogService: DialogService,
private readonly i18nService: I18nService,
private readonly messageListener: MessageListener,
private readonly pendingAuthRequestStateService: PendingAuthRequestsStateService,
private readonly validationService: ValidationService,
) {
this.showHeaderInfo = this.deviceManagementComponentService.showHeaderInformation();
}
@@ -248,6 +255,12 @@ export class DeviceManagementComponent implements OnInit {
// Auth request was approved or denied, so clear the
// pending auth request and re-sort the device array
this.devices = clearAuthRequestAndResortDevices(this.devices, pendingAuthRequest);
// If a user ignores or doesn't see the auth request dialog, but comes to account settings
// to approve a device login attempt, clear out the state for that user.
await this.pendingAuthRequestStateService.clearByUserId(
await firstValueFrom(this.accountService.activeAccount$.pipe(getUserId))
)
}
}
}