bitwarden/browser
1
0
Fork 0
mirror of https://github.com/bitwarden/browser synced 2025-12-10 13:23:34 +00:00
Code Issues Releases Wiki Activity

[PM-26192] Integrate the new Autotype Default Policy (#16604)

Browse Source 
* Add current WIP autotype policy integration work

* [PM-26192] Add working code that fully integrates the autotype default policy

* [PM-26192] Add comments

* Update apps/desktop/src/autofill/services/desktop-autotype.service.ts

Co-authored-by: Jonathan Prusik <jprusik@users.noreply.github.com>

---------

Co-authored-by: Jonathan Prusik <jprusik@users.noreply.github.com>
This commit is contained in:
Colton Hurst
2025-09-26 11:31:31 -04:00
committed by GitHub
parent e5c5bf63ca
commit 7baf250288
3 changed files with 33 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
apps/desktop/src/app/services/services.module.ts
View File

@@ -468,6 +468,7 @@ const safeProviders: SafeProvider[] = [
GlobalStateProvider,
PlatformUtilsServiceAbstraction,
BillingAccountProfileStateService,
DesktopAutotypeDefaultSettingPolicy,
],
}),
safeProvider({

2
apps/desktop/src/autofill/services/desktop-autotype-policy.service.ts
View File

@@ -21,7 +21,7 @@ export class DesktopAutotypeDefaultSettingPolicy {
) {}
/**
* Emits the autotype policy enabled status (true | false | null) when account is unlocked and WindowsDesktopAutotype is enabled.
* Emits the autotype policy enabled status when account is unlocked and WindowsDesktopAutotype is enabled.
* - true: autotype policy exists and is enabled
* - null: no autotype policy exists for the user's organization
*/

34
apps/desktop/src/autofill/services/desktop-autotype.service.ts
View File

@@ -17,7 +17,9 @@ import { CipherService } from "@bitwarden/common/vault/abstractions/cipher.servi
import { CipherView } from "@bitwarden/common/vault/models/view/cipher.view";
import { UserId } from "@bitwarden/user-core";
export const AUTOTYPE_ENABLED = new KeyDefinition<boolean>(
import { DesktopAutotypeDefaultSettingPolicy } from "./desktop-autotype-policy.service";
export const AUTOTYPE_ENABLED = new KeyDefinition<boolean | null>(
AUTOTYPE_SETTINGS_DISK,
"autotypeEnabled",
{ deserializer: (b) => b },
@@ -37,6 +39,7 @@ export class DesktopAutotypeService {
private globalStateProvider: GlobalStateProvider,
private platformUtilsService: PlatformUtilsService,
private billingAccountProfileStateService: BillingAccountProfileStateService,
private desktopAutotypePolicy: DesktopAutotypeDefaultSettingPolicy,
) {
ipc.autofill.listenAutotypeRequest(async (windowTitle, callback) => {
const possibleCiphers = await this.matchCiphersToWindowTitle(windowTitle);
@@ -50,9 +53,32 @@ export class DesktopAutotypeService {
}
async init() {
this.autotypeEnabledUserSetting$ = this.autotypeEnabledState.state$;
// Currently Autotype is only supported for Windows
if (this.platformUtilsService.getDevice() === DeviceType.WindowsDesktop) {
// If `autotypeDefaultPolicy` is `true` for a user's organization, and the
// user has never changed their local autotype setting (`autotypeEnabledState`),
// we set their local setting to `true` (once the local user setting is changed
// by this policy or the user themselves, the default policy should
// never change the user setting again).
combineLatest([
this.autotypeEnabledState.state$,
this.desktopAutotypePolicy.autotypeDefaultSetting$,
])
.pipe(
map(async ([autotypeEnabledState, autotypeDefaultPolicy]) => {
if (autotypeDefaultPolicy === true && autotypeEnabledState === null) {
await this.setAutotypeEnabledState(true);
}
}),
)
.subscribe();
// autotypeEnabledUserSetting$ publicly represents the value the
// user has set for autotyeEnabled in their local settings.
this.autotypeEnabledUserSetting$ = this.autotypeEnabledState.state$;
// resolvedAutotypeEnabled$ represents the final determination if the Autotype
// feature should be on or off.
this.resolvedAutotypeEnabled$ = combineLatest([
this.autotypeEnabledState.state$,
this.configService.getFeatureFlag$(FeatureFlag.WindowsDesktopAutotype),
@@ -76,6 +102,8 @@ export class DesktopAutotypeService {
),
);
// When the resolvedAutotypeEnabled$ value changes, this might require
// hotkey registration / deregistration in the main process.
this.resolvedAutotypeEnabled$.subscribe((enabled) => {
ipc.autofill.configureAutotype(enabled);
});