From 672d1ee19ecc3fdfbc4ead923e5fe69ad0b72fe3 Mon Sep 17 00:00:00 2001 From: David Jay Date: Thu, 19 Jan 2017 13:39:46 -0500 Subject: [PATCH] Updating store to include auth and apollo. --- client/coral-framework/actions/auth.js | 13 ++++++++----- client/coral-framework/store.js | 11 +++++++---- 2 files changed, 15 insertions(+), 9 deletions(-) diff --git a/client/coral-framework/actions/auth.js b/client/coral-framework/actions/auth.js index 0f65e14c2..31a8a728a 100644 --- a/client/coral-framework/actions/auth.js +++ b/client/coral-framework/actions/auth.js @@ -20,17 +20,20 @@ export const cleanState = () => ({type: actions.CLEAN_STATE}); // Sign In Actions const signInRequest = () => ({type: actions.FETCH_SIGNIN_REQUEST}); -const signInSuccess = (user, isAdmin) => ({type: actions.FETCH_SIGNIN_SUCCESS, user, isAdmin}); + +// const signInSuccess = (user, isAdmin) => ({type: actions.FETCH_SIGNIN_SUCCESS, user, isAdmin}); const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error}); export const fetchSignIn = (formData) => (dispatch) => { dispatch(signInRequest()); coralApi('/auth/local', {method: 'POST', body: formData}) - .then(({user}) => { - const isAdmin = !!user.roles.filter(i => i === 'admin').length; - dispatch(signInSuccess(user, isAdmin)); + .then(() => { + + // const isAdmin = !!user.roles.filter(i => i === 'admin').length; + // dispatch(signInSuccess(user, isAdmin)); dispatch(hideSignInDialog()); - dispatch(addItem(user, 'users')); + + // dispatch(addItem(user, 'users')); }) .catch(() => dispatch(signInFailure(lang.t('error.emailPasswordError')))); }; diff --git a/client/coral-framework/store.js b/client/coral-framework/store.js index cad05505c..766ed5b92 100644 --- a/client/coral-framework/store.js +++ b/client/coral-framework/store.js @@ -1,11 +1,14 @@ -import {createStore, applyMiddleware, compose} from 'redux'; +import {createStore, combineReducers, applyMiddleware, compose} from 'redux'; import thunk from 'redux-thunk'; -import mainReducer from './reducers'; +import authReducer from './reducers/auth'; import {client} from './client'; export default createStore( - client.reducer(), - mainReducer, + combineReducers({ + auth: authReducer, + apollo: client.reducer() + }), + {}, compose( window.devToolsExtension && window.devToolsExtension(), applyMiddleware(thunk)