Merge pull request aws-amplify#1452 from powerful23/for-issue-1012

fix(aws-amplify-react-native): fix the Authenticator to only call async functions when mounted
b1zantine · Aug 16, 2018 · b218a72 · b218a72
2 parents 39ddb59 + 9ef0b58
commit b218a72
Showing 1 changed file with 9 additions and 1 deletion.
diff --git a/packages/aws-amplify-react-native/src/Auth/Authenticator.js b/packages/aws-amplify-react-native/src/Auth/Authenticator.js
@@ -71,17 +71,23 @@ export default class Authenticator extends React.Component {
         Hub.listen('auth', this);
     }
 
-    componentWillMount() {
+    componentDidMount() {
+        this._isMounted = true;
         this.checkUser();
     }
 
+    componentWillUnmount() {
+        this._isMounted = false;
+    }
+
     onHubCapsule(capsule) {
         const { channel, payload, source } = capsule;
         if (channel === 'auth') { this.checkUser(); }
     }
 
     handleStateChange(state, data) {
         logger.debug('authenticator state change ' + state);
+        if (!this._isMounted) return;
         if (state === this.state.authState) { return; }
 
         if (state === 'signedOut') { state = 'signIn'; }
@@ -103,13 +109,15 @@ export default class Authenticator extends React.Component {
         const statesJumpToSignIn = ['signedIn', 'signedOut', 'loading'];
         Auth.currentAuthenticatedUser()
             .then(user => {
+                if (!this._isMounted) return;
                 if (user) {
                     this.handleStateChange('signedIn', null);
                 } else {
                     if (statesJumpToSignIn.includes(authState)) this.handleStateChange('signIn', null);
                 }
             })
             .catch(err => {
+                if (!this._isMounted) return;
                 logger.debug(err);
                 if (statesJumpToSignIn.includes(authState)) {
                     Auth.signOut()