Add login hooks and store userId in memory

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/createUser.js

@@ -1,8 +1,9 @@
 import hashPassword from './hashPassword'
 import gql from 'graphql-tag'
-import {handleLoginCallback, getClient} from './store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from './store'
 
 export default async function ({username, email, password, profile}) {
+  startLoggingIn()
   let result
   try {
     result = await getClient().mutate({
@@ -24,6 +25,8 @@ export default async function ({username, email, password, profile}) {
     })
   } catch (err) {
     return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
   }
 
   return handleLoginCallback(null, result.data.createUser)

client/src/index.js

@@ -14,10 +14,13 @@ import userId from './userId'
 import {
   initWithClient,
   setTokenStore,
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
   TOKEN_EXPIRES_KEY,
   TOKEN_KEY,
   USER_ID_KEY,
-  onTokenChange
 } from './store'
 
 export {
@@ -33,10 +36,13 @@ export {
   loginWithFacebook,
   loginWithGoogle,
   loginWithLinkedIn,
-  onTokenChange,
   userId,
   initWithClient,
   setTokenStore,
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
   TOKEN_EXPIRES_KEY,
   TOKEN_KEY,
   USER_ID_KEY,
@@ -54,10 +60,13 @@ export default {
   loginWithFacebook,
   loginWithGoogle,
   loginWithLinkedIn,
-  onTokenChange,
   userId,
   initWithClient,
   setTokenStore,
+  onLogin,
+  onLoginFailure,
+  onLogout,
+  loggingIn,
   TOKEN_EXPIRES_KEY,
   TOKEN_KEY,
   USER_ID_KEY,

client/src/loginWithPassword.js

@@ -1,8 +1,9 @@
 import hashPassword from './hashPassword'
 import gql from 'graphql-tag'
-import {handleLoginCallback, getClient} from './store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from './store'
 
 export default async function ({username, email, password}) {
+  startLoggingIn()
   let result
   try {
     result = await getClient().mutate({
@@ -23,6 +24,8 @@ export default async function ({username, email, password}) {
     })
   } catch (err) {
     return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
   }
 
   return handleLoginCallback(null, result.data.loginWithPassword)

client/src/logout.js

@@ -1,5 +1,5 @@
 import gql from 'graphql-tag'
-import {getLoginToken, resetStore, getClient} from './store'
+import {getLoginToken, handleLogout, getClient} from './store'
 
 export default async function () {
   const result = await getClient().mutate({
@@ -15,6 +15,6 @@ export default async function () {
     }
   })
 
-  await resetStore()
+  await handleLogout()
   return result.data.logout.success
 }

client/src/oauth/loginWithFacebook.js

@@ -1,12 +1,13 @@
 import gql from 'graphql-tag'
-import {handleLoginCallback, getClient} 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}) {
+  startLoggingIn()
   let result
   try {
     result = await getClient().mutate({
@@ -25,6 +26,8 @@ export default async function ({accessToken}) {
     })
   } catch (err) {
     return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
   }
 
   return handleLoginCallback(null, result.data.loginWithFacebook)

client/src/oauth/loginWithGoogle.js

@@ -1,12 +1,13 @@
 import gql from 'graphql-tag'
-import {handleLoginCallback, getClient} from '../store'
+import {handleLoginCallback, getClient, startLoggingIn, endLoggingIn} from '../store'
 
 /**
  * Pass the accessToken
  * It's recommended to use https://github.com/anthonyjgrove/react-google-login
  */
 
 export default async function ({accessToken}) {
+  startLoggingIn()
   let result
   try {
     result = await getClient().mutate({
@@ -25,6 +26,8 @@ export default async function ({accessToken}) {
     })
   } catch (err) {
     return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
   }
 
   return handleLoginCallback(null, result.data.loginWithGoogle)

client/src/oauth/loginWithLinkedIn.js

@@ -1,12 +1,13 @@
 import gql from 'graphql-tag'
-import {handleLoginCallback, getClient} 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 ({code, redirectUri}) {
+  startLoggingIn()
   let result
   try {
     result = await getClient().mutate({
@@ -23,6 +24,8 @@ export default async function ({code, redirectUri}) {
     })
   } catch (err) {
     return handleLoginCallback(err)
+  } finally {
+    endLoggingIn()
   }
 
   return handleLoginCallback(null, result.data.loginWithLinkedIn)

client/src/store.js

@@ -1,9 +1,12 @@
+import Events from './Events'
 
-const onChangeCallbacks = []
 export const USER_ID_KEY = 'Meteor.userId'
 export const TOKEN_KEY = 'Meteor.loginToken'
 export const TOKEN_EXPIRES_KEY = 'Meteor.loginTokenExpires'
 
+let _tokenSaved
+let _userIdSaved
+let _isLoggingIn = true
 let apollo
 
 let tokenStore = {
@@ -18,6 +21,11 @@ let tokenStore = {
       token: global.localStorage[TOKEN_KEY],
       tokenExpires: global.localStorage[TOKEN_EXPIRES_KEY]
     }
+  },
+  remove: async function () {
+    global.localStorage.removeItem(USER_ID_KEY)
+    global.localStorage.removeItem(TOKEN_KEY)
+    global.localStorage.removeItem(TOKEN_EXPIRES_KEY)
   }
 }
 
@@ -40,39 +48,51 @@ export const handleLoginCallback = async function (err, loginMethodResponse) {
   if (!err) { // save user id and token
     const {id, token, tokenExpires} = loginMethodResponse
     await _storeLoginToken(id, token, new Date(tokenExpires))
+    _tokenSaved = token
+    _userIdSaved = id
+    Events.notify('onLogin')
     return id
   } else {
-    resetStore()
+    Events.notify('onLoginFailure')
+    handleLogout()
     return Promise.reject(err)
   }
 }
 
+export const handleLogout = async function () {
+  await tokenStore.remove()
+  _tokenSaved = null
+  _userIdSaved = null
+  Events.notify('onLogout')
+}
+
 export const _storeLoginToken = async function (userId, token, tokenExpires) {
   await tokenStore.set({userId, token, tokenExpires})
-  await tokenDidChange()
 }
 
-export const getLoginToken = async function () {
-  const {token} = await tokenStore.get()
-  return token
+export const loggingIn = function () {
+  return _isLoggingIn
 }
 
-export const getUserId = async function () {
-  const {userId} = await tokenStore.get()
-  return userId
+export const onLogin = function (cb) {
+  Events.on('onLogin', cb)
 }
 
-const tokenDidChange = async function () {
-  const newData = await tokenStore.get()
-  for (const callback of onChangeCallbacks) {
-    callback(newData)
-  }
+export const onLoginFailure = function (cb) {
+  Events.on('onLoginFailure', cb)
 }
 
-export const onTokenChange = function (callback) {
-  onChangeCallbacks.push(callback)
+export const onLogout = function (cb) {
+  Events.on('onLogout', cb)
 }
 
-export const resetStore = async function () {
-  await _storeLoginToken('', '', '')
+export const startLoggingIn = function () {
+  _isLoggingIn = true
 }
+
+export const endLoggingIn = function () {
+  _isLoggingIn = false
+}
+
+export const getLoginToken = () => _tokenSaved
+export const getUserId = () => _userIdSaved