Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 2 additions & 2 deletions apps/api/plane/authentication/adapter/base.py
Original file line number Diff line number Diff line change
Expand Up @@ -85,8 +85,8 @@ def validate_password(self, email):
results = zxcvbn(self.code)
if results["score"] < 3:
raise AuthenticationException(
error_code=AUTHENTICATION_ERROR_CODES["INVALID_PASSWORD"],
error_message="INVALID_PASSWORD",
error_code=AUTHENTICATION_ERROR_CODES["PASSWORD_TOO_WEAK"],
error_message="PASSWORD_TOO_WEAK",
payload={"email": email},
)
return
Expand Down
1 change: 1 addition & 0 deletions apps/api/plane/authentication/adapter/error.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@
"USER_ACCOUNT_DEACTIVATED": 5019,
# Password strength
"INVALID_PASSWORD": 5020,
"PASSWORD_TOO_WEAK": 5021,
"SMTP_NOT_CONFIGURED": 5025,
# Sign Up
"USER_ALREADY_EXIST": 5030,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -145,8 +145,8 @@ def post(self, request, uidb64, token):
results = zxcvbn(password)
if results["score"] < 3:
exc = AuthenticationException(
error_code=AUTHENTICATION_ERROR_CODES["INVALID_PASSWORD"],
error_message="INVALID_PASSWORD",
error_code=AUTHENTICATION_ERROR_CODES["PASSWORD_TOO_WEAK"],
error_message="PASSWORD_TOO_WEAK",
)
url = urljoin(
base_host(request=request, is_app=True),
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/authentication/views/common.py
Original file line number Diff line number Diff line change
Expand Up @@ -83,8 +83,8 @@ def post(self, request):
results = zxcvbn(new_password)
if results["score"] < 3:
exc = AuthenticationException(
error_code=AUTHENTICATION_ERROR_CODES["INVALID_NEW_PASSWORD"],
error_message="INVALID_NEW_PASSWORD",
error_code=AUTHENTICATION_ERROR_CODES["PASSWORD_TOO_WEAK"],
error_message="PASSWORD_TOO_WEAK",
)
return Response(exc.get_error_dict(), status=status.HTTP_400_BAD_REQUEST)

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,8 @@ def post(self, request, uidb64, token):
results = zxcvbn(password)
if results["score"] < 3:
exc = AuthenticationException(
error_code=AUTHENTICATION_ERROR_CODES["INVALID_PASSWORD"],
error_message="INVALID_PASSWORD",
error_code=AUTHENTICATION_ERROR_CODES["PASSWORD_TOO_WEAK"],
error_message="PASSWORD_TOO_WEAK",
)
url = f"{base_host(request=request, is_space=True)}/accounts/reset-password/?{urlencode(exc.get_error_dict())}" # noqa: E501
return HttpResponseRedirect(url)
Expand Down
4 changes: 2 additions & 2 deletions apps/api/plane/license/api/views/admin.py
Original file line number Diff line number Diff line change
Expand Up @@ -191,8 +191,8 @@ def post(self, request):
results = zxcvbn(password)
if results["score"] < 3:
exc = AuthenticationException(
error_code=AUTHENTICATION_ERROR_CODES["INVALID_ADMIN_PASSWORD"],
error_message="INVALID_ADMIN_PASSWORD",
error_code=AUTHENTICATION_ERROR_CODES["PASSWORD_TOO_WEAK"],
error_message="PASSWORD_TOO_WEAK",
payload={
"email": email,
"first_name": first_name,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,7 @@ import { getPasswordStrength } from "@plane/utils";
// components
import { ProfileSettingsHeading } from "@/components/settings/profile/heading";
// helpers
import { authErrorHandler } from "@/helpers/authentication.helper";
import type { EAuthenticationErrorCodes } from "@/helpers/authentication.helper";
import { authErrorHandler, EAuthenticationErrorCodes, passwordErrors } from "@/helpers/authentication.helper";
// hooks
import { useUser } from "@/hooks/store/user";
// services
Expand Down Expand Up @@ -58,6 +57,7 @@ export const SecurityProfileSettings = observer(function SecurityProfileSettings
control,
handleSubmit,
watch,
setError,
formState: { errors, isSubmitting },
reset,
} = useForm<FormValues>({ defaultValues });
Expand Down Expand Up @@ -93,18 +93,23 @@ export const SecurityProfileSettings = observer(function SecurityProfileSettings
message: t("auth.common.password.toast.change_password.success.message"),
});
} catch (error: unknown) {
let errorInfo = undefined;
if (error instanceof Error) {
const code = "error_code" in error ? error.error_code?.toString() : undefined;
errorInfo = code ? authErrorHandler(code as EAuthenticationErrorCodes) : undefined;
}
const err = error as Error & { error_code?: string };
const code = err.error_code?.toString();
const errorInfo = code ? authErrorHandler(code as EAuthenticationErrorCodes) : undefined;

setToast({
type: TOAST_TYPE.ERROR,
title: errorInfo?.title ?? t("auth.common.password.toast.error.title"),
message:
typeof errorInfo?.message === "string" ? errorInfo.message : t("auth.common.password.toast.error.message"),
});

if (code && passwordErrors.includes(code as EAuthenticationErrorCodes)) {
setError("new_password", {
type: "manual",
message: errorInfo?.message?.toString() || t("auth.common.password.toast.error.message"),
});
}
}
};

Expand Down Expand Up @@ -204,6 +209,9 @@ export const SecurityProfileSettings = observer(function SecurityProfileSettings
)}
</div>
{passwordSupport}
{errors.new_password && (
<span className="text-11 text-danger-primary">{errors.new_password.message}</span>
)}
{isNewPasswordSameAsOldPassword && !isPasswordInputFocused && (
<span className="text-11 text-danger-primary">
{t("new_password_must_be_different_from_old_password")}
Expand Down
12 changes: 12 additions & 0 deletions apps/web/helpers/authentication.helper.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@ export enum EAuthenticationErrorCodes {
USER_ACCOUNT_DEACTIVATED = "5019",
// Password strength
INVALID_PASSWORD = "5020",
PASSWORD_TOO_WEAK = "5021",
SMTP_NOT_CONFIGURED = "5025",
// Sign Up
USER_ALREADY_EXIST = "5030",
Expand Down Expand Up @@ -107,6 +108,7 @@ export type TAuthErrorInfo = {
message: ReactNode;
};

// TODO: move all error messages to translation files
const errorCodeMessages: {
[key in EAuthenticationErrorCodes]: { title: string; message: (email?: string) => ReactNode };
} = {
Expand Down Expand Up @@ -143,6 +145,10 @@ const errorCodeMessages: {
title: `Invalid password`,
message: () => `Invalid password. Please try again.`,
},
[EAuthenticationErrorCodes.PASSWORD_TOO_WEAK]: {
title: `Password too weak`,
message: () => `Please use a stronger password.`,
},
[EAuthenticationErrorCodes.SMTP_NOT_CONFIGURED]: {
title: `SMTP not configured`,
message: () => `SMTP not configured. Please contact your administrator.`,
Expand Down Expand Up @@ -418,6 +424,7 @@ export const authErrorHandler = (errorCode: EAuthenticationErrorCodes, email?: s
EAuthenticationErrorCodes.ADMIN_USER_DOES_NOT_EXIST,
EAuthenticationErrorCodes.ADMIN_USER_DEACTIVATED,
EAuthenticationErrorCodes.RATE_LIMIT_EXCEEDED,
EAuthenticationErrorCodes.PASSWORD_TOO_WEAK,
];

if (bannerAlertErrorCodes.includes(errorCode))
Expand All @@ -430,3 +437,8 @@ export const authErrorHandler = (errorCode: EAuthenticationErrorCodes, email?: s

return undefined;
};

export const passwordErrors = [
EAuthenticationErrorCodes.PASSWORD_TOO_WEAK,
EAuthenticationErrorCodes.INVALID_NEW_PASSWORD,
];
1 change: 1 addition & 0 deletions packages/constants/src/auth/index.ts
Original file line number Diff line number Diff line change
Expand Up @@ -114,6 +114,7 @@ export enum EAuthErrorCodes {
USER_ACCOUNT_DEACTIVATED = "5019",
// Password strength
INVALID_PASSWORD = "5020",
PASSWORD_TOO_WEAK = "5021",
SMTP_NOT_CONFIGURED = "5025",
// Sign Up
USER_ALREADY_EXIST = "5030",
Expand Down
8 changes: 2 additions & 6 deletions packages/i18n/src/locales/ru/translations.ts
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ export default {
favorites: "Избранное",
pro: "Pro",
upgrade: "Обновить",
stickies: "Стикеры",
},
auth: {
common: {
Expand Down Expand Up @@ -2002,8 +2003,7 @@ export default {
automations: {
label: "Автоматизация",
heading: "Автоматизация",
description:
"Настройте автоматические действия для оптимизации рабочего процесса и сокращения ручных задач.",
description: "Настройте автоматические действия для оптимизации рабочего процесса и сокращения ручных задач.",
"auto-archive": {
title: "Автоархивация закрытых рабочих элементов",
description: "Plane будет автоматически архивировать рабочие элементы, которые были завершены или отменены.",
Expand Down Expand Up @@ -2921,8 +2921,4 @@ export default {
enter_number_of_projects: "Введите количество проектов",
pin: "Закрепить",
unpin: "Открепить",
sidebar: {
stickies: "Стикеры",
your_work: "Ваша работа",
},
} as const;
4 changes: 4 additions & 0 deletions packages/utils/src/auth.ts
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ const errorCodeMessages: {
title: `Invalid password`,
message: () => `Invalid password. Please try again.`,
},
[EAuthErrorCodes.PASSWORD_TOO_WEAK]: {
title: `Password too weak`,
message: () => `Please use a stronger password.`,
},
[EAuthErrorCodes.SMTP_NOT_CONFIGURED]: {
title: `SMTP not configured`,
message: () => `SMTP not configured. Please contact your administrator.`,
Expand Down
Loading