mirror of
https://github.com/bitwarden/browser
synced 2025-12-16 08:13:42 +00:00
[PM-16793] port credential generator service to providers (#14071)
* introduce extension service * deprecate legacy forwarder types * eliminate repeat algorithm emissions * extend logging to preference management * align forwarder ids with vendor ids * fix duplicate policy emissions; debugging required logger enhancements ----- Co-authored-by: Daniel James Smith <2670567+djsmith85@users.noreply.github.com>
This commit is contained in:
@@ -1,5 +1,3 @@
|
||||
// FIXME: Update this file to be type safe and remove this and next line
|
||||
// @ts-strict-ignore
|
||||
import { coerceBooleanProperty } from "@angular/cdk/coercion";
|
||||
import {
|
||||
OnInit,
|
||||
@@ -12,14 +10,20 @@ import {
|
||||
OnChanges,
|
||||
} from "@angular/core";
|
||||
import { FormBuilder } from "@angular/forms";
|
||||
import { skip, takeUntil, Subject, map, withLatestFrom, ReplaySubject } from "rxjs";
|
||||
import { skip, takeUntil, Subject, map, withLatestFrom, ReplaySubject, tap } from "rxjs";
|
||||
|
||||
import { Account } from "@bitwarden/common/auth/abstractions/account.service";
|
||||
import { I18nService } from "@bitwarden/common/platform/abstractions/i18n.service";
|
||||
import { LogService } from "@bitwarden/common/platform/abstractions/log.service";
|
||||
import {
|
||||
SemanticLogger,
|
||||
disabledSemanticLoggerProvider,
|
||||
ifEnabledSemanticLoggerProvider,
|
||||
} from "@bitwarden/common/tools/log";
|
||||
import {
|
||||
Generators,
|
||||
CredentialGeneratorService,
|
||||
PassphraseGenerationOptions,
|
||||
BuiltIn,
|
||||
} from "@bitwarden/generator-core";
|
||||
|
||||
const Controls = Object.freeze({
|
||||
@@ -45,12 +49,26 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
|
||||
private formBuilder: FormBuilder,
|
||||
private generatorService: CredentialGeneratorService,
|
||||
private i18nService: I18nService,
|
||||
private logService: LogService,
|
||||
) {}
|
||||
|
||||
/** Send structured debug logs from the credential generator component
|
||||
* to the debugger console.
|
||||
*
|
||||
* @warning this may reveal sensitive information in plaintext.
|
||||
*/
|
||||
@Input()
|
||||
debug: boolean = false;
|
||||
|
||||
// this `log` initializer is overridden in `ngOnInit`
|
||||
private log: SemanticLogger = disabledSemanticLoggerProvider({});
|
||||
|
||||
/** Binds the component to a specific user's settings.
|
||||
* @remarks this is initialized to null but since it's a required input it'll
|
||||
* never have that value in practice.
|
||||
*/
|
||||
@Input({ required: true })
|
||||
account: Account;
|
||||
account: Account = null!;
|
||||
|
||||
protected account$ = new ReplaySubject<Account>(1);
|
||||
|
||||
@@ -70,53 +88,66 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
|
||||
/** Emits settings updates and completes if the settings become unavailable.
|
||||
* @remarks this does not emit the initial settings. If you would like
|
||||
* to receive live settings updates including the initial update,
|
||||
* use `CredentialGeneratorService.settings$(...)` instead.
|
||||
* use {@link CredentialGeneratorService.settings} instead.
|
||||
*/
|
||||
@Output()
|
||||
readonly onUpdated = new EventEmitter<PassphraseGenerationOptions>();
|
||||
|
||||
protected settings = this.formBuilder.group({
|
||||
[Controls.numWords]: [Generators.passphrase.settings.initial.numWords],
|
||||
[Controls.wordSeparator]: [Generators.passphrase.settings.initial.wordSeparator],
|
||||
[Controls.capitalize]: [Generators.passphrase.settings.initial.capitalize],
|
||||
[Controls.includeNumber]: [Generators.passphrase.settings.initial.includeNumber],
|
||||
[Controls.numWords]: [0],
|
||||
[Controls.wordSeparator]: [""],
|
||||
[Controls.capitalize]: [false],
|
||||
[Controls.includeNumber]: [false],
|
||||
});
|
||||
|
||||
async ngOnInit() {
|
||||
const settings = await this.generatorService.settings(Generators.passphrase, {
|
||||
this.log = ifEnabledSemanticLoggerProvider(this.debug, this.logService, {
|
||||
type: "PassphraseSettingsComponent",
|
||||
});
|
||||
|
||||
const settings = await this.generatorService.settings(BuiltIn.passphrase, {
|
||||
account$: this.account$,
|
||||
});
|
||||
|
||||
// skips reactive event emissions to break a subscription cycle
|
||||
settings.withConstraints$
|
||||
.pipe(takeUntil(this.destroyed$))
|
||||
.pipe(
|
||||
tap((content) => this.log.debug(content, "passphrase settings loaded with constraints")),
|
||||
takeUntil(this.destroyed$),
|
||||
)
|
||||
.subscribe(({ state, constraints }) => {
|
||||
this.settings.patchValue(state, { emitEvent: false });
|
||||
|
||||
let boundariesHint = this.i18nService.t(
|
||||
"spinboxBoundariesHint",
|
||||
constraints.numWords.min?.toString(),
|
||||
constraints.numWords.max?.toString(),
|
||||
constraints.numWords?.min?.toString(),
|
||||
constraints.numWords?.max?.toString(),
|
||||
);
|
||||
if (state.numWords <= (constraints.numWords.recommendation ?? 0)) {
|
||||
if ((state.numWords ?? 0) <= (constraints.numWords?.recommendation ?? 0)) {
|
||||
boundariesHint += this.i18nService.t(
|
||||
"passphraseNumWordsRecommendationHint",
|
||||
constraints.numWords.recommendation?.toString(),
|
||||
constraints.numWords?.recommendation?.toString(),
|
||||
);
|
||||
}
|
||||
this.numWordsBoundariesHint.next(boundariesHint);
|
||||
});
|
||||
|
||||
// the first emission is the current value; subsequent emissions are updates
|
||||
settings.pipe(skip(1), takeUntil(this.destroyed$)).subscribe(this.onUpdated);
|
||||
settings
|
||||
.pipe(
|
||||
skip(1),
|
||||
tap((settings) => this.log.debug(settings, "passphrase settings onUpdate event")),
|
||||
takeUntil(this.destroyed$),
|
||||
)
|
||||
.subscribe(this.onUpdated);
|
||||
|
||||
// explain policy & disable policy-overridden fields
|
||||
this.generatorService
|
||||
.policy$(Generators.passphrase, { account$: this.account$ })
|
||||
.policy$(BuiltIn.passphrase, { account$: this.account$ })
|
||||
.pipe(takeUntil(this.destroyed$))
|
||||
.subscribe(({ constraints }) => {
|
||||
this.wordSeparatorMaxLength = constraints.wordSeparator.maxLength;
|
||||
this.policyInEffect = constraints.policyInEffect;
|
||||
this.wordSeparatorMaxLength = constraints.wordSeparator?.maxLength ?? 0;
|
||||
this.policyInEffect = constraints.policyInEffect ?? false;
|
||||
|
||||
this.toggleEnabled(Controls.capitalize, !constraints.capitalize?.readonly);
|
||||
this.toggleEnabled(Controls.includeNumber, !constraints.includeNumber?.readonly);
|
||||
@@ -126,22 +157,25 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
|
||||
this.saveSettings
|
||||
.pipe(
|
||||
withLatestFrom(this.settings.valueChanges),
|
||||
map(([, settings]) => settings),
|
||||
tap(([source, form]) =>
|
||||
this.log.debug({ source, form }, "save passphrase settings request"),
|
||||
),
|
||||
map(([, settings]) => settings as PassphraseGenerationOptions),
|
||||
takeUntil(this.destroyed$),
|
||||
)
|
||||
.subscribe(settings);
|
||||
}
|
||||
|
||||
/** attribute binding for wordSeparator[maxlength] */
|
||||
protected wordSeparatorMaxLength: number;
|
||||
protected wordSeparatorMaxLength: number = 0;
|
||||
|
||||
private saveSettings = new Subject<string>();
|
||||
save(site: string = "component api call") {
|
||||
this.saveSettings.next(site);
|
||||
save(source: string = "component api call") {
|
||||
this.saveSettings.next(source);
|
||||
}
|
||||
|
||||
/** display binding for enterprise policy notice */
|
||||
protected policyInEffect: boolean;
|
||||
protected policyInEffect: boolean = false;
|
||||
|
||||
private numWordsBoundariesHint = new ReplaySubject<string>(1);
|
||||
|
||||
@@ -150,9 +184,9 @@ export class PassphraseSettingsComponent implements OnInit, OnChanges, OnDestroy
|
||||
|
||||
private toggleEnabled(setting: keyof typeof Controls, enabled: boolean) {
|
||||
if (enabled) {
|
||||
this.settings.get(setting).enable({ emitEvent: false });
|
||||
this.settings.get(setting)?.enable({ emitEvent: false });
|
||||
} else {
|
||||
this.settings.get(setting).disable({ emitEvent: false });
|
||||
this.settings.get(setting)?.disable({ emitEvent: false });
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user