fix socialButtons onLoginHook

bmartin1134 · May 16, 2018 · 32ab8f3 · 32ab8f3
1 parent 617233b
commit 32ab8f3
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/lib/AccountsReactComponent/methods/index.js b/lib/AccountsReactComponent/methods/index.js
@@ -11,12 +11,6 @@ export const createUser = (newUser, callback) => {
 export const login = (username, email, password, callback) => {
   Meteor.loginWithPassword(username || email, password, err => {
     callback(err)
-    if (!err) {
-      const { onLoginHook } = AccountsReact.config
-      if (onLoginHook) {
-        onLoginHook()
-      }
-    }
   })
 }
 

diff --git a/lib/AccountsReactComponent/signIn.js b/lib/AccountsReactComponent/signIn.js
@@ -41,7 +41,9 @@ class SignIn extends Component {
           errors={this.state.errors}
         />
 
-        <SocialButtons />
+        <SocialButtons
+          defaults={defaults}
+        />
 
         {!hideSignUpLink && (
           <a className='signIn-link' onMouseDown={this.redirectToSignUp} style={linkStyle} href=''>
@@ -70,6 +72,11 @@ class SignIn extends Component {
     login(username, email, password, err => {
       if (err) {
         this.setState({ errors: [{ _id: '__globals', errStr: err.reason }] })
+      } else {
+        const { onLoginHook } = this.props.defaults
+        if (onLoginHook) {
+          onLoginHook()
+        }
       }
     })
   }

diff --git a/lib/AccountsReactComponent/socialButtons.js b/lib/AccountsReactComponent/socialButtons.js
@@ -34,7 +34,7 @@ class SocialButtons extends React.Component {
     const options = AccountsReact.config.oauth[service] || {}
     Meteor['loginWith' + _service](options, err => {
       if (!err) {
-        const { onLoginHook } = AccountsReact.config
+        const { onLoginHook } = this.props.defaults
         if (onLoginHook) {
           onLoginHook()
         }

diff --git a/package.js b/package.js
@@ -1,7 +1,7 @@
 Package.describe({
   name: 'meteoreact:accounts',
   summary: 'Simple and intuative accounts view layer with react',
-  version: '1.2.0',
+  version: '1.2.2',
   documentation: 'README.md',
   git: 'https://github.com/royGil/accounts-react'
 })