From d66931e1c61843d606e1d6d44ba1eea4b06ece7c Mon Sep 17 00:00:00 2001 From: Dessalines Date: Sun, 19 Sep 2021 15:32:51 -0400 Subject: [PATCH] Password strength meter (#427) * Updating translations. * Updating translations. * Add password strength meter. Fixes #388 --- lemmy-translations | 2 +- package.json | 1 + src/shared/components/home/login.tsx | 54 +++++++++++++++++++++++ src/shared/components/person/settings.tsx | 6 --- yarn.lock | 5 +++ 5 files changed, 61 insertions(+), 7 deletions(-) diff --git a/lemmy-translations b/lemmy-translations index a700edf2..7dd7b98d 160000 --- a/lemmy-translations +++ b/lemmy-translations @@ -1 +1 @@ -Subproject commit a700edf2dc9c290050b036b6d33e0ea351c92274 +Subproject commit 7dd7b98da76477222f9fd9720b4b25e14e3ddc97 diff --git a/package.json b/package.json index c08b1cdb..c2738618 100644 --- a/package.json +++ b/package.json @@ -18,6 +18,7 @@ "dependencies": { "@typescript-eslint/parser": "^4.31.1", "autosize": "^5.0.1", + "check-password-strength": "^2.0.3", "choices.js": "^9.0.1", "emoji-short-name": "^1.0.0", "express": "~4.17.1", diff --git a/src/shared/components/home/login.tsx b/src/shared/components/home/login.tsx index 612a6b70..2addcf0a 100644 --- a/src/shared/components/home/login.tsx +++ b/src/shared/components/home/login.tsx @@ -1,3 +1,5 @@ +import { Options, passwordStrength } from "check-password-strength"; +import { I18nKeys } from "i18next"; import { Component, linkEvent } from "inferno"; import { T } from "inferno-i18next-dess"; import { @@ -28,6 +30,33 @@ import { import { HtmlTags } from "../common/html-tags"; import { Icon, Spinner } from "../common/icon"; +const passwordStrengthOptions: Options = [ + { + id: 0, + value: "too_weak", + minDiversity: 0, + minLength: 0, + }, + { + id: 1, + value: "weak", + minDiversity: 2, + minLength: 10, + }, + { + id: 2, + value: "medium", + minDiversity: 3, + minLength: 12, + }, + { + id: 3, + value: "strong", + minDiversity: 4, + minLength: 14, + }, +]; + interface State { loginForm: LoginForm; registerForm: Register; @@ -227,10 +256,16 @@ export class Login extends Component { value={this.state.registerForm.password} autoComplete="new-password" onInput={linkEvent(this, this.handleRegisterPasswordChange)} + minLength={10} maxLength={60} class="form-control" required /> + {this.state.registerForm.password && ( +
+ {i18n.t(this.passwordStrength as I18nKeys)} +
+ )} @@ -349,6 +384,25 @@ export class Login extends Component { ); } + get passwordStrength() { + return passwordStrength( + this.state.registerForm.password, + passwordStrengthOptions + ).value; + } + + get passwordColorClass(): string { + let strength = this.passwordStrength; + + if (["weak", "medium"].includes(strength)) { + return "text-warning"; + } else if (strength == "strong") { + return "text-success"; + } else { + return "text-danger"; + } + } + handleLoginSubmit(i: Login, event: any) { event.preventDefault(); i.state.loginLoading = true; diff --git a/src/shared/components/person/settings.tsx b/src/shared/components/person/settings.tsx index 2990fa24..22bcd25f 100644 --- a/src/shared/components/person/settings.tsx +++ b/src/shared/components/person/settings.tsx @@ -1035,12 +1035,6 @@ export class Settings extends Component { i.setState(i.state); } - handleLogoutClick(_i: Settings) { - UserService.Instance.logout(); - window.location.href = "/"; - location.reload(); - } - handleDeleteAccount(i: Settings, event: any) { event.preventDefault(); i.state.deleteAccountLoading = true; diff --git a/yarn.lock b/yarn.lock index 2250867e..284e2c15 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2062,6 +2062,11 @@ chalk@^4.0.0, chalk@^4.1.0, chalk@^4.1.1: ansi-styles "^4.1.0" supports-color "^7.1.0" +check-password-strength@^2.0.3: + version "2.0.3" + resolved "https://registry.yarnpkg.com/check-password-strength/-/check-password-strength-2.0.3.tgz#fed038b1c457ac11a2999bd96f3185af34e88895" + integrity sha512-UW3YgMUne9QuejgnNWjWwYi4QhWArVj+1OXqDR1NkEQcmMKKO74O3P5ZvXr9JZNbTBfcwlK3yurYCMuJsck83A== + choices.js@^9.0.1: version "9.0.1" resolved "https://registry.yarnpkg.com/choices.js/-/choices.js-9.0.1.tgz#745fb29af8670428fdc0bf1cc9dfaa404e9d0510"