mirror of
https://github.com/bitwarden/browser
synced 2026-02-09 05:00:10 +00:00
rename generate$ to generator$
This commit is contained in:
@@ -249,7 +249,7 @@ export class ExportComponent implements OnInit, OnDestroy, AfterViewInit {
|
||||
}),
|
||||
);
|
||||
this.generatorService
|
||||
.generate$({ on$: this.onGenerate$, account$ })
|
||||
.generator$({ on$: this.onGenerate$, account$ })
|
||||
.pipe(takeUntil(this.destroy$))
|
||||
.subscribe((generated) => {
|
||||
this.exportForm.patchValue({
|
||||
|
||||
@@ -229,7 +229,7 @@ export class CredentialGeneratorComponent implements OnInit, OnChanges, OnDestro
|
||||
|
||||
// wire up the generator
|
||||
this.generatorService
|
||||
.generate$({
|
||||
.generator$({
|
||||
on$: this.generate$,
|
||||
account$: this.account$,
|
||||
})
|
||||
|
||||
@@ -182,7 +182,7 @@ export class PasswordGeneratorComponent implements OnInit, OnChanges, OnDestroy
|
||||
|
||||
// wire up the generator
|
||||
this.generatorService
|
||||
.generate$({ on$: this.generate$, account$: this.account$ })
|
||||
.generator$({ on$: this.generate$, account$: this.account$ })
|
||||
.pipe(
|
||||
catchError((error: unknown, generator) => {
|
||||
if (typeof error === "string") {
|
||||
|
||||
@@ -207,7 +207,7 @@ export class UsernameGeneratorComponent implements OnInit, OnChanges, OnDestroy
|
||||
|
||||
// wire up the generator
|
||||
this.generatorService
|
||||
.generate$({
|
||||
.generator$({
|
||||
on$: this.generate$,
|
||||
account$: this.account$,
|
||||
})
|
||||
|
||||
@@ -26,7 +26,7 @@ export abstract class CredentialGeneratorService {
|
||||
/** Generates a stream of credentials
|
||||
* @param dependencies.on$ Required. A new credential is emitted when this emits.
|
||||
*/
|
||||
abstract generate$: (
|
||||
abstract generator$: (
|
||||
dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>,
|
||||
) => Observable<GeneratedCredential>;
|
||||
|
||||
|
||||
@@ -16,7 +16,7 @@ import {
|
||||
} from "../metadata";
|
||||
import { CredentialGeneratorProviders } from "../providers";
|
||||
|
||||
import { DefaultCredentialGeneratorService } from "./credential-generator.service";
|
||||
import { DefaultCredentialGeneratorService } from "./default-credential-generator.service";
|
||||
|
||||
// Custom type for jest.fn() mocks to preserve their type
|
||||
type JestMockFunction<T extends (...args: any) => any> = jest.Mock<ReturnType<T>, Parameters<T>>;
|
||||
@@ -112,7 +112,7 @@ describe("CredentialGeneratorService", () => {
|
||||
account$: of(account),
|
||||
};
|
||||
|
||||
const result = await firstValueFrom(service.generate$(dependencies));
|
||||
const result = await firstValueFrom(service.generator$(dependencies));
|
||||
|
||||
expect(result).toBe("generatedPassword");
|
||||
expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm");
|
||||
@@ -141,7 +141,7 @@ describe("CredentialGeneratorService", () => {
|
||||
account$: of(account),
|
||||
};
|
||||
|
||||
const result = await firstValueFrom(service.generate$(dependencies));
|
||||
const result = await firstValueFrom(service.generator$(dependencies));
|
||||
|
||||
expect(result).toBe("generatedPassword");
|
||||
expect(providers.metadata!.metadata).toHaveBeenCalledWith("testAlgorithm");
|
||||
@@ -46,7 +46,7 @@ export class DefaultCredentialGeneratorService implements CredentialGeneratorSer
|
||||
|
||||
private readonly log: SemanticLogger;
|
||||
|
||||
generate$(dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>) {
|
||||
generator$(dependencies: OnDependency<GenerateRequest> & BoundDependency<"account", Account>) {
|
||||
// `on$` is partitioned into several streams so that the generator
|
||||
// engine and settings refresh only when their respective inputs change
|
||||
const on$ = dependencies.on$.pipe(shareReplay({ refCount: true, bufferSize: 1 }));
|
||||
@@ -1,2 +1,2 @@
|
||||
export { DefaultGeneratorService } from "./default-generator.service";
|
||||
export { DefaultCredentialGeneratorService } from "./credential-generator.service";
|
||||
export { DefaultCredentialGeneratorService } from "./default-credential-generator.service";
|
||||
|
||||
@@ -127,7 +127,7 @@ export class SendOptionsComponent implements OnInit {
|
||||
pin({ name: () => "send-options.component", distinct: (p, c) => p.id === c.id }),
|
||||
);
|
||||
const generatedCredential = await firstValueFrom(
|
||||
this.generatorService.generate$({ on$, account$ }),
|
||||
this.generatorService.generator$({ on$, account$ }),
|
||||
);
|
||||
|
||||
this.sendOptionsForm.patchValue({
|
||||
|
||||
Reference in New Issue
Block a user