fix: rename ResetPassword to ForgotPassword (#4730)

* fix: rename ResetPassword to ForgotPassword * Create fuzzy-cars-beg.md * fix a couple more namespaces
aws-amplify · Nov 15, 2023 · 2ab62de · 2ab62de
1 parent b39d956
commit 2ab62de
Show file tree

Hide file tree

Showing 10 changed files with 34 additions and 28 deletions.
diff --git a/.changeset/fuzzy-cars-beg.md b/.changeset/fuzzy-cars-beg.md
@@ -0,0 +1,6 @@
+---
+"@aws-amplify/ui-react-native": patch
+"@aws-amplify/ui-react": patch
+---
+
+fix: rename ResetPassword to ForgotPassword
diff --git a/examples/next/pages/ui/components/authenticator/custom-slots/index.page.tsx b/examples/next/pages/ui/components/authenticator/custom-slots/index.page.tsx
@@ -152,7 +152,7 @@ const components = {
       return <Text>Footer Information</Text>;
     },
   },
-  ResetPassword: {
+  ForgotPassword: {
     Header() {
       const { tokens } = useTheme();
       return (

diff --git a/packages/react-native/src/Authenticator/Defaults/ForgotPassword/ForgotPassword.tsx b/packages/react-native/src/Authenticator/Defaults/ForgotPassword/ForgotPassword.tsx
@@ -19,7 +19,7 @@ const {
   getBackToSignInText,
 } = authenticatorTextUtil;
 
-const ResetPassword = ({
+const ForgotPassword = ({
   fields,
   handleBlur,
   handleChange,
@@ -77,9 +77,9 @@ const ResetPassword = ({
   );
 };
 
-ResetPassword.Footer = DefaultFooter;
-ResetPassword.FormFields = DefaultTextFormFields;
-ResetPassword.Header = DefaultHeader;
+ForgotPassword.Footer = DefaultFooter;
+ForgotPassword.FormFields = DefaultTextFormFields;
+ForgotPassword.Header = DefaultHeader;
 
-ResetPassword.displayName = COMPONENT_NAME;
-export default ResetPassword;
+ForgotPassword.displayName = COMPONENT_NAME;
+export default ForgotPassword;
diff --git a/.../react-native/src/Authenticator/Defaults/ForgotPassword/__tests__/ForgotPassword.spec.tsx b/.../react-native/src/Authenticator/Defaults/ForgotPassword/__tests__/ForgotPassword.spec.tsx
@@ -34,7 +34,7 @@ const {
   getBackToSignInText,
 } = authenticatorTextUtil;
 
-describe('ResetPassword', () => {
+describe('ForgotPassword', () => {
   it('renders as expected', () => {
     const { toJSON, getAllByRole, getByText } = render(
       <ForgotPassword {...props} />

diff --git a/...uthenticator/Defaults/ForgotPassword/__tests__/__snapshots__/ForgotPassword.spec.tsx.snap b/...uthenticator/Defaults/ForgotPassword/__tests__/__snapshots__/ForgotPassword.spec.tsx.snap
@@ -1,6 +1,6 @@
 // Jest Snapshot v1, https://goo.gl/fbAQLP
 
-exports[`ResetPassword renders an error message 1`] = `
+exports[`ForgotPassword renders an error message 1`] = `
 [
   <Text
     accessibilityRole="header"
@@ -320,7 +320,7 @@ exports[`ResetPassword renders an error message 1`] = `
 ]
 `;
 
-exports[`ResetPassword renders as expected 1`] = `
+exports[`ForgotPassword renders as expected 1`] = `
 [
   <Text
     accessibilityRole="header"

diff --git a/packages/react-native/src/Authenticator/Defaults/types.ts b/packages/react-native/src/Authenticator/Defaults/types.ts
@@ -118,7 +118,7 @@ type ForceNewPasswordComponent<P = {}> = OverrideComponents<
   { style?: ForceNewPasswordStyle } & P
 >['ForceNewPassword'];
 
-type ResetPasswordComponent<P = {}> = OverrideComponents<
+type ForgotPasswordComponent<P = {}> = OverrideComponents<
   TextFieldOptionsType,
   { style?: ResetPasswordStyle } & P
 >['ForgotPassword'];
@@ -152,7 +152,7 @@ export interface Components {
   ConfirmResetPassword?: ConfirmResetPasswordComponent;
   ConfirmVerifyUser?: ConfirmVerifyUserComponent;
   ForceNewPassword?: ForceNewPasswordComponent;
-  ResetPassword?: ResetPasswordComponent;
+  ForgotPassword?: ForgotPasswordComponent;
   SetupTotp?: SetupTotpComponent;
   SignIn?: SignInComponent;
   SignUp?: SignUpComponent;

diff --git a/packages/react/src/components/Authenticator/Authenticator.tsx b/packages/react/src/components/Authenticator/Authenticator.tsx
@@ -27,7 +27,7 @@ import { SetupTotp } from './SetupTotp';
 import { SignIn } from './SignIn';
 import { SignUp } from './SignUp';
 import { ForceNewPassword } from './ForceNewPassword';
-import { ResetPassword } from './ForgotPassword';
+import { ForgotPassword } from './ForgotPassword';
 import { defaultComponents } from './hooks/useCustomComponents/defaultComponents';
 
 export type SignOut = UseAuthenticator['signOut'];
@@ -152,7 +152,7 @@ export function Authenticator(props: AuthenticatorProps): JSX.Element {
 }
 
 Authenticator.Provider = Provider;
-Authenticator.ResetPassword = ResetPassword;
+Authenticator.ForgotPassword = ForgotPassword;
 Authenticator.SetupTotp = SetupTotp;
 Authenticator.SignIn = SignIn;
 Authenticator.SignUp = SignUp;

diff --git a/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx b/packages/react/src/components/Authenticator/ForgotPassword/ForgotPassword.tsx
@@ -18,7 +18,7 @@ const {
   getResetYourPasswordText,
 } = authenticatorTextUtil;
 
-export const ResetPassword = ({
+export const ForgotPassword = ({
   className,
   variation,
 }: RouteProps): JSX.Element => {
@@ -28,9 +28,9 @@ export const ResetPassword = ({
   const {
     components: {
       // @ts-ignore
-      ResetPassword: {
-        Header = ResetPassword.Header,
-        Footer = ResetPassword.Footer,
+      ForgotPassword: {
+        Header = ForgotPassword.Header,
+        Footer = ForgotPassword.Footer,
       },
     },
   } = useCustomComponents();
@@ -39,7 +39,7 @@ export const ResetPassword = ({
     <RouteContainer className={className} variation={variation}>
       <form
         data-amplify-form=""
-        data-amplify-authenticator-resetpassword=""
+        data-amplify-authenticator-Forgotpassword=""
         method="post"
         onChange={handleChange}
         onSubmit={handleSubmit}
@@ -70,11 +70,11 @@ export const ResetPassword = ({
   );
 };
 
-ResetPassword.Header = function Header(): JSX.Element {
+ForgotPassword.Header = function Header(): JSX.Element {
   return <Heading level={3}>{getResetYourPasswordText()}</Heading>;
 };
 
-ResetPassword.Footer = function Footer(): JSX.Element {
+ForgotPassword.Footer = function Footer(): JSX.Element {
   // @ts-ignore
   return null;
 };
diff --git a/packages/react/src/components/Authenticator/Router/Router.tsx b/packages/react/src/components/Authenticator/Router/Router.tsx
@@ -7,7 +7,7 @@ import { SetupTotp } from '../SetupTotp';
 import { SignInSignUpTabs } from '../shared';
 import { ConfirmVerifyUser, VerifyUser } from '../VerifyUser';
 import { ConfirmSignIn } from '../ConfirmSignIn/ConfirmSignIn';
-import { ConfirmResetPassword, ResetPassword } from '../ForgotPassword';
+import { ConfirmResetPassword, ForgotPassword } from '../ForgotPassword';
 import { isSignInOrSignUpRoute } from '../utils';
 import { RouterProps } from './types';
 
@@ -37,7 +37,7 @@ const getRouteComponent = (route: string): RouteComponent => {
     case 'forceNewPassword':
       return ForceNewPassword;
     case 'forgotPassword':
-      return ResetPassword;
+      return ForgotPassword;
     case 'confirmResetPassword':
       return ConfirmResetPassword;
     case 'verifyUser':

diff --git a/packages/react/src/components/Authenticator/hooks/useCustomComponents/defaultComponents.tsx b/packages/react/src/components/Authenticator/hooks/useCustomComponents/defaultComponents.tsx
@@ -5,7 +5,7 @@ import { ForceNewPassword } from '../../ForceNewPassword';
 import { SetupTotp } from '../../SetupTotp';
 import { ConfirmSignIn } from '../../ConfirmSignIn/ConfirmSignIn';
 import { ConfirmVerifyUser, VerifyUser } from '../../VerifyUser';
-import { ConfirmResetPassword, ResetPassword } from '../../ForgotPassword';
+import { ConfirmResetPassword, ForgotPassword } from '../../ForgotPassword';
 
 // use the very generic name of Components as this is a temporary interface and is not exported
 interface Components {
@@ -20,7 +20,7 @@ export interface DefaultComponents extends Omit<Components, 'FormFields'> {
   ConfirmResetPassword?: Omit<Components, 'FormFields'>;
   ConfirmVerifyUser?: Omit<Components, 'FormFields'>;
   ForceNewPassword?: Components;
-  ResetPassword?: Omit<Components, 'FormFields'>;
+  ForgotPassword?: Omit<Components, 'FormFields'>;
   SetupTotp?: Omit<Components, 'FormFields'>;
   SignIn?: Omit<Components, 'FormFields'>;
   SignUp?: Components;
@@ -69,9 +69,9 @@ export const defaultComponents: DefaultComponents = {
     Footer: ForceNewPassword.Footer,
     FormFields: ForceNewPassword.FormFields,
   },
-  ResetPassword: {
-    Header: ResetPassword.Header,
-    Footer: ResetPassword.Footer,
+  ForgotPassword: {
+    Header: ForgotPassword.Header,
+    Footer: ForgotPassword.Footer,
   },
   // @ts-ignore
   Footer: (): JSX.Element => null,