Merge branch 'pr/122'

deepakaggarwal7 · Jul 25, 2021 · 095041d · 095041d
2 parents 9a53287 + 828bfee
commit 095041d
Showing 1 changed file with 10 additions and 12 deletions.
diff --git a/src/index.js b/src/index.js
@@ -88,6 +88,9 @@ const SocialLogin = (WrappedComponent) => class SocialLogin extends Component {
           ...prevState,
           isLoaded: true
         }), () => {
+          if (typeof this.props.onLoaded === 'function') {
+            this.props.onLoaded()
+          }
           if (autoLogin || this.accessToken) {
             if (this.fetchProvider && !this.accessToken) {
               this.sdk.login(appId, redirect)
@@ -151,6 +154,7 @@ const SocialLogin = (WrappedComponent) => class SocialLogin extends Component {
         isFetching: true
       }), () => {
         this.sdk.login().then(this.onLoginSuccess, this.onLoginFailure)
+          .catch(this.onLoginFailure)
       })
     } else if (this.state.isLoaded && this.state.isConnected) {
       this.props.onLoginFailure('User already connected')
@@ -202,21 +206,15 @@ const SocialLogin = (WrappedComponent) => class SocialLogin extends Component {
   onLoginFailure (err) {
     const { onLoginFailure } = this.props
 
-    if (this.node) {
-      this.setState((prevState) => ({
-        ...prevState,
-        isFetching: false,
-        isConnected: false
-      }), () => {
-        if (typeof onLoginFailure === 'function') {
-          onLoginFailure(err)
-        }
-      })
-    } else {
+    this.setState((prevState) => ({
+      ...prevState,
+      isFetching: false,
+      isConnected: false
+    }), () => {
       if (typeof onLoginFailure === 'function') {
         onLoginFailure(err)
       }
-    }
+    })
   }
 
   /**