2019-12-16 08:49:10 +00:00
|
|
|
import React, { useLayoutEffect } from "react";
|
2022-08-24 12:16:32 +00:00
|
|
|
import { AppState } from "@appsmith/reducers";
|
2022-11-30 05:10:53 +00:00
|
|
|
import { Link, withRouter, RouteComponentProps } from "react-router-dom";
|
2019-12-16 08:49:10 +00:00
|
|
|
import { connect } from "react-redux";
|
|
|
|
|
import { InjectedFormProps, reduxForm, Field } from "redux-form";
|
2022-09-02 17:15:08 +00:00
|
|
|
import { RESET_PASSWORD_FORM_NAME } from "@appsmith/constants/forms";
|
2022-04-12 10:50:01 +00:00
|
|
|
import { ReduxActionTypes } from "@appsmith/constants/ReduxActionConstants";
|
2019-12-16 08:49:10 +00:00
|
|
|
import { getIsTokenValid, getIsValidatingToken } from "selectors/authSelectors";
|
|
|
|
|
import { Icon } from "@blueprintjs/core";
|
2022-10-05 11:06:49 +00:00
|
|
|
import FormTextField from "components/utils/ReduxFormTextField";
|
2022-10-13 12:14:16 +00:00
|
|
|
import {
|
|
|
|
|
Button,
|
chore: import common variables from design system (#17600)
* Delete CommonComponentProps, Classes, import them from design-system
* Delete Icon.test.tsx
* Remove color utils, add import from design-system
* Remove Variant, add import from design-system
* Remove unused toast parameters from common
* use design-system version 28-alpha-7
* Move ThemeProp from ads/common to widgets/constants
* fix import
* Delete index.ts
* feat: migrated form group from ads folder to design system repository (#17400)
* feat: migrated form group from ads folder to design system repo
* fix: formGroup label color fix
* DS version updated
* Updated Label Config
* chore: Flapdoodle version upgrade to 3.5.0 (#17609)
* chore: code split tenant API CE (#17596)
## Description
We shouldn't expose tenant config on CE , so on CE, we should only return the necessary user permissions hard coded on the saga.
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manual
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* chore: BaseAppsmithRepo code split (#17614)
* chore: Updating the tenant API to return the complete object instead of just the configuration (#17615)
* Fix sandbox iframe default setting (#17618)
* feat: upgrade hooks | audit logs (#17525)
* feat: Text Widget Reskinning (#17298)
* feat: Use truncate button color from theme
* fix: Update Truncate Button Color validation regex
* feat: Maintain Focus and Context Phase 1 (#16317)
* fix: update regex and test case for organisation website (#17612)
* chore: Add properties to analytics event (#17621)
* feat: enabled setTimeout/clearTimeout APIs (#17445)
* Update top contributors
* fix: ms sql default port updated to 1433 (#17342)
* fix: removed global style from design system dropdown component (#17392)
* bug: removed global style from design system dropdown component
* changed design system package version
* fix: Dropdown background fix - design system
* design-system - dropdown background color fix
* DS version updated
* chore: Fixing broken client build (#17634)
## Description
EE client build is broken due to not following proper code splitting strategy; one file in particularly didn't get split earlier and changes to that file broke the client build on EE.
This PR fixes the issues.
* Fix/16994 refactor common datatype handling (#17429)
* fix:Add array datatype to execute request
* feat: Consume and store type of array elements in Param class (#16994)
* Append param instead of clientDataType in varargs (#16994)
* Refactor common data type handling w.r.t newer structure (#16994)
This commit takes care of the following items:
- It minimizes the number of usage to the older stringToKnownDataTypeConverter method
- Modifies the existing test cases to conform to the newer structure
- Marks stringToKnownDataTypeConverter method as deprecated to discourage further use
* Remove comma delimited numbers from valid test cases (#16994)
* Fix extracting clientDataType from varargs in MySQL (#16994)
* Pass param as a dedicated parameter in json smart replacement (#16994)
* Remove varargs from json smart replacement method (#16994)
* Move BsonType to mongoplugin module (#16994)
* Introduce NullArrayType and refactor BsonType test cases (#16994)
* Add new test cases on numeric string with leading zero (#16994)
* Refactor test case name (#16994)
* Add comment on the ordering of Json and Bson types (#16994)
* Add comment on the ordering of Json and Bson types (#16994)
* Add NullArrayType in Postgres and introduce postgres-specific types (#16994)
* Add data type test cases for Postgres and change as per review comments (#16994)
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
* feat: Update invite modal submit when we have tabs in modal (#17608)
## Description
> Update invite modal submit when we have tabs in modal.
Fixes [#16741](https://github.com/appsmithorg/appsmith/issues/16741)
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
> Tested it locally.
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] I have performed a self-review of my own code
- [x] I have commented my code, particularly in hard-to-understand areas
- [ ] I have made corresponding changes to the documentation
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* feat: AST based entity refactor (#17434)
* task: AST based entity refactor
* implemented refactor logic
* jest cases with string manipulation using AST logic
* comments and indentation
* added evalVersion to request
* chore: Added feature flag for datasource environments (#17657)
chore: Added Feature flag for datasource environments
* chore: Corrected analytics event for instance setting events (#17622)
* Update top contributors
* Fix typo in cloud-hosting check and NPE from Segment (#17692)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* fix: remove file references on click of cancel button (#17664)
* fix: table does not show data issue fixed (#17459)
* chore: Add recommended indexes (#17704)
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
* chore: Added workspace details to user invite analytic event (#17644)
## Description
This PR adds the workspace details to user invite analytics event
## Type of change
- New feature (non-breaking change which adds functionality)
## How Has This Been Tested?
- Manually on local
## Checklist:
- [x] My code follows the style guidelines of this project
- [x] 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
- [x] My changes generate no new warnings
- [ ] I have added tests that prove my fix is effective or that my feature works
- [x] New and existing unit tests pass locally with my changes
* chore: Correct the toast font on windows (#17671)
* fix: JS option missing for Label Font Style in Input widget (#17631)
* fix: replace time based action to event based (#17586)
* fix: replace time based action to event based
- The delete datasource button was getting reset to it's original state after a static time of 2200ms
- Replaced this to reset on completion of deletion instead
* fix: removed unused functions
* fix: updated the condition to show confirm delete icon
* Updated Label Config
* test: Add cypress tests for template phase 2 (#17036)
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
* Change Segment CDN to our proxy (#17714)
* chore: Fixing prettier formatting for AnalyticsUtil.tsx
* chore: Adding base repository function to add user permissions to generic domain object (#17733)
## Description
Adding base function to set the user permissions for a user in any domain object.
As part of this, we also add default permission group to the `SeedMongoData`. Without this fix, the JUnit tests go into an infinite loop. Also fixing the `ExampleWorkspaceClonerTest` file.
## Type of change
- Bug fix (non-breaking change which fixes an issue)
## How Has This Been Tested?
- JUnit
## Checklist:
- [ ] 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
* Update top contributors
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: Tanvi Bhakta <tanvibhakta@gmail.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
Signed-off-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: albinAppsmith <87797149+albinAppsmith@users.noreply.github.com>
Co-authored-by: Nikhil Nandagopal <nikhil.nandagopal@gmail.com>
Co-authored-by: Nidhi <nidhi@appsmith.com>
Co-authored-by: Sangeeth Sivan <74818788+berzerkeer@users.noreply.github.com>
Co-authored-by: Trisha Anand <trisha@appsmith.com>
Co-authored-by: Arpit Mohan <mohanarpit@users.noreply.github.com>
Co-authored-by: Shrikant Sharat Kandula <shrikant@appsmith.com>
Co-authored-by: f0c1s <anubhav@appsmith.com>
Co-authored-by: Dhruvik Neharia <dhruvik@appsmith.com>
Co-authored-by: Hetu Nandu <hetu@appsmith.com>
Co-authored-by: Nilesh Sarupriya <nilesh@appsmith.com>
Co-authored-by: Anagh Hegde <anagh@appsmith.com>
Co-authored-by: arunvjn <32433245+arunvjn@users.noreply.github.com>
Co-authored-by: Appsmith Bot <74705725+appsmith-bot@users.noreply.github.com>
Co-authored-by: Vaibhav Tanwar <40293928+vaibh1297@users.noreply.github.com>
Co-authored-by: subratadeypappu <subrata@appsmith.com>
Co-authored-by: ChandanBalajiBP <chandan@appsmith.com>
Co-authored-by: Ankita Kinger <ankita@appsmith.com>
Co-authored-by: ChandanBalajiBP <104058110+ChandanBalajiBP@users.noreply.github.com>
Co-authored-by: Vishnu Gp <vishnu@appsmith.com>
Co-authored-by: Keyur Paralkar <keyur@appsmith.com>
Co-authored-by: sneha122 <sneha@appsmith.com>
Co-authored-by: sanjus-robotic-studio <58104863+sanjus-robotic-studio@users.noreply.github.com>
Co-authored-by: Ayush Pahwa <ayush@appsmith.com>
Co-authored-by: Parthvi <80334441+Parthvi12@users.noreply.github.com>
Co-authored-by: Parthvi Goswami <parthvigoswami@Parthvis-MacBook-Pro.local>
Co-authored-by: Arpit Mohan <arpit@appsmith.com>
2022-10-31 01:24:47 +00:00
|
|
|
FormGroup,
|
2022-10-13 12:14:16 +00:00
|
|
|
FormMessage,
|
2021-01-27 06:12:32 +00:00
|
|
|
FormMessageProps,
|
2022-10-13 12:14:16 +00:00
|
|
|
MessageAction,
|
|
|
|
|
Size,
|
|
|
|
|
} from "design-system";
|
2019-12-16 08:49:10 +00:00
|
|
|
import Spinner from "components/editorComponents/Spinner";
|
2021-01-27 06:12:32 +00:00
|
|
|
|
2019-12-16 08:49:10 +00:00
|
|
|
import StyledForm from "components/editorComponents/Form";
|
|
|
|
|
import { isEmptyString, isStrongPassword } from "utils/formhelpers";
|
|
|
|
|
import { ResetPasswordFormValues, resetPasswordSubmitHandler } from "./helpers";
|
|
|
|
|
import {
|
|
|
|
|
AuthCardHeader,
|
2021-10-04 15:34:37 +00:00
|
|
|
BlackAuthCardNavLink,
|
2019-12-16 08:49:10 +00:00
|
|
|
FormActions,
|
|
|
|
|
} from "./StyledComponents";
|
|
|
|
|
import { AUTH_LOGIN_URL, FORGOT_PASSWORD_URL } from "constants/routes";
|
2021-01-27 06:12:32 +00:00
|
|
|
import { withTheme } from "styled-components";
|
|
|
|
|
import { Theme } from "constants/DefaultTheme";
|
2019-12-16 08:49:10 +00:00
|
|
|
|
|
|
|
|
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,
|
2021-03-13 14:24:45 +00:00
|
|
|
createMessage,
|
2022-02-11 18:08:46 +00:00
|
|
|
} from "@appsmith/constants/messages";
|
2019-12-16 08:49:10 +00:00
|
|
|
|
|
|
|
|
const validate = (values: ResetPasswordFormValues) => {
|
|
|
|
|
const errors: ResetPasswordFormValues = {};
|
|
|
|
|
if (!values.password || isEmptyString(values.password)) {
|
2021-03-13 14:24:45 +00:00
|
|
|
errors.password = createMessage(FORM_VALIDATION_EMPTY_PASSWORD);
|
2019-12-16 08:49:10 +00:00
|
|
|
} else if (!isStrongPassword(values.password)) {
|
2021-03-13 14:24:45 +00:00
|
|
|
errors.password = createMessage(FORM_VALIDATION_INVALID_PASSWORD);
|
2019-12-16 08:49:10 +00:00
|
|
|
}
|
|
|
|
|
return errors;
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
type ResetPasswordProps = InjectedFormProps<
|
|
|
|
|
ResetPasswordFormValues,
|
|
|
|
|
{
|
2021-08-17 12:35:00 +00:00
|
|
|
verifyToken: (token: string) => void;
|
2019-12-16 08:49:10 +00:00
|
|
|
isTokenValid: boolean;
|
|
|
|
|
validatingToken: boolean;
|
|
|
|
|
}
|
|
|
|
|
> & {
|
2021-08-17 12:35:00 +00:00
|
|
|
verifyToken: (token: string) => void;
|
2019-12-16 08:49:10 +00:00
|
|
|
isTokenValid: boolean;
|
|
|
|
|
validatingToken: boolean;
|
2021-01-27 06:12:32 +00:00
|
|
|
theme: Theme;
|
2019-12-16 08:49:10 +00:00
|
|
|
} & RouteComponentProps<{ email: string; token: string }>;
|
|
|
|
|
|
2021-04-28 10:28:39 +00:00
|
|
|
export function ResetPassword(props: ResetPasswordProps) {
|
2019-12-16 08:49:10 +00:00
|
|
|
const {
|
|
|
|
|
error,
|
|
|
|
|
handleSubmit,
|
|
|
|
|
initialValues,
|
|
|
|
|
isTokenValid,
|
2021-05-13 08:35:39 +00:00
|
|
|
pristine,
|
|
|
|
|
submitFailed,
|
|
|
|
|
submitSucceeded,
|
|
|
|
|
submitting,
|
2019-12-16 08:49:10 +00:00
|
|
|
validatingToken,
|
|
|
|
|
verifyToken,
|
|
|
|
|
} = props;
|
|
|
|
|
|
|
|
|
|
useLayoutEffect(() => {
|
2021-08-17 12:35:00 +00:00
|
|
|
if (initialValues.token) verifyToken(initialValues.token);
|
|
|
|
|
}, [initialValues.token, verifyToken]);
|
2019-12-16 08:49:10 +00:00
|
|
|
|
2021-08-17 12:35:00 +00:00
|
|
|
const showInvalidMessage = !initialValues.token;
|
2019-12-16 08:49:10 +00:00
|
|
|
const showExpiredMessage = !isTokenValid && !validatingToken;
|
|
|
|
|
const showSuccessMessage = submitSucceeded && !pristine;
|
|
|
|
|
const showFailureMessage = submitFailed && !!error;
|
|
|
|
|
|
|
|
|
|
let message = "";
|
|
|
|
|
let messageActions: MessageAction[] | undefined = undefined;
|
|
|
|
|
if (showExpiredMessage || showInvalidMessage) {
|
2022-11-30 05:10:53 +00:00
|
|
|
const messageActionText = createMessage(
|
|
|
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
|
|
|
);
|
2019-12-16 08:49:10 +00:00
|
|
|
messageActions = [
|
|
|
|
|
{
|
2022-11-30 05:10:53 +00:00
|
|
|
linkElement: <Link to={FORGOT_PASSWORD_URL}>{messageActionText}</Link>,
|
|
|
|
|
text: messageActionText,
|
2020-02-25 11:33:07 +00:00
|
|
|
intent: "primary",
|
2019-12-16 08:49:10 +00:00
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
if (showExpiredMessage) {
|
2021-03-13 14:24:45 +00:00
|
|
|
message = createMessage(RESET_PASSWORD_EXPIRED_TOKEN);
|
2019-12-16 08:49:10 +00:00
|
|
|
}
|
|
|
|
|
if (showInvalidMessage) {
|
2021-03-13 14:24:45 +00:00
|
|
|
message = createMessage(RESET_PASSWORD_INVALID_TOKEN);
|
2019-12-16 08:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (showSuccessMessage) {
|
2022-11-30 05:10:53 +00:00
|
|
|
const messageActionText = createMessage(
|
|
|
|
|
RESET_PASSWORD_RESET_SUCCESS_LOGIN_LINK,
|
|
|
|
|
);
|
2021-03-13 14:24:45 +00:00
|
|
|
message = createMessage(RESET_PASSWORD_RESET_SUCCESS);
|
2019-12-16 08:49:10 +00:00
|
|
|
messageActions = [
|
|
|
|
|
{
|
2022-11-30 05:10:53 +00:00
|
|
|
linkElement: <Link to={AUTH_LOGIN_URL}>{messageActionText}</Link>,
|
|
|
|
|
text: messageActionText,
|
2019-12-16 08:49:10 +00:00
|
|
|
intent: "success",
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
}
|
|
|
|
|
if (showFailureMessage) {
|
|
|
|
|
message = error;
|
2020-10-16 14:18:03 +00:00
|
|
|
if (
|
|
|
|
|
message
|
|
|
|
|
.toLowerCase()
|
2021-03-13 14:24:45 +00:00
|
|
|
.includes(
|
|
|
|
|
createMessage(RESET_PASSWORD_FORGOT_PASSWORD_LINK).toLowerCase(),
|
|
|
|
|
)
|
2020-10-16 14:18:03 +00:00
|
|
|
) {
|
2022-11-30 05:10:53 +00:00
|
|
|
const messageActionText = createMessage(
|
|
|
|
|
RESET_PASSWORD_FORGOT_PASSWORD_LINK,
|
|
|
|
|
);
|
2020-10-16 14:18:03 +00:00
|
|
|
messageActions = [
|
|
|
|
|
{
|
2022-11-30 05:10:53 +00:00
|
|
|
linkElement: (
|
|
|
|
|
<Link to={FORGOT_PASSWORD_URL}>{messageActionText}</Link>
|
|
|
|
|
),
|
|
|
|
|
text: messageActionText,
|
2020-10-16 14:18:03 +00:00
|
|
|
intent: "primary",
|
|
|
|
|
},
|
|
|
|
|
];
|
|
|
|
|
}
|
2019-12-16 08:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
2019-12-23 12:16:33 +00:00
|
|
|
const messageTagProps: FormMessageProps = {
|
2019-12-16 08:49:10 +00:00
|
|
|
intent:
|
|
|
|
|
showInvalidMessage || showExpiredMessage || showFailureMessage
|
|
|
|
|
? "danger"
|
2021-10-04 15:34:37 +00:00
|
|
|
: "lightSuccess",
|
2019-12-16 08:49:10 +00:00
|
|
|
message,
|
|
|
|
|
actions: messageActions,
|
|
|
|
|
};
|
|
|
|
|
|
|
|
|
|
if (showInvalidMessage || showExpiredMessage) {
|
2019-12-23 12:16:33 +00:00
|
|
|
return <FormMessage {...messageTagProps} />;
|
2019-12-16 08:49:10 +00:00
|
|
|
}
|
|
|
|
|
|
|
|
|
|
if (!isTokenValid && validatingToken) {
|
|
|
|
|
return <Spinner />;
|
|
|
|
|
}
|
|
|
|
|
return (
|
2021-01-27 06:12:32 +00:00
|
|
|
<>
|
2019-12-16 08:49:10 +00:00
|
|
|
<AuthCardHeader>
|
2021-03-13 14:24:45 +00:00
|
|
|
<h1>{createMessage(RESET_PASSWORD_PAGE_TITLE)}</h1>
|
2019-12-16 08:49:10 +00:00
|
|
|
</AuthCardHeader>
|
2021-01-27 06:12:32 +00:00
|
|
|
<div style={{ display: "flex", justifyContent: "center" }}>
|
2021-10-04 15:34:37 +00:00
|
|
|
<BlackAuthCardNavLink to={AUTH_LOGIN_URL}>
|
2021-01-27 06:12:32 +00:00
|
|
|
<Icon
|
|
|
|
|
icon="arrow-left"
|
|
|
|
|
style={{ marginRight: props.theme.spaces[3] }}
|
|
|
|
|
/>
|
2021-03-13 14:24:45 +00:00
|
|
|
{createMessage(RESET_PASSWORD_LOGIN_LINK_TEXT)}
|
2021-10-04 15:34:37 +00:00
|
|
|
</BlackAuthCardNavLink>
|
2021-01-27 06:12:32 +00:00
|
|
|
</div>
|
|
|
|
|
{(showSuccessMessage || showFailureMessage) && (
|
|
|
|
|
<FormMessage {...messageTagProps} />
|
|
|
|
|
)}
|
|
|
|
|
<StyledForm onSubmit={handleSubmit(resetPasswordSubmitHandler)}>
|
|
|
|
|
<FormGroup
|
|
|
|
|
intent={error ? "danger" : "none"}
|
2021-03-13 14:24:45 +00:00
|
|
|
label={createMessage(RESET_PASSWORD_PAGE_PASSWORD_INPUT_LABEL)}
|
2021-01-27 06:12:32 +00:00
|
|
|
>
|
|
|
|
|
<FormTextField
|
2021-04-28 10:28:39 +00:00
|
|
|
disabled={submitSucceeded}
|
2021-01-27 06:12:32 +00:00
|
|
|
name="password"
|
2021-03-13 14:24:45 +00:00
|
|
|
placeholder={createMessage(
|
|
|
|
|
RESET_PASSWORD_PAGE_PASSWORD_INPUT_PLACEHOLDER,
|
|
|
|
|
)}
|
2021-04-28 10:28:39 +00:00
|
|
|
type="password"
|
2021-01-27 06:12:32 +00:00
|
|
|
/>
|
|
|
|
|
</FormGroup>
|
2021-04-28 10:28:39 +00:00
|
|
|
<Field component="input" name="email" type="hidden" />
|
|
|
|
|
<Field component="input" name="token" type="hidden" />
|
2021-01-27 06:12:32 +00:00
|
|
|
<FormActions>
|
|
|
|
|
<Button
|
2021-04-28 10:28:39 +00:00
|
|
|
disabled={pristine || submitSucceeded}
|
2021-01-27 06:12:32 +00:00
|
|
|
fill
|
2021-04-28 10:28:39 +00:00
|
|
|
isLoading={submitting}
|
2021-01-27 06:12:32 +00:00
|
|
|
size={Size.large}
|
2021-04-28 10:28:39 +00:00
|
|
|
tag="button"
|
2021-03-13 14:24:45 +00:00
|
|
|
text={createMessage(RESET_PASSWORD_SUBMIT_BUTTON_TEXT)}
|
2021-04-28 10:28:39 +00:00
|
|
|
type="submit"
|
2021-01-27 06:12:32 +00:00
|
|
|
/>
|
|
|
|
|
</FormActions>
|
|
|
|
|
</StyledForm>
|
|
|
|
|
</>
|
2019-12-16 08:49:10 +00:00
|
|
|
);
|
2021-04-28 10:28:39 +00:00
|
|
|
}
|
2019-12-16 08:49:10 +00:00
|
|
|
|
|
|
|
|
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) => ({
|
2021-08-17 12:35:00 +00:00
|
|
|
verifyToken: (token: string) =>
|
2019-12-16 08:49:10 +00:00
|
|
|
dispatch({
|
|
|
|
|
type: ReduxActionTypes.RESET_PASSWORD_VERIFY_TOKEN_INIT,
|
2021-08-17 12:35:00 +00:00
|
|
|
payload: { token },
|
2019-12-16 08:49:10 +00:00
|
|
|
}),
|
|
|
|
|
}),
|
|
|
|
|
)(
|
|
|
|
|
reduxForm<
|
|
|
|
|
ResetPasswordFormValues,
|
|
|
|
|
{
|
2021-08-17 12:35:00 +00:00
|
|
|
verifyToken: (token: string) => void;
|
2019-12-16 08:49:10 +00:00
|
|
|
validatingToken: boolean;
|
|
|
|
|
isTokenValid: boolean;
|
|
|
|
|
}
|
|
|
|
|
>({
|
|
|
|
|
validate,
|
|
|
|
|
form: RESET_PASSWORD_FORM_NAME,
|
|
|
|
|
touchOnBlur: true,
|
2021-01-27 06:12:32 +00:00
|
|
|
})(withRouter(withTheme(ResetPassword))),
|
2019-12-16 08:49:10 +00:00
|
|
|
);
|