## Description ### Fixes - [x] https://github.com/appsmithorg/appsmith/issues/19383 - [x] https://github.com/appsmithorg/appsmith/issues/19384 - [x] https://github.com/appsmithorg/appsmith/issues/19385 - [x] https://github.com/appsmithorg/appsmith/issues/19386 - [x] https://github.com/appsmithorg/appsmith/issues/19387 - [x] https://github.com/appsmithorg/appsmith/issues/19388 - [x] https://github.com/appsmithorg/appsmith/issues/19389 - [x] https://github.com/appsmithorg/appsmith/issues/19390 - [x] https://github.com/appsmithorg/appsmith/issues/19391 - [x] https://github.com/appsmithorg/appsmith/issues/19392 - [x] https://github.com/appsmithorg/appsmith/issues/19393 - [x] https://github.com/appsmithorg/appsmith/issues/19394 - [x] https://github.com/appsmithorg/appsmith/issues/19395 - [x] https://github.com/appsmithorg/appsmith/issues/19396 - [x] https://github.com/appsmithorg/appsmith/issues/19397 - [x] https://github.com/appsmithorg/appsmith/issues/19398 - [x] https://github.com/appsmithorg/appsmith/issues/19399 - [x] https://github.com/appsmithorg/appsmith/issues/19400 - [x] https://github.com/appsmithorg/appsmith/issues/19401 - [x] https://github.com/appsmithorg/appsmith/issues/19402 - [x] https://github.com/appsmithorg/appsmith/issues/19403 - [x] https://github.com/appsmithorg/appsmith/issues/19404 - [x] https://github.com/appsmithorg/appsmith/issues/19405 - [x] https://github.com/appsmithorg/appsmith/issues/19406 - [x] https://github.com/appsmithorg/appsmith/issues/19407 - [x] https://github.com/appsmithorg/appsmith/issues/19408 - [x] https://github.com/appsmithorg/appsmith/issues/19409 Fixes # (issue) > if no issue exists, please create an issue and ask the maintainers about this first Media > A video or a GIF is preferred. when using Loom, don’t embed because it looks like it’s a GIF. instead, just link to the video ## Type of change > Please delete options that are not relevant. - Bug fix (non-breaking change which fixes an issue) - New feature (non-breaking change which adds functionality) - Breaking change (fix or feature that would cause existing functionality to not work as expected) - Chore (housekeeping or task changes that don't impact user perception) - This change requires a documentation update ## How Has This Been Tested? > Please describe the tests that you ran to verify your changes. Provide instructions, so we can reproduce. > Please also list any relevant details for your test configuration. > Delete anything that is not important - Manual - Jest - Cypress ### Test Plan > Add Testsmith test cases links that relate to this PR ### Issues raised during DP testing > Link issues raised during DP testing for better visiblity and tracking (copy link from comments dropped on this PR) ## Checklist: ### Dev activity - [ ] My code follows the style guidelines of this project - [ ] I have performed a self-review of my own code - [ ] I have commented my code, particularly in hard-to-understand areas - [ ] I have made corresponding changes to the documentation - [ ] My changes generate no new warnings - [ ] I have added tests that prove my fix is effective or that my feature works - [ ] New and existing unit tests pass locally with my changes - [ ] PR is being merged under a feature flag ### QA activity: - [ ] Test plan has been approved by relevant developers - [ ] Test plan has been peer reviewed by QA - [ ] Cypress test cases have been added and approved by either SDET or manual QA - [ ] Organized project review call with relevant stakeholders after Round 1/2 of QA - [ ] Added Test Plan Approved label after reveiwing all Cypress test --------- Co-authored-by: Ankita Kinger <ankita@appsmith.com> Co-authored-by: akash-codemonk <67054171+akash-codemonk@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvi@appsmith.com> Co-authored-by: Arsalan <arsalanyaldram0211@outlook.com> Co-authored-by: Aman Agarwal <aman@appsmith.com> Co-authored-by: Rohit Agarwal <rohit_agarwal@live.in> Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com> Co-authored-by: Nilesh Sarupriya <20905988+nsarupr@users.noreply.github.com> Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com> Co-authored-by: Aishwarya UR <aishwarya@appsmith.com> Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local> Co-authored-by: Vijetha-Kaja <vijetha@appsmith.com> Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com> Co-authored-by: Apple <nandan@thinkify.io> Co-authored-by: Saroj <43822041+sarojsarab@users.noreply.github.com> Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com> Co-authored-by: Ashok Kumar M <35134347+marks0351@users.noreply.github.com> Co-authored-by: Aishwarya-U-R <91450662+Aishwarya-U-R@users.noreply.github.com> Co-authored-by: rahulramesha <rahul@appsmith.com> Co-authored-by: Aswath K <aswath.sana@gmail.com> Co-authored-by: Preet Sidhu <preetsidhu.bits@gmail.com> Co-authored-by: Vijetha-Kaja <119562824+Vijetha-Kaja@users.noreply.github.com> Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
237 lines
6.9 KiB
TypeScript
237 lines
6.9 KiB
TypeScript
import React, { useLayoutEffect } from "react";
|
|
import type { AppState } from "@appsmith/reducers";
|
|
import type { RouteComponentProps } from "react-router-dom";
|
|
import { withRouter } from "react-router-dom";
|
|
import { connect } from "react-redux";
|
|
import type { InjectedFormProps } from "redux-form";
|
|
import { reduxForm, Field } from "redux-form";
|
|
import { RESET_PASSWORD_FORM_NAME } from "@appsmith/constants/forms";
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
|
import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
|
|
import FormTextField from "components/utils/ReduxFormTextField";
|
|
import { Button, Callout, Link } from "design-system";
|
|
import Spinner from "components/editorComponents/Spinner";
|
|
import StyledForm from "components/editorComponents/Form";
|
|
import { isEmptyString, isStrongPassword } from "utils/formhelpers";
|
|
import type { ResetPasswordFormValues } from "./helpers";
|
|
import { resetPasswordSubmitHandler } from "./helpers";
|
|
import { FormActions, StyledFormGroup } from "./StyledComponents";
|
|
import { AUTH_LOGIN_URL, FORGOT_PASSWORD_URL } from "constants/routes";
|
|
import {
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL,
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
|
|
RESET_PASSWORD_LOGIN_LINK_TEXT,
|
|
RESET_PASSWORD_SUBMIT_BUTTON_TEXT,
|
|
RESET_PASSWORD_PAGE_TITLE,
|
|
FORM_VALIDATION_INVALID_PASSWORD,
|
|
FORM_VALIDATION_EMPTY_PASSWORD,
|
|
RESET_PASSWORD_EXPIRED_TOKEN,
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
RESET_PASSWORD_INVALID_TOKEN,
|
|
RESET_PASSWORD_RESET_SUCCESS,
|
|
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
|
|
createMessage,
|
|
} from "@appsmith/constants/messages";
|
|
import Container from "./Container";
|
|
import type { CalloutProps } from "design-system/build/Callout/Callout.types";
|
|
|
|
const validate = (values: ResetPasswordFormValues) => {
|
|
const errors: ResetPasswordFormValues = {};
|
|
if (!values.password || isEmptyString(values.password)) {
|
|
errors.password = createMessage(FORM_VALIDATION_EMPTY_PASSWORD);
|
|
} else if (!isStrongPassword(values.password)) {
|
|
errors.password = createMessage(FORM_VALIDATION_INVALID_PASSWORD);
|
|
}
|
|
return errors;
|
|
};
|
|
|
|
type ResetPasswordProps = InjectedFormProps<
|
|
ResetPasswordFormValues,
|
|
{
|
|
verifyToken: (token: string) => void;
|
|
isTokenValid: boolean;
|
|
validatingToken: boolean;
|
|
}
|
|
> & {
|
|
verifyToken: (token: string) => void;
|
|
isTokenValid: boolean;
|
|
validatingToken: boolean;
|
|
} & RouteComponentProps<{ email: string; token: string }>;
|
|
|
|
export function ResetPassword(props: ResetPasswordProps) {
|
|
const {
|
|
error,
|
|
handleSubmit,
|
|
initialValues,
|
|
isTokenValid,
|
|
pristine,
|
|
submitFailed,
|
|
submitSucceeded,
|
|
submitting,
|
|
validatingToken,
|
|
verifyToken,
|
|
} = props;
|
|
|
|
useLayoutEffect(() => {
|
|
if (initialValues.token) verifyToken(initialValues.token);
|
|
}, [initialValues.token, verifyToken]);
|
|
|
|
const showInvalidMessage = !initialValues.token;
|
|
const showExpiredMessage = !isTokenValid && !validatingToken;
|
|
const showSuccessMessage = submitSucceeded && !pristine;
|
|
const showFailureMessage = submitFailed && !!error;
|
|
|
|
let message = "";
|
|
let messageActions = undefined;
|
|
if (showExpiredMessage || showInvalidMessage) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
);
|
|
messageActions = [
|
|
{
|
|
to: FORGOT_PASSWORD_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
if (showExpiredMessage) {
|
|
message = createMessage(RESET_PASSWORD_EXPIRED_TOKEN);
|
|
}
|
|
if (showInvalidMessage) {
|
|
message = createMessage(RESET_PASSWORD_INVALID_TOKEN);
|
|
}
|
|
|
|
if (showSuccessMessage) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
|
|
);
|
|
message = createMessage(RESET_PASSWORD_RESET_SUCCESS);
|
|
messageActions = [
|
|
{
|
|
to: AUTH_LOGIN_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
if (showFailureMessage) {
|
|
message = error;
|
|
if (
|
|
message
|
|
.toLowerCase()
|
|
.includes(
|
|
createMessage(RESET_PASSWORD_FORGOT_PASSWORD_LINK).toLowerCase(),
|
|
)
|
|
) {
|
|
const messageActionText = createMessage(
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
);
|
|
messageActions = [
|
|
{
|
|
to: FORGOT_PASSWORD_URL,
|
|
children: messageActionText,
|
|
target: "_self",
|
|
},
|
|
];
|
|
}
|
|
}
|
|
|
|
const messageTagProps: CalloutProps = {
|
|
kind:
|
|
showInvalidMessage || showExpiredMessage || showFailureMessage
|
|
? "error"
|
|
: "success",
|
|
links: messageActions,
|
|
children: message,
|
|
};
|
|
|
|
if (showInvalidMessage || showExpiredMessage) {
|
|
return <Callout {...messageTagProps} />;
|
|
}
|
|
|
|
if (!isTokenValid && validatingToken) {
|
|
return <Spinner />;
|
|
}
|
|
return (
|
|
<Container
|
|
subtitle={
|
|
<Link
|
|
className="text-sm justify-center"
|
|
startIcon="arrow-left-line"
|
|
target="_self"
|
|
to={AUTH_LOGIN_URL}
|
|
>
|
|
{createMessage(RESET_PASSWORD_LOGIN_LINK_TEXT)}
|
|
</Link>
|
|
}
|
|
title={createMessage(RESET_PASSWORD_PAGE_TITLE)}
|
|
>
|
|
{(showSuccessMessage || showFailureMessage) && (
|
|
<Callout {...messageTagProps} />
|
|
)}
|
|
<StyledForm onSubmit={handleSubmit(resetPasswordSubmitHandler)}>
|
|
<StyledFormGroup
|
|
className="text-[color:var(--ads-v2\-color-fg)]"
|
|
intent={error ? "danger" : "none"}
|
|
label={createMessage(RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL)}
|
|
>
|
|
<FormTextField
|
|
disabled={submitSucceeded}
|
|
name="password"
|
|
placeholder={createMessage(
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
|
|
)}
|
|
type="password"
|
|
/>
|
|
</StyledFormGroup>
|
|
<Field component="input" name="email" type="hidden" />
|
|
<Field component="input" name="token" type="hidden" />
|
|
<FormActions>
|
|
<Button
|
|
isDisabled={pristine || submitSucceeded}
|
|
isLoading={submitting}
|
|
size="md"
|
|
type="submit"
|
|
>
|
|
{createMessage(RESET_PASSWORD_SUBMIT_BUTTON_TEXT)}
|
|
</Button>
|
|
</FormActions>
|
|
</StyledForm>
|
|
</Container>
|
|
);
|
|
}
|
|
|
|
export default connect(
|
|
(state: AppState, props: ResetPasswordProps) => {
|
|
const queryParams = new URLSearchParams(props.location.search);
|
|
return {
|
|
initialValues: {
|
|
token: queryParams.get("token") || undefined,
|
|
},
|
|
isTokenValid: getIsTokenValid(state),
|
|
validatingToken: getIsValidatingToken(state),
|
|
};
|
|
},
|
|
(dispatch: any) => ({
|
|
verifyToken: (token: string) =>
|
|
dispatch({
|
|
type: ReduxActionTypes.RESET_PASSWORD_VERIFY_TOKEN_INIT,
|
|
payload: { token },
|
|
}),
|
|
}),
|
|
)(
|
|
reduxForm<
|
|
ResetPasswordFormValues,
|
|
{
|
|
verifyToken: (token: string) => void;
|
|
validatingToken: boolean;
|
|
isTokenValid: boolean;
|
|
}
|
|
>({
|
|
validate,
|
|
form: RESET_PASSWORD_FORM_NAME,
|
|
touchOnBlur: true,
|
|
})(withRouter(ResetPassword)),
|
|
);
|