On login/out, refetch queries/clear store

Author: lorensr

src/lib/withAuth.js

@@ -1,7 +1,8 @@
 import React from 'react'
 import PropTypes from 'prop-types'
 import wrapDisplayName from 'recompose/wrapDisplayName'
-import { graphql } from 'react-apollo'
+import { graphql, withApollo } from 'react-apollo'
+import { ApolloClient } from 'apollo-client'
 import gql from 'graphql-tag'
 import auth0 from 'auth0-js'
 import { initAuthHelpers, login, logout } from 'auth0-helpers'
@@ -42,10 +43,9 @@ const USER_QUERY = gql`
 `
 
 const withUser = graphql(USER_QUERY, {
-  props: ({ ownProps, data: { currentUser, loading, refetch } }) => ({
+  props: ({ ownProps, data: { currentUser, loading } }) => ({
     currentUser,
     loading,
-    refetch,
     ownProps
   })
 })
@@ -65,15 +65,15 @@ function withAuth(BaseComponent) {
       login({
         onCompleted: (e, t) => {
           e && console.log(e)
-          this.props.refetch()
+          this.props.client.reFetchObservableQueries()
           this.setState({ loggingIn: false })
         }
       })
     }
 
     logout = () => {
       logout()
-      this.props.refetch()
+      this.props.client.resetStore()
     }
 
     render() {
@@ -100,11 +100,12 @@ function withAuth(BaseComponent) {
       photo: PropTypes.string.isRequired,
       hasPurchased: PropTypes.string
     }),
-    loading: PropTypes.bool.isRequired
+    loading: PropTypes.bool.isRequired,
+    client: PropTypes.instanceOf(ApolloClient).isRequired
   }
 
   WithAuthWrapper.displayName = wrapDisplayName(BaseComponent, 'withAuth')
-  return withUser(WithAuthWrapper)
+  return withApollo(withUser(WithAuthWrapper))
 }
 
 export default withAuth