Merge pull request #9218 from Expensify/maxence-rcpc

Refactor ChangePassword
Expensify · Jun 23, 2022 · b38693e · b38693e
2 parents 3ef2729 + d457cb1
commit b38693e
Show file tree

Hide file tree

Showing 3 changed files with 37 additions and 21 deletions.
diff --git a/src/libs/API.js b/src/libs/API.js
@@ -19,7 +19,13 @@ function write(command, apiCommandParameters = {}, onyxData = {}) {
     // Assemble all the request data we'll be storing in the queue
     const request = {
         command,
-        data,
+        data: {
+            ...data,
+
+            // This should be removed once we are no longer using deprecatedAPI https://github.com/Expensify/Expensify/issues/215650
+            shouldRetry: true,
+            canCancel: true,
+        },
         ..._.omit(onyxData, 'optimisticData'),
     };
 

diff --git a/src/libs/actions/User.js b/src/libs/actions/User.js
@@ -6,6 +6,7 @@ import {PUBLIC_DOMAINS as COMMON_PUBLIC_DOMAINS} from 'expensify-common/lib/CONS
 import moment from 'moment';
 import ONYXKEYS from '../../ONYXKEYS';
 import * as DeprecatedAPI from '../deprecatedAPI';
+import * as API from '../API';
 import CONFIG from '../../CONFIG';
 import CONST from '../../CONST';
 import Navigation from '../Navigation/Navigation';
@@ -46,25 +47,34 @@ Onyx.connect({
  *
  * @param {String} oldPassword
  * @param {String} password
- * @returns {Promise}
  */
-function changePasswordAndNavigate(oldPassword, password) {
-    Onyx.merge(ONYXKEYS.ACCOUNT, {...CONST.DEFAULT_ACCOUNT_DATA, loading: true});
-
-    return DeprecatedAPI.ChangePassword({oldPassword, password})
-        .then((response) => {
-            if (response.jsonCode !== 200) {
-                const error = lodashGet(response, 'message', 'Unable to change password. Please try again.');
-                Onyx.merge(ONYXKEYS.ACCOUNT, {error});
-                return;
-            }
-
-            const success = lodashGet(response, 'message', 'Password changed successfully.');
-            Onyx.merge(ONYXKEYS.ACCOUNT, {success});
-        })
-        .finally(() => {
-            Onyx.merge(ONYXKEYS.ACCOUNT, {loading: false});
-        });
+function updatePassword(oldPassword, password) {
+    API.write('UpdatePassword', {
+        oldPassword,
+        password,
+    }, {
+        optimisticData: [
+            {
+                onyxMethod: 'merge',
+                key: ONYXKEYS.ACCOUNT,
+                value: {...CONST.DEFAULT_ACCOUNT_DATA, loading: true},
+            },
+        ],
+        successData: [
+            {
+                onyxMethod: 'merge',
+                key: ONYXKEYS.ACCOUNT,
+                value: {loading: false},
+            },
+        ],
+        failureData: [
+            {
+                onyxMethod: 'merge',
+                key: ONYXKEYS.ACCOUNT,
+                value: {loading: false},
+            },
+        ],
+    });
 }
 
 /**
@@ -438,7 +448,7 @@ function generateStatementPDF(period) {
 }
 
 export {
-    changePasswordAndNavigate,
+    updatePassword,
     closeAccount,
     getBetas,
     getUserDetails,

diff --git a/src/pages/settings/PasswordPage.js b/src/pages/settings/PasswordPage.js
@@ -133,7 +133,7 @@ class PasswordPage extends Component {
         if (!this.validate()) {
             return;
         }
-        User.changePasswordAndNavigate(this.state.currentPassword, this.state.newPassword);
+        User.updatePassword(this.state.currentPassword, this.state.newPassword);
     }
 
     render() {