Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

fix: Check password strength on password auto-fill #2148

Merged
merged 4 commits into from
Nov 19, 2024
Merged

fix: Check password strength on password auto-fill #2148

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
629c2a8
fix change password
SuaYoo Nov 13, 2024
d0277cb
update sign up and reset
SuaYoo Nov 13, 2024
2f93e68
Apply `localize:extract` changes
SuaYoo Nov 13, 2024
d033118
allow current-password autocomplete when updating password
emma-sg Nov 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 7 additions & 4 deletions frontend/src/features/accounts/sign-up-form.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { localized, msg, str } from "@lit/localize";
import type { SlInput } from "@shoelace-style/shoelace";
import type { ZxcvbnResult } from "@zxcvbn-ts/core";
import { customElement, property, state } from "lit/decorators.js";
import { customElement, property, query, state } from "lit/decorators.js";
import { when } from "lit/directives/when.js";
import debounce from "lodash/fp/debounce";

Expand Down Expand Up @@ -54,6 +54,9 @@ export class SignUpForm extends LiteElement {
@state()
private showLoginLink = false;

@query('sl-input[name="password"]')
private readonly password?: SlInput | null;

protected firstUpdated() {
void PasswordService.setOptions();
}
Expand Down Expand Up @@ -121,7 +124,7 @@ export class SignUpForm extends LiteElement {
passwordToggle
class="hide-required-content"
required
@input=${this.onPasswordInput as UnderlyingFunction<
@sl-input=${this.onPasswordInput as UnderlyingFunction<
typeof this.onPasswordInput
>}
>
Expand Down Expand Up @@ -174,8 +177,8 @@ export class SignUpForm extends LiteElement {
</div>
`;

private readonly onPasswordInput = debounce(150)(async (e: InputEvent) => {
const { value } = e.target as SlInput;
private readonly onPasswordInput = debounce(150)(async () => {
const value = this.password?.value;
if (!value || value.length < 4) {
this.pwStrengthResults = null;
return;
Expand Down
14 changes: 7 additions & 7 deletions frontend/src/pages/account-settings.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import type { SlInput, SlSelectEvent } from "@shoelace-style/shoelace";
import { serialize } from "@shoelace-style/shoelace/dist/utilities/form.js";
import type { ZxcvbnResult } from "@zxcvbn-ts/core";
import { nothing, type PropertyValues } from "lit";
import { customElement, property, queryAsync, state } from "lit/decorators.js";
import { customElement, property, query, state } from "lit/decorators.js";
import { choose } from "lit/directives/choose.js";
import { when } from "lit/directives/when.js";
import debounce from "lodash/fp/debounce";
Expand Down Expand Up @@ -112,8 +112,8 @@ export class AccountSettings extends LiteElement {
@state()
private pwStrengthResults: null | ZxcvbnResult = null;

@queryAsync('sl-input[name="password"]')
private readonly passwordInput?: Promise<SlInput | null>;
@query('sl-input[name="newPassword"]')
private readonly newPassword?: SlInput | null;

private get activeTab() {
return this.tab && Object.values(Tab).includes(this.tab as unknown as Tab)
Expand Down Expand Up @@ -257,7 +257,7 @@ export class AccountSettings extends LiteElement {
name="password"
label=${msg("Enter your current password")}
type="password"
autocomplete="off"
autocomplete="current-password"
password-toggle
required
></sl-input>
Expand All @@ -269,7 +269,7 @@ export class AccountSettings extends LiteElement {
password-toggle
minlength="8"
required
@input=${this.onPasswordInput as UnderlyingFunction<
@sl-input=${this.onPasswordInput as UnderlyingFunction<
typeof this.onPasswordInput
>}
></sl-input>
Expand Down Expand Up @@ -375,8 +375,8 @@ export class AccountSettings extends LiteElement {
</div>
`;

private readonly onPasswordInput = debounce(150)(async (e: InputEvent) => {
const { value } = e.target as SlInput;
private readonly onPasswordInput = debounce(150)(async () => {
const value = this.newPassword?.value;
if (!value || value.length < 4) {
this.pwStrengthResults = null;
return;
Expand Down
16 changes: 9 additions & 7 deletions frontend/src/pages/reset-password.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { localized, msg, str } from "@lit/localize";
import type { SlInput } from "@shoelace-style/shoelace";
import type { ZxcvbnResult } from "@zxcvbn-ts/core";
import { customElement, property, state } from "lit/decorators.js";
import { customElement, property, query, state } from "lit/decorators.js";
import { when } from "lit/directives/when.js";
import debounce from "lodash/fp/debounce";

Expand All @@ -28,6 +28,9 @@ export class ResetPassword extends LiteElement {
@state()
private isSubmitting = false;

@query('sl-input[name="newPassword"]')
private readonly newPassword?: SlInput | null;

protected firstUpdated() {
void PasswordService.setOptions();
}
Expand All @@ -52,16 +55,15 @@ export class ResetPassword extends LiteElement {
<div class="mb-5">
<sl-input
id="password"
name="password"
name="newPassword"
type="password"
label="${msg("Enter new password")}"
help-text=${msg("Must be between 8-64 characters")}
minlength="8"
autocomplete="new-password"
passwordToggle
class="hide-required-content"
required
@input=${this.onPasswordInput as UnderlyingFunction<
@sl-input=${this.onPasswordInput as UnderlyingFunction<
typeof this.onPasswordInput
>}
>
Expand Down Expand Up @@ -110,8 +112,8 @@ export class ResetPassword extends LiteElement {
</div>
`;

private readonly onPasswordInput = debounce(150)(async (e: InputEvent) => {
const { value } = e.target as SlInput;
private readonly onPasswordInput = debounce(150)(async () => {
const value = this.newPassword?.value;
if (!value || value.length < 4) {
this.pwStrengthResults = null;
return;
Expand All @@ -124,7 +126,7 @@ export class ResetPassword extends LiteElement {
this.isSubmitting = true;

const formData = new FormData(event.target as HTMLFormElement);
const password = formData.get("password") as string;
const password = formData.get("newPassword") as string;

const resp = await fetch("/api/auth/reset-password", {
method: "POST",
Expand Down
3 changes: 0 additions & 3 deletions frontend/xliff/es.xlf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3235,9 +3235,6 @@
<trans-unit id="sf151c44c3a52a448">
<source>Enter new password</source>
</trans-unit>
<trans-unit id="sf6c0a694575fb0a6">
<source>Must be between 8-64 characters</source>
</trans-unit>
<trans-unit id="s8daf047a917f4cc4">
<source>Choose a strong password between <x equiv-text="${PASSWORD_MINLENGTH}" id="0"/>-<x equiv-text="${PASSWORD_MAXLENGTH}" id="1"/> characters.</source>
</trans-unit>
Expand Down
Loading