Skip to content

[HOLD] Re-authenticate only if we have stored credentials #232

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

Closed
cead22 wants to merge 6 commits into from
Closed

[HOLD] Re-authenticate only if we have stored credentials #232

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
efc4589
Re-authenticate only if we have stored credentials
cead22 Aug 18, 2020
18dd5d6
Simplify
cead22 Aug 18, 2020
9876bfc
Account for when we don't have anything stored
cead22 Aug 18, 2020
0262c79
Avoid JSON.parse(undefined)
cead22 Aug 19, 2020
1daa8d9
Revert "Avoid JSON.parse(undefined)"
cead22 Aug 19, 2020
dc8a889
Revert "Account for when we don't have anything stored"
cead22 Aug 19, 2020
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
43 changes: 26 additions & 17 deletions src/lib/Network.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,24 +200,33 @@ function request(command, data, type = 'post') {
if (!reauthenticating && responseData.jsonCode === 407 && data.doNotRetry !== true) {
reauthenticating = true;
return Ion.get(IONKEYS.CREDENTIALS)
.then(({login, password}) => xhr('Authenticate', {
useExpensifyLogin: false,
partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
partnerUserID: login,
partnerUserSecret: password,
twoFactorAuthCode: ''
})
.then((response) => {
reauthenticating = false;
return setSuccessfulSignInData(response);
.then((credentials) => {
// The first time we load the app we won't have credentials to re-authenticate with
// so we send the user to the signin page
if (!credentials || !credentials.login || !credentials.password) {
return redirectToSignIn();
}

// If we have login credentials stored in Ion, we use them to re-authenticate
return xhr('Authenticate', {
useExpensifyLogin: false,
partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
partnerUserID: credentials.login,
partnerUserSecret: credentials.password,
twoFactorAuthCode: ''
})
.then(() => xhr(command, data, type))
.catch(() => {
reauthenticating = false;
redirectToSignIn();
return Promise.reject();
}));
.then((response) => {
reauthenticating = false;
return setSuccessfulSignInData(response);
})
.then(() => xhr(command, data, type))
.catch(() => {
reauthenticating = false;
redirectToSignIn();
return Promise.reject();
});
});
}
return responseData;
});
Expand Down