Skip to content

Fix re-authentication 🙈 & implement 2FA #33

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
tgolen merged 2 commits into from
Aug 10, 2020
Merged

Fix re-authentication 🙈 & implement 2FA #33

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
cf28ffb
Fix re-authentication 🙈
AndrewGable Aug 10, 2020
76a9cac
Add 2FA
AndrewGable Aug 10, 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
12 changes: 11 additions & 1 deletion src/page/SignInPage.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ class App extends Component {
this.state = {
login: '',
password: '',
twoFactorAuthCode: '',
};
}

Expand All @@ -43,10 +44,19 @@ class App extends Component {
onChangeText={text => this.setState({password: text})}
/>
</View>
<View>
<Text>Two Factor Code:</Text>
<TextInput
style={{height: 40, borderColor: 'black', borderWidth: 2}}
value={this.state.twoFactorAuthCode}
placeholder="Required when 2FA is enabled"
onChangeText={text => this.setState({twoFactorAuthCode: text})}
/>
</View>
<View>
<Button
title="Log In"
onPress={() => signIn(this.state.login, this.state.password, true)}
onPress={() => signIn(this.state.login, this.state.password, this.state.twoFactorAuthCode, true)}
/>
{this.state.error && (
<Text style={{color: 'red'}}>
Expand Down
6 changes: 4 additions & 2 deletions src/store/actions/SessionActions.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,11 @@ function setSuccessfulSignInData(data) {
*
* @param {string} login
* @param {string} password
* @param {string} twoFactorAuthCode
* @param {boolean} useExpensifyLogin
* @returns {Promise}
*/
function signIn(login, password, useExpensifyLogin = false) {
function signIn(login, password, twoFactorAuthCode = '', useExpensifyLogin = false) {
console.debug('[SIGNIN] Authenticating with expensify login?', useExpensifyLogin ? 'yes' : 'no');
let authToken;
return request('Authenticate', {
Expand All @@ -64,6 +65,7 @@ function signIn(login, password, useExpensifyLogin = false) {
partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
partnerUserID: login,
partnerUserSecret: password,
twoFactorAuthCode
})
.then((data) => {
console.debug('[SIGNIN] Authentication result. Code:', data.jsonCode);
Expand Down Expand Up @@ -91,7 +93,7 @@ function signIn(login, password, useExpensifyLogin = false) {
}

console.debug('[SIGNIN] Successful sign in', 1);
return setSuccessfulSignInData();
return setSuccessfulSignInData(data);
})
.then(() => authToken)
.catch((err) => {
Expand Down