From 898c7d277a8a9ee0821e89e5f84a17f5c20de09e Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 11:43:31 -0700
Subject: [PATCH 1/6] Implement infinite sessions

---
 src/lib/Str.js                      |   6 ++
 src/page/SignInPage.js              |   8 ++-
 src/store/actions/SessionActions.js | 100 +++++++++++++++++-----------
 3 files changed, 73 insertions(+), 41 deletions(-)

diff --git a/src/lib/Str.js b/src/lib/Str.js
index d8660585d8c..b6e5c3c33e1 100644
--- a/src/lib/Str.js
+++ b/src/lib/Str.js
@@ -1,5 +1,7 @@
 /* globals $, _ */
 
+import Guid from './Guid';
+
 const Str = {
     /**
      * Returns the proper phrase depending on the count that is passed.
@@ -49,6 +51,10 @@ const Str = {
     nl2br(str) {
         return str.replace(/\n/g, '<br />');
     },
+
+    generateDeviceLoginID() {
+        return `React-Native-Chat-${Guid()}`;
+    },
 };
 
 export default Str;
diff --git a/src/page/SignInPage.js b/src/page/SignInPage.js
index 90b6427c93c..b54f0fc3e54 100644
--- a/src/page/SignInPage.js
+++ b/src/page/SignInPage.js
@@ -26,13 +26,14 @@ export default class App extends Component {
         this.state = {
             login: '',
             password: '',
-            error: Store.get(STOREKEYS.SESSION, 'error'),
+            error: '',
         };
     }
 
     componentDidMount() {
         // Listen for changes to our session
         Store.subscribe(STOREKEYS.SESSION, this.sessionChanged);
+        Store.get(STOREKEYS.SESSION, 'error').then(error => this.state.error = error);
     }
 
     componentWillUnmount() {
@@ -52,7 +53,7 @@ export default class App extends Component {
      * When the form is submitted, then we trigger our prop callback
      */
     submit() {
-        signIn(this.state.login, this.state.password);
+        signIn(this.state.login, this.state.password, true);
     }
 
     render() {
@@ -79,6 +80,9 @@ export default class App extends Component {
                     </View>
                     <View>
                         <Button onPress={this.submit} title={'Log In'} />
+                    {this.state.error ? <Text style={{color: 'red'}}>
+                        {this.state.error}
+                    </Text> : null}
                     </View>
                 </SafeAreaView>
             </>
diff --git a/src/store/actions/SessionActions.js b/src/store/actions/SessionActions.js
index 3adb4d2ab7b..7572705cbb5 100644
--- a/src/store/actions/SessionActions.js
+++ b/src/store/actions/SessionActions.js
@@ -1,16 +1,16 @@
+import { Platform } from 'react-native';
+import * as _ from 'lodash';
 import * as Store from '../Store.js';
 import {request} from '../../lib/Network.js';
 import ROUTES from '../../ROUTES.js';
 import STOREKEYS from '../STOREKEYS.js';
 import * as PersistentStorage from '../../lib/PersistentStorage.js';
-import * as _ from 'lodash';
+import Str from '../../lib/Str';
+import Guid from '../../lib/Guid';
 
-// TODO: Figure out how to determine prod/dev on mobile, etc.
-const IS_IN_PRODUCTION = false;
-const partnerName = IS_IN_PRODUCTION ? 'chat-expensify-com' : 'android';
-const partnerPassword = IS_IN_PRODUCTION
-    ? 'e21965746fd75f82bb66'
-    : 'c3a9ac418ea3f152aae2';
+const IS_IN_PRODUCTION = Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__;
+const partnerName = IS_IN_PRODUCTION ? 'chat-expensify-com' : 'expensify.com';
+const partnerPassword = IS_IN_PRODUCTION ? 'e21965746fd75f82bb66' : 'MkgLvVAyaTlmw';
 
 /**
  * Amount of time (in ms) after which an authToken is considered expired.
@@ -19,7 +19,7 @@ const partnerPassword = IS_IN_PRODUCTION
  * @private
  * @type {Number}
  */
-const AUTH_TOKEN_EXPIRATION_TIME = 1000 * 60;
+const AUTH_TOKEN_EXPIRATION_TIME = 1000 * 60 * 90;
 
 /**
  * Sign in with the API
@@ -28,49 +28,51 @@ const AUTH_TOKEN_EXPIRATION_TIME = 1000 * 60;
  * @param {boolean} useExpensifyLogin
  */
 function signIn(login, password, useExpensifyLogin = false) {
-    Store.set(STOREKEYS.CREDENTIALS, {login, password});
-    Store.set(STOREKEYS.SESSION, {});
     return request('Authenticate', {
-        useExpensifyLogin: useExpensifyLogin,
-        partnerName: partnerName,
-        partnerPassword: partnerPassword,
+        useExpensifyLogin,
+        partnerName,
+        partnerPassword,
         partnerUserID: login,
         partnerUserSecret: password,
     })
         .then((data) => {
-            // 404 We need to create a login
-            if (data.jsonCode === 404 && !useExpensifyLogin) {
-                signIn(login, password, true).then((expensifyLoginData) => {
-                    createLogin(expensifyLoginData.authToken, login, password);
-                });
-                return;
-            }
-
             // If we didn't get a 200 response from authenticate, the user needs to sign in again
             if (data.jsonCode !== 200) {
-                console.warn(
-                    'Did not get a 200 from authenticate, going back to sign in page',
-                );
+                console.debug('Non-200 from authenticate, going back to sign in page');
+                Store.set(STOREKEYS.CREDENTIALS, {});
+                Store.set(STOREKEYS.SESSION, {error: data.message});
                 Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN);
                 return;
             }
 
-            Store.set(STOREKEYS.SESSION, data);
-            Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.HOME);
-            Store.set(STOREKEYS.LAST_AUTHENTICATED, new Date().getTime());
+            // If we used the Expensify login, it's the users first time logging in and we need to create a login for the user
+            if (useExpensifyLogin) {
+                createLogin(data.authToken, Str.generateDeviceLoginID(), Guid()).then(() => {
+                    setSuccessfulData(data);
+                });
+                return;
+            }
 
+
+            setSuccessfulData(data);
             return data;
         })
-        .then((data) => {
-            Store.set(STOREKEYS.SESSION, data);
-            Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.HOME);
-        })
         .catch((err) => {
             console.warn(err);
-            Store.set(STOREKEYS.SESSION, {error: err});
+            Store.set(STOREKEYS.SESSION, {error: err.message});
         });
 }
 
+/**
+ * Sets API data in the store when we make a successful "Authenticate"/"CreateLogin" request
+ * @param {object} data
+ */
+function setSuccessfulData(data) {
+    Store.set(STOREKEYS.SESSION, data);
+    Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.HOME);
+    Store.set(STOREKEYS.LAST_AUTHENTICATED, new Date().getTime());
+}
+
 /**
  * Create login
  * @param {string} authToken
@@ -78,15 +80,35 @@ function signIn(login, password, useExpensifyLogin = false) {
  * @param {string} password
  */
 function createLogin(authToken, login, password) {
-    request('CreateLogin', {
-        authToken: authToken,
+    return request('CreateLogin', {
+        authToken,
         partnerName,
         partnerPassword,
         partnerUserID: login,
         partnerUserSecret: password,
-    }).catch((err) => {
-        Store.set(STOREKEYS.SESSION, {error: err});
-    });
+    }).then(() => {
+        Store.set(STOREKEYS.CREDENTIALS, {login, password});
+    })
+        .catch((err) => {
+            Store.set(STOREKEYS.SESSION, {error: err.message});
+        });
+}
+
+/**
+ * Delete login
+ * @param {string} authToken
+ * @param {string} login
+ */
+function deleteLogin(authToken, login) {
+    return request('DeleteLogin', {
+        authToken,
+        partnerName,
+        partnerPassword,
+        partnerUserID: login,
+    })
+        .catch((err) => {
+            Store.set(STOREKEYS.SESSION, {error: err.message});
+        });
 }
 
 /**
@@ -95,6 +117,7 @@ function createLogin(authToken, login, password) {
 async function signOut() {
     Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN);
     await PersistentStorage.clear();
+    await deleteLogin();
 }
 
 /**
@@ -104,8 +127,7 @@ async function verifyAuthToken() {
     const lastAuthenticated = await Store.get(STOREKEYS.LAST_AUTHENTICATED);
     const credentials = await Store.get(STOREKEYS.CREDENTIALS);
     const haveCredentials = !_.isNull(credentials);
-    const haveExpiredAuthToken =
-        lastAuthenticated < new Date().getTime() - AUTH_TOKEN_EXPIRATION_TIME;
+    const haveExpiredAuthToken = lastAuthenticated < new Date().getTime() - AUTH_TOKEN_EXPIRATION_TIME;
 
     if (haveExpiredAuthToken && haveCredentials) {
         console.debug('Invalid auth token: Token has expired.');

From 9f2af37243815fe093f970ddc6150d12b8ea361a Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 12:42:23 -0700
Subject: [PATCH 2/6] Tweaking more conflicts

---
 src/CONFIG.js                       |   5 +-
 src/lib/Network.js                  |   3 +-
 src/store/actions/SessionActions.js | 127 ++++++++++------------------
 3 files changed, 49 insertions(+), 86 deletions(-)

diff --git a/src/CONFIG.js b/src/CONFIG.js
index 10512520c48..7dcfe5902d0 100644
--- a/src/CONFIG.js
+++ b/src/CONFIG.js
@@ -1,5 +1,6 @@
-// TODO: Figure out how to determine prod/dev on mobile, etc.
-const IS_IN_PRODUCTION = false;
+import {Platform} from 'react-native';
+
+const IS_IN_PRODUCTION = Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__;
 
 export default {
     PUSHER: {
diff --git a/src/lib/Network.js b/src/lib/Network.js
index 1a044622084..66afc4a59c3 100644
--- a/src/lib/Network.js
+++ b/src/lib/Network.js
@@ -2,6 +2,7 @@ import * as $ from 'jquery';
 import * as Store from '../store/Store';
 import CONFIG from '../CONFIG';
 import STOREKEYS from '../store/STOREKEYS';
+import _ from 'underscore';
 
 let isAppOffline = false;
 
@@ -30,7 +31,7 @@ function request(command, data, type = 'post') {
                     method: type,
                     body: formData,
                 },
-            )
+            );
         })
         .then(response => response.json())
         .catch(() => isAppOffline = true);
diff --git a/src/store/actions/SessionActions.js b/src/store/actions/SessionActions.js
index ebcd72129ed..0ae83f57149 100644
--- a/src/store/actions/SessionActions.js
+++ b/src/store/actions/SessionActions.js
@@ -3,13 +3,9 @@ import * as Store from '../Store';
 import {request} from '../../lib/Network';
 import ROUTES from '../../ROUTES';
 import STOREKEYS from '../STOREKEYS';
-import * as PersistentStorage from '../../lib/PersistentStorage';
 import CONFIG from '../../CONFIG';
-import { Platform } from 'react-native';
-
-const IS_IN_PRODUCTION = Platform.OS === 'web' ? process.env.NODE_ENV === 'production' : !__DEV__;
-const partnerName = IS_IN_PRODUCTION ? 'chat-expensify-com' : 'expensify.com';
-const partnerPassword = IS_IN_PRODUCTION ? 'e21965746fd75f82bb66' : 'MkgLvVAyaTlmw';
+import Str from '../../lib/Str';
+import Guid from '../../lib/Guid';
 
 /**
  * Amount of time (in ms) after which an authToken is considered expired.
@@ -27,17 +23,32 @@ const AUTH_TOKEN_EXPIRATION_TIME = 1000 * 60 * 90;
  * @param {string} password
  */
 function createLogin(authToken, login, password) {
-    request('CreateLogin', {
+    return request('CreateLogin', {
         authToken,
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
         partnerUserID: login,
         partnerUserSecret: password,
+    }).then(() => {
+        Store.set(STOREKEYS.CREDENTIALS, {login, password});
     }).catch((err) => {
         Store.set(STOREKEYS.SESSION, {error: err});
     });
 }
 
+/**
+ * Sets API data in the store when we make a successful "Authenticate"/"CreateLogin" request
+ * @param {object} data
+ * @returns {Promise}
+ */
+function setSuccessfulData(data) {
+    return Store.multiSet({
+        [STOREKEYS.SESSION]: data,
+        [STOREKEYS.APP_REDIRECT_TO]: ROUTES.HOME,
+        [STOREKEYS.LAST_AUTHENTICATED]: new Date().getTime(),
+    });
+}
+
 /**
  * Sign in with the API
  *
@@ -49,52 +60,32 @@ function createLogin(authToken, login, password) {
 function signIn(login, password, useExpensifyLogin = false) {
     let authToken;
     return request('Authenticate', {
-            useExpensifyLogin,
-            partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
-            partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
-            partnerUserID: login,
-            partnerUserSecret: password,
-        })
+        useExpensifyLogin,
+        partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
+        partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
+        partnerUserID: login,
+        partnerUserSecret: password,
+    })
         .then((data) => {
             authToken = data && data.authToken;
 
             // If we didn't get a 200 response from authenticate, the user needs to sign in again
             if (data.jsonCode !== 200) {
-                //TODO: Implement promise
                 console.debug('Non-200 from authenticate, going back to sign in page');
-                Store.set(STOREKEYS.CREDENTIALS, {});
-                Store.set(STOREKEYS.SESSION, {error: data.message});
-                Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN);
-                return;
-            }
-
-            // TODO: Fix merge, implement promise
-            /*
-            // If we used the Expensify login, it's the users first time logging in and we need to create a login for the user
-            if (useExpensifyLogin) {
-                createLogin(data.authToken, Str.generateDeviceLoginID(), Guid()).then(() => {
-                    setSuccessfulData(data);
+                return Store.multiSet({
+                    [STOREKEYS.CREDENTIALS]: {},
+                    [STOREKEYS.SESSION]: {error: data.message},
+                    [STOREKEYS.APP_REDIRECT_TO]: ROUTES.SIGNIN,
                 });
-                return;
             }
 
-
-            setSuccessfulData(data);
-            return data;
-
-
-
-            // If we didn't get a 200 response from authenticate, the user needs to sign in again
-            if (data.jsonCode !== 200) {
-                console.warn('Did not get a 200 from authenticate, going back to sign in page');
-                return Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN);
+            // If Expensify login, it's the users first time logging in and we need to create a login for the user
+            if (useExpensifyLogin) {
+                return createLogin(data.authToken, Str.generateDeviceLoginID(), Guid())
+                    .then(() => setSuccessfulData(data));
             }
 
-            return Store.multiSet({
-                [STOREKEYS.SESSION]: data,
-                [STOREKEYS.APP_REDIRECT_TO]: ROUTES.HOME,
-                [STOREKEYS.LAST_AUTHENTICATED]: new Date().getTime(),
-            });*/
+            return setSuccessfulData();
         })
         .then(() => authToken)
         .catch((err) => {
@@ -103,52 +94,21 @@ function signIn(login, password, useExpensifyLogin = false) {
         });
 }
 
-/**
- * Sets API data in the store when we make a successful "Authenticate"/"CreateLogin" request
- * @param {object} data
- */
-function setSuccessfulData(data) {
-    Store.set(STOREKEYS.SESSION, data);
-    Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.HOME);
-    Store.set(STOREKEYS.LAST_AUTHENTICATED, new Date().getTime());
-}
-
-/**
- * Create login
- * @param {string} authToken
- * @param {string} login
- * @param {string} password
- */
-function createLogin(authToken, login, password) {
-    return request('CreateLogin', {
-        authToken,
-        partnerName,
-        partnerPassword,
-        partnerUserID: login,
-        partnerUserSecret: password,
-    }).then(() => {
-        Store.set(STOREKEYS.CREDENTIALS, {login, password});
-    })
-        .catch((err) => {
-            Store.set(STOREKEYS.SESSION, {error: err.message});
-        });
-}
-
 /**
  * Delete login
  * @param {string} authToken
  * @param {string} login
+ * @returns {Promise}
  */
 function deleteLogin(authToken, login) {
     return request('DeleteLogin', {
         authToken,
-        partnerName,
-        partnerPassword,
+        partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
+        partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
         partnerUserID: login,
-    })
-        .catch((err) => {
-            Store.set(STOREKEYS.SESSION, {error: err.message});
-        });
+    }).catch((err) => {
+        Store.set(STOREKEYS.SESSION, {error: err.message});
+    });
 }
 
 /**
@@ -156,10 +116,11 @@ function deleteLogin(authToken, login) {
  *
  * @returns {Promise}
  */
-async function signOut() {
+function signOut() {
     return Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN)
+        .then(() => Store.multiGet([STOREKEYS.SESSION, STOREKEYS.CREDENTIALS]))
+        .then(data => deleteLogin(data.session.authToken, data.credentials.login))
         .then(Store.clear);
-    await deleteLogin();
 }
 
 /**
@@ -170,8 +131,8 @@ async function signOut() {
 async function verifyAuthToken() {
     return Store.multiGet([STOREKEYS.LAST_AUTHENTICATED, STOREKEYS.CREDENTIALS])
         .then(({last_authenticated, credentials}) => {
-    const haveCredentials = !_.isNull(credentials);
-    const haveExpiredAuthToken = last_authenticated < new Date().getTime() - AUTH_TOKEN_EXPIRATION_TIME;
+            const haveCredentials = !_.isNull(credentials);
+            const haveExpiredAuthToken = last_authenticated < new Date().getTime() - AUTH_TOKEN_EXPIRATION_TIME;
 
             if (haveExpiredAuthToken && haveCredentials) {
                 console.debug('Invalid auth token: Token has expired.');

From d311c41e899e75b66c514439ee0873bd0381fc6d Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 12:46:19 -0700
Subject: [PATCH 3/6] Apply a little bit of review comments

---
 src/lib/Str.js         | 5 +++++
 src/page/SignInPage.js | 6 +++---
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/lib/Str.js b/src/lib/Str.js
index b6e5c3c33e1..b768528bc0c 100644
--- a/src/lib/Str.js
+++ b/src/lib/Str.js
@@ -52,6 +52,11 @@ const Str = {
         return str.replace(/\n/g, '<br />');
     },
 
+    /**
+     * Generates a random device login using Guid
+     *
+     * @returns {string}
+     */
     generateDeviceLoginID() {
         return `React-Native-Chat-${Guid()}`;
     },
diff --git a/src/page/SignInPage.js b/src/page/SignInPage.js
index e0809c8ff11..2126a8d40fb 100644
--- a/src/page/SignInPage.js
+++ b/src/page/SignInPage.js
@@ -33,7 +33,7 @@ export default class App extends Component {
     componentDidMount() {
         // Listen for changes to our session
         Store.subscribe(STOREKEYS.SESSION, this.sessionChanged);
-        Store.get(STOREKEYS.SESSION, 'error').then(error => this.state.error = error);
+        Store.get(STOREKEYS.SESSION, 'error').then(error => this.setState({error}));
     }
 
     componentWillUnmount() {
@@ -80,9 +80,9 @@ export default class App extends Component {
                     </View>
                     <View>
                         <Button onPress={this.submit} title={'Log In'} />
-                    {this.state.error ? <Text style={{color: 'red'}}>
+                    {this.state.error && <Text style={{color: 'red'}}>
                         {this.state.error}
-                    </Text> : null}
+                    </Text>}
                     </View>
                 </SafeAreaView>
             </>

From ab77d5617624937759fb3390b2d79a90940eb3de Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 12:49:36 -0700
Subject: [PATCH 4/6] Merge fixes

---
 src/lib/Network.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/lib/Network.js b/src/lib/Network.js
index f4823f640b6..e90f2b65cd1 100644
--- a/src/lib/Network.js
+++ b/src/lib/Network.js
@@ -2,7 +2,6 @@ import _ from 'underscore';
 import * as Store from '../store/Store';
 import CONFIG from '../CONFIG';
 import STOREKEYS from '../store/STOREKEYS';
-import _ from 'underscore';
 
 let isAppOffline = false;
 

From 229823b6a1425db42dafb34475d736762bdd59f7 Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 13:10:07 -0700
Subject: [PATCH 5/6] Fix promise return bugs

---
 src/page/SignInPage.js              |  6 +++---
 src/store/actions/SessionActions.js | 25 +++++++++++--------------
 2 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/page/SignInPage.js b/src/page/SignInPage.js
index 2126a8d40fb..c3a4ccd0c6c 100644
--- a/src/page/SignInPage.js
+++ b/src/page/SignInPage.js
@@ -24,9 +24,9 @@ export default class App extends Component {
         this.sessionChanged = this.sessionChanged.bind(this);
 
         this.state = {
-            login: '',
-            password: '',
-            error: '',
+            login: null,
+            password: null,
+            error: null,
         };
     }
 
diff --git a/src/store/actions/SessionActions.js b/src/store/actions/SessionActions.js
index f47ad63ec52..54705652868 100644
--- a/src/store/actions/SessionActions.js
+++ b/src/store/actions/SessionActions.js
@@ -21,6 +21,7 @@ const AUTH_TOKEN_EXPIRATION_TIME = 1000 * 60 * 90;
  * @param {string} authToken
  * @param {string} login
  * @param {string} password
+ * @returns {Promise}
  */
 function createLogin(authToken, login, password) {
     return request('CreateLogin', {
@@ -29,11 +30,8 @@ function createLogin(authToken, login, password) {
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
         partnerUserID: login,
         partnerUserSecret: password,
-    }).then(() => {
-        Store.set(STOREKEYS.CREDENTIALS, {login, password});
-    }).catch((err) => {
-        Store.set(STOREKEYS.SESSION, {error: err});
-    });
+    }).then(() => Store.set(STOREKEYS.CREDENTIALS, {login, password}))
+        .catch(err => Store.set(STOREKEYS.SESSION, {error: err}));
 }
 
 /**
@@ -41,7 +39,7 @@ function createLogin(authToken, login, password) {
  * @param {object} data
  * @returns {Promise}
  */
-function setSuccessfulData(data) {
+function setSuccessfulSignInData(data) {
     return Store.multiSet({
         [STOREKEYS.SESSION]: data,
         [STOREKEYS.APP_REDIRECT_TO]: ROUTES.HOME,
@@ -82,15 +80,15 @@ function signIn(login, password, useExpensifyLogin = false) {
             // If Expensify login, it's the users first time logging in and we need to create a login for the user
             if (useExpensifyLogin) {
                 return createLogin(data.authToken, Str.generateDeviceLoginID(), Guid())
-                    .then(() => setSuccessfulData(data));
+                    .then(() => setSuccessfulSignInData(data));
             }
 
-            return setSuccessfulData();
+            return setSuccessfulSignInData();
         })
         .then(() => authToken)
         .catch((err) => {
             console.error(err);
-            Store.set(STOREKEYS.SESSION, {error: err.message});
+            return Store.set(STOREKEYS.SESSION, {error: err.message});
         });
 }
 
@@ -106,9 +104,7 @@ function deleteLogin(authToken, login) {
         partnerName: CONFIG.EXPENSIFY.PARTNER_NAME,
         partnerPassword: CONFIG.EXPENSIFY.PARTNER_PASSWORD,
         partnerUserID: login,
-    }).catch((err) => {
-        Store.set(STOREKEYS.SESSION, {error: err.message});
-    });
+    }).catch(err => Store.set(STOREKEYS.SESSION, {error: err.message}));
 }
 
 /**
@@ -120,7 +116,8 @@ function signOut() {
     return Store.set(STOREKEYS.APP_REDIRECT_TO, ROUTES.SIGNIN)
         .then(() => Store.multiGet([STOREKEYS.SESSION, STOREKEYS.CREDENTIALS]))
         .then(data => deleteLogin(data.session.authToken, data.credentials.login))
-        .then(Store.clear);
+        .then(Store.clear)
+        .catch(err => Store.set(STOREKEYS.SESSION, {error: err.message}));
 }
 
 /**
@@ -128,7 +125,7 @@ function signOut() {
  *
  * @returns {Promise}
  */
-async function verifyAuthToken() {
+function verifyAuthToken() {
     return Store.multiGet([STOREKEYS.LAST_AUTHENTICATED, STOREKEYS.CREDENTIALS])
         .then(({last_authenticated, credentials}) => {
             const haveCredentials = !_.isNull(credentials);

From 4487a14fa1890bb29531a1a3d683680d8b746950 Mon Sep 17 00:00:00 2001
From: andrew <andrew@expensify.com>
Date: Sat, 8 Aug 2020 13:12:39 -0700
Subject: [PATCH 6/6] Make input state empty strings

---
 src/page/SignInPage.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/page/SignInPage.js b/src/page/SignInPage.js
index c3a4ccd0c6c..8f710f20acf 100644
--- a/src/page/SignInPage.js
+++ b/src/page/SignInPage.js
@@ -24,8 +24,8 @@ export default class App extends Component {
         this.sessionChanged = this.sessionChanged.bind(this);
 
         this.state = {
-            login: null,
-            password: null,
+            login: '',
+            password: '',
             error: null,
         };
     }