Login hooks

README.md

@@ -64,7 +64,7 @@ Log the user in with a password.
 ```js
 import { loginWithPassword } from 'meteor-apollo-accounts'
 
-loginWithPassword({username, email, password, plainPassword}, apollo)
+loginWithPassword({username, email, password, plainPassword})
 ```
 
 - ```username```: Optional. The user's username.
@@ -84,7 +84,7 @@ Change the current user's password. Must be logged in.
 ```js
 import { changePassword } from 'meteor-apollo-accounts'
 
-changePassword({oldPassword, newPassword}, apollo)
+changePassword({oldPassword, newPassword})
 ```
 
 - ```oldPassword```: The user's current password. This is not sent in plain text over the wire.
@@ -112,7 +112,7 @@ Create a new user.
 ```js
 import { createUser } from 'meteor-apollo-accounts'
 
-createUser({username, email, password, profile}, apollo)
+createUser({username, email, password, profile})
 ```
 
 - ```username```: A unique name for this user.
@@ -132,7 +132,7 @@ Marks the user's email address as verified. Logs the user in afterwards.
 ```js
 import { verifyEmail } from 'meteor-apollo-accounts'
 
-verifyEmail({token}, apollo)
+verifyEmail({token})
 ```
 
 - ```token```: The token retrieved from the verification URL.
@@ -147,7 +147,7 @@ Request a forgot password email.
 ```js
 import { forgotPassword } from 'meteor-apollo-accounts'
 
-forgotPassword({email}, apollo)
+forgotPassword({email})
 ```
 
 - ```email```: The email address to send a password reset link.
@@ -161,7 +161,7 @@ Reset the password for a user using a token received in email. Logs the user in
 ```js
 import { resetPassword } from 'meteor-apollo-accounts'
 
-resetPassword({newPassword, token}, apollo)
+resetPassword({newPassword, token})
 ```
 
 - ```newPassword```: A new password for the user. This is not sent in plain text over the wire.
@@ -178,7 +178,7 @@ Logins the user with a facebook accessToken
 ```js
 import { loginWithFacebook } from 'meteor-apollo-accounts'
 
-loginWithFacebook({accessToken}, apollo)
+loginWithFacebook({accessToken})
 ```
 
 - ```accessToken```: A Facebook accessToken. It's recommended to use
@@ -193,7 +193,7 @@ Logins the user with a google accessToken
 ```js
 import { loginWithGoogle } from 'meteor-apollo-accounts'
 
-loginWithGoogle({accessToken}, apollo)
+loginWithGoogle({accessToken})
 ```
 
 - ```accessToken```: A Google accessToken. It's recommended to use

client/src/Events.js

@@ -0,0 +1,16 @@
+export default {
+  _cbs: [],
+  notify (eventName) {
+    this._cbs.map(cb => {
+      if (cb.eventName === eventName && typeof cb.callback === 'function') {
+        cb.callback()
+      }
+    })
+  },
+  on (eventName, cb) {
+    this._cbs.push({
+      eventName: eventName,
+      callback: cb
+    })
+  }
+}

client/src/changePassword.js

@@ -1,10 +1,11 @@
-import hashPassword from './hashPassword'
 import gql from 'graphql-tag'
+import hashPassword from './hashPassword'
+import {getClient} from './store'
 
-export default async function ({oldPassword, newPassword}, apollo) {
+export default async function ({oldPassword, newPassword}) {
   if (!oldPassword || !newPassword) throw new Error('Old and new password are required')
 
-  const result = await apollo.mutate({
+  const result = await getClient().mutate({
     mutation: gql`mutation changePassword($oldPassword: HashedPassword!, $newPassword: HashedPassword!) {
       changePassword(oldPassword: $oldPassword, newPassword: $newPassword) {
         success

client/src/createUser.js

@@ -1,27 +1,33 @@
 import hashPassword from './hashPassword'
 import gql from 'graphql-tag'
-import {storeLoginToken} from './store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from './store'
 
-export default async function ({username, email, password, profile}, apollo) {
-  const result = await apollo.mutate({
-    mutation: gql`
-    mutation createUser ($username: String, $email: String, $password: HashedPassword!, $profile: CreateUserProfileInput) {
-      createUser (username: $username, email: $email, password: $password, profile: $profile) {
-        id
-        token
-        tokenExpires
+export default async function ({username, email, password, profile}) {
+  startLoggingIn()
+  let result
+  try {
+    result = await getClient().mutate({
+      mutation: gql`
+      mutation createUser ($username: String, $email: String, $password: HashedPassword!, $profile: CreateUserProfileInput) {
+        createUser (username: $username, email: $email, password: $password, profile: $profile) {
+          id
+          token
+          tokenExpires
+        }
       }
-    }
-    `,
-    variables: {
-      username,
-      email,
-      password: hashPassword(password),
-      profile
-    }
-  })
+      `,
+      variables: {
+        username,
+        email,
+        password: hashPassword(password),
+        profile
+      }
+    })
+  } catch (err) {
+    return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
+  }
 
-  const {id, token, tokenExpires} = result.data.createUser
-  await storeLoginToken(id, token, new Date(tokenExpires))
-  return id
+  return handleLoginCallback(null, result.data.createUser)
 }

client/src/forgotPassword.js

@@ -1,7 +1,8 @@
 import gql from 'graphql-tag'
+import {getClient} from './store'
 
-export default async function ({email}, apollo) {
-  const result = await apollo.mutate({
+export default async function ({email}) {
+  const result = await getClient().mutate({
     mutation: gql`mutation forgotPassword($email: String!) {
       forgotPassword(email: $email) {
         success

client/src/index.js

@@ -11,13 +11,22 @@ import loginWithFacebook from './oauth/loginWithFacebook'
 import loginWithGoogle from './oauth/loginWithGoogle'
 import loginWithLinkedIn from './oauth/loginWithLinkedIn'
 import userId from './userId'
-import {onTokenChange, getLoginToken, setTokenStore} from './store'
+import {
+  initWithClient,
+  setTokenStore,
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
+  TOKEN_EXPIRES_KEY,
+  TOKEN_KEY,
+  USER_ID_KEY,
+} from './store'
 
 export {
   changePassword,
   createUser,
   forgotPassword,
-  getLoginToken,
   hashPassword,
   loginWithPassword,
   logout,
@@ -27,7 +36,38 @@ export {
   loginWithFacebook,
   loginWithGoogle,
   loginWithLinkedIn,
-  onTokenChange,
+  userId,
+  initWithClient,
+  setTokenStore,
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
+  TOKEN_EXPIRES_KEY,
+  TOKEN_KEY,
+  USER_ID_KEY,
+}
+
+export default {
+  changePassword,
+  createUser,
+  forgotPassword,
+  loginWithPassword,
+  logout,
+  resendVerificationEmail,
+  resetPassword,
+  verifyEmail,
+  loginWithFacebook,
+  loginWithGoogle,
+  loginWithLinkedIn,
+  userId,
+  initWithClient,
   setTokenStore,
-  userId
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
+  TOKEN_EXPIRES_KEY,
+  TOKEN_KEY,
+  USER_ID_KEY,
 }

client/src/loginWithPassword.js

@@ -1,26 +1,32 @@
 import hashPassword from './hashPassword'
 import gql from 'graphql-tag'
-import {storeLoginToken} from './store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from './store'
 
-export default async function ({username, email, password}, apollo) {
-  const result = await apollo.mutate({
-    mutation: gql`
-    mutation login ($username: String, $email: String, $password: HashedPassword!) {
-      loginWithPassword (username: $username, email: $email, password: $password) {
-        id
-        token
-        tokenExpires
+export default async function ({username, email, password}) {
+  startLoggingIn()
+  let result
+  try {
+    result = await getClient().mutate({
+      mutation: gql`
+      mutation login ($username: String, $email: String, $password: HashedPassword!) {
+        loginWithPassword (username: $username, email: $email, password: $password) {
+          id
+          token
+          tokenExpires
+        }
       }
-    }
-    `,
-    variables: {
-      username,
-      email,
-      password: hashPassword(password)
-    }
-  })
+      `,
+      variables: {
+        username,
+        email,
+        password: hashPassword(password)
+      }
+    })
+  } catch (err) {
+    return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
+  }
 
-  const {id, token, tokenExpires} = result.data.loginWithPassword
-  await storeLoginToken(id, token, new Date(tokenExpires))
-  return id
+  return handleLoginCallback(null, result.data.loginWithPassword)
 }

client/src/logout.js

@@ -1,8 +1,8 @@
-import {getLoginToken, resetStore} from './store'
 import gql from 'graphql-tag'
+import {getLoginToken, handleLogout, getClient} from './store'
 
-export default async function (apollo) {
-  const result = await apollo.mutate({
+export default async function () {
+  const result = await getClient().mutate({
     mutation: gql`
     mutation logout($token: String!) {
       logout(token: $token) {
@@ -11,10 +11,10 @@ export default async function (apollo) {
     }
     `,
     variables: {
-      token: await getLoginToken()
+      token: getLoginToken()
     }
   })
 
-  await resetStore()
+  await handleLogout()
   return result.data.logout.success
 }

client/src/oauth/loginWithFacebook.js

@@ -1,28 +1,34 @@
 import gql from 'graphql-tag'
-import {storeLoginToken} from '../store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from '../store'
 
 /**
  * Pass the accessToken
  * It's recommended to use https://github.com/keppelen/react-facebook-login
  */
 
-export default async function ({accessToken}, apollo) {
-  const result = await apollo.mutate({
-    mutation: gql`
-    mutation loginWithFacebook ($accessToken: String!) {
-      loginWithFacebook (accessToken: $accessToken) {
-        id
-        token
-        tokenExpires
+export default async function ({accessToken}) {
+  startLoggingIn()
+  let result
+  try {
+    result = await getClient().mutate({
+      mutation: gql`
+      mutation loginWithFacebook ($accessToken: String!) {
+        loginWithFacebook (accessToken: $accessToken) {
+          id
+          token
+          tokenExpires
+        }
       }
-    }
-    `,
-    variables: {
-      accessToken
-    }
-  })
+      `,
+      variables: {
+        accessToken
+      }
+    })
+  } catch (err) {
+    return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
+  }
 
-  const {id, token, tokenExpires} = result.data.loginWithFacebook
-  await storeLoginToken(id, token, new Date(tokenExpires))
-  return id
+  return handleLoginCallback(null, result.data.loginWithFacebook)
 }