refactor(clerk-js): Simplify TaskResetPassword component by removing current password requirement and related fields

Author: octoper

packages/clerk-js/src/ui/components/SessionTasks/tasks/TaskResetPassword/index.tsx

@@ -21,7 +21,6 @@ const TaskResetPasswordInternal = () => {
   const card = useCardState();
   const {
     userSettings: { passwordSettings },
-    authConfig: { reverification },
   } = useEnvironment();
 
   const { t, locale } = useLocalizations();
@@ -31,8 +30,6 @@ const TaskResetPasswordInternal = () => {
     (user: UserResource, opts: Parameters<UserResource['updatePassword']>) => user.updatePassword(...opts),
   );
 
-  const currentPasswordRequired = user && user.passwordEnabled && !reverification;
-
   const handleSignOut = () => {
     if (otherSessions.length === 0) {
       return signOut(navigateAfterSignOut);
@@ -41,13 +38,6 @@ const TaskResetPasswordInternal = () => {
     return signOut(navigateAfterMultiSessionSingleSignOutUrl, { sessionId: session?.id });
   };
 
-  // TODO: remove this field
-  const currentPasswordField = useFormControl('currentPassword', '', {
-    type: 'password',
-    label: localizationKeys('formFieldLabel__currentPassword'),
-    isRequired: true,
-  });
-
   const passwordField = useFormControl('newPassword', '', {
     type: 'password',
     label: localizationKeys('formFieldLabel__newPassword'),
@@ -90,13 +80,12 @@ const TaskResetPasswordInternal = () => {
     try {
       await updatePasswordWithReverification(user, [
         {
-          currentPassword: currentPasswordRequired ? currentPasswordField.value : undefined,
           newPassword: passwordField.value,
           signOutOfOtherSessions: sessionsField.checked,
         },
       ]);
     } catch (e) {
-      return handleError(e, [currentPasswordField, passwordField, confirmField], card.setError);
+      return handleError(e, [passwordField, confirmField], card.setError);
     }
   };
 
@@ -132,16 +121,6 @@ const TaskResetPasswordInternal = () => {
                     value={session?.publicUserData.identifier || ''}
                     style={{ display: 'none' }}
                   />
-                  {currentPasswordRequired && (
-                    <Form.ControlRow elementId={currentPasswordField.id}>
-                      <Form.PasswordInput
-                        {...currentPasswordField.props}
-                        minLength={6}
-                        isRequired
-                        autoFocus
-                      />
-                    </Form.ControlRow>
-                  )}
                   <Form.ControlRow elementId={passwordField.id}>
                     <Form.PasswordInput
                       {...passwordField.props}

packages/localizations/src/en-US.ts

@@ -863,6 +863,13 @@ export const enUS: LocalizationResource = {
       actionText: 'Signed in as {{identifier}}',
     },
   },
+  taskResetPassword: {
+    title: 'Reset password',
+    signOut: {
+      actionLink: 'Sign out',
+      actionText: 'Signed in as {{identifier}}',
+    },
+  },
   unstable__errors: {
     already_a_member_in_organization: '{{email}} is already a member of the organization.',
     captcha_invalid: undefined,

packages/shared/src/types/localization.ts

@@ -1287,6 +1287,13 @@ export type __internal_LocalizationResource = {
       action__invitationAccept: LocalizationValue;
     };
   };
+  taskResetPassword: {
+    title: LocalizationValue;
+    signOut: {
+      actionLink: LocalizationValue;
+      actionText: LocalizationValue<'identifier'>;
+    };
+  };
 };
 
 type WithParamName<T> = T &