Skip to content

Refactor ChangePassword #9218

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
marcaaron merged 14 commits into from
Jun 23, 2022
Merged

Refactor ChangePassword #9218

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
61fcff1
Refactor ChangePassword
madmax330 May 30, 2022
8a55952
use new api
madmax330 Jun 3, 2022
b53a3d0
Merge branch 'main' into maxence-rcpc
madmax330 Jun 3, 2022
da0f558
add import
madmax330 Jun 3, 2022
ba9c8de
lint fix
madmax330 Jun 3, 2022
e7ca7af
small updates
madmax330 Jun 3, 2022
c734f54
pass values directly
madmax330 Jun 6, 2022
214633d
Merge branch 'main' into maxence-rcpc
madmax330 Jun 8, 2022
53431af
Use new command
madmax330 Jun 8, 2022
2c83bbf
Merge branch 'main' into maxence-rcpc
madmax330 Jun 15, 2022
2019c4b
Force shouldrety and cancel for deprecated api
madmax330 Jun 20, 2022
bf05d5d
Fix infinite loop
madmax330 Jun 20, 2022
dc67d1e
Merge branch 'main' into maxence-rcpc
madmax330 Jun 20, 2022
d457cb1
Add issue + remove comment
madmax330 Jun 21, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 7 additions & 1 deletion src/libs/API.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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'),
};

Expand Down
48 changes: 29 additions & 19 deletions src/libs/actions/User.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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';
Expand Down Expand Up @@ -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},
},
],
});
}

/**
Expand Down Expand Up @@ -438,7 +448,7 @@ function generateStatementPDF(period) {
}

export {
changePasswordAndNavigate,
updatePassword,
closeAccount,
getBetas,
getUserDetails,
Expand Down
2 changes: 1 addition & 1 deletion src/pages/settings/PasswordPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ class PasswordPage extends Component {
if (!this.validate()) {
return;
}
User.changePasswordAndNavigate(this.state.currentPassword, this.state.newPassword);
Comment thread
madmax330 marked this conversation as resolved.
User.updatePassword(this.state.currentPassword, this.state.newPassword);
}

render() {
Expand Down