Fix sign in with other account after logout bug

blink672 · Apr 28, 2017 · ce48662 · ce48662
1 parent 5a06ded
commit ce48662
Show file tree

Hide file tree

Showing 2 changed files with 18 additions and 4 deletions.
diff --git a/app/SignUp.js b/app/SignUp.js
@@ -25,25 +25,35 @@ export default class SignUp extends Component {
       long: position.coords.longitude
     };
 
-    return AuthAxios({
+    AuthAxios({
       url: `/api/user/location`,
       method: 'put',
       data: location
     })
+    .then(() => {
+      console.log('location updated');
+    })
+    .catch((err) => {
+      console.log('location failed to update: ', err);
+    });
   }
 
   _signIn() {
     const { navigate } = this.props.navigation;
     GoogleSignin.signIn()
     .then((user) => {
       this.setState({user: user});
-      return this.saveLocation();
+      return AuthAxios({
+        url: '/api/user'
+      })
     })
     .then(({data}) => {
       this.setState({dbUser: data});
-      if (!data.created) {
+      console.log('new user? ', data.created, data);
+      if (data.created === false) {
         navigate('HomePageTabs');
       }
+      this.saveLocation();
     })
     .catch((err) => {
       console.log('Error: ', err);

diff --git a/app/SplashScreen.js b/app/SplashScreen.js
@@ -37,7 +37,11 @@ export default class SplashScreen extends Component {
       {enableHighAccuracy: false, timeout: 20000, maximumAge: 90000000000000}
     );
     this.watchID = navigator.geolocation.watchPosition((position) => {
-      this.setState({lastPosition: position}, () => {this.saveLocation()});
+      this.setState({lastPosition: position}, () => {
+        if (this.state.user) {
+          this.saveLocation()
+        }
+      });
     });
   }