diff --git a/apps/cli/src/tools/generate.command.ts b/apps/cli/src/tools/generate.command.ts index 4763c6992ed..2bbfb02267b 100644 --- a/apps/cli/src/tools/generate.command.ts +++ b/apps/cli/src/tools/generate.command.ts @@ -1,6 +1,9 @@ import { StateService } from "@bitwarden/common/platform/abstractions/state.service"; import { DefaultPassphraseGenerationOptions } from "@bitwarden/common/tools/generator/passphrase"; -import { PasswordGenerationServiceAbstraction } from "@bitwarden/common/tools/generator/password"; +import { + DefaultPasswordGenerationOptions, + PasswordGenerationServiceAbstraction, +} from "@bitwarden/common/tools/generator/password"; import { PasswordGeneratorOptions } from "@bitwarden/common/tools/generator/password/password-generator-options"; import { Response } from "../models/response"; @@ -64,7 +67,10 @@ class Options { this.capitalize = CliUtils.convertBooleanOption(passedOptions?.capitalize); this.includeNumber = CliUtils.convertBooleanOption(passedOptions?.includeNumber); this.ambiguous = CliUtils.convertBooleanOption(passedOptions?.ambiguous); - this.length = CliUtils.convertNumberOption(passedOptions?.length, 14); + this.length = CliUtils.convertNumberOption( + passedOptions?.length, + DefaultPasswordGenerationOptions.length, + ); this.type = passedOptions?.passphrase ? "passphrase" : "password"; this.separator = CliUtils.convertStringOption( passedOptions?.separator, @@ -74,8 +80,14 @@ class Options { passedOptions?.words, DefaultPassphraseGenerationOptions.numWords, ); - this.minNumber = CliUtils.convertNumberOption(passedOptions?.minNumber, 1); - this.minSpecial = CliUtils.convertNumberOption(passedOptions?.minSpecial, 1); + this.minNumber = CliUtils.convertNumberOption( + passedOptions?.minNumber, + DefaultPasswordGenerationOptions.minNumber, + ); + this.minSpecial = CliUtils.convertNumberOption( + passedOptions?.minSpecial, + DefaultPasswordGenerationOptions.minSpecial, + ); if (!this.uppercase && !this.lowercase && !this.special && !this.number) { this.lowercase = true; diff --git a/libs/common/src/tools/generator/password/password-generation-options.ts b/libs/common/src/tools/generator/password/password-generation-options.ts index 55b27e4e7a0..a48eeb77c6e 100644 --- a/libs/common/src/tools/generator/password/password-generation-options.ts +++ b/libs/common/src/tools/generator/password/password-generation-options.ts @@ -78,6 +78,6 @@ export const DefaultPasswordGenerationOptions: Partial