diff --git a/src/components/Topbar/Topbar.js b/src/components/Topbar/Topbar.js index d4ac0c34..7b0fbaf8 100644 --- a/src/components/Topbar/Topbar.js +++ b/src/components/Topbar/Topbar.js @@ -9,7 +9,6 @@ import { withFlattenedRoutes, withViewport } from '../../util/contextHelpers'; import { parse, stringify } from '../../util/urlHelpers'; import { createResourceLocatorString, pathByRouteName } from '../../util/routes'; import * as propTypes from '../../util/propTypes'; -import { clearUserId } from '../../util/log'; import { Button, IconEmailAttention, @@ -146,9 +145,6 @@ class TopbarComponent extends Component { window.location = path; } - // clear user id from logger - clearUserId(); - // TODO: show flash message console.log('logged out'); // eslint-disable-line }); diff --git a/src/containers/CheckoutPage/CheckoutPage.duck.js b/src/containers/CheckoutPage/CheckoutPage.duck.js index 2a8fb446..d1b1fe88 100644 --- a/src/containers/CheckoutPage/CheckoutPage.duck.js +++ b/src/containers/CheckoutPage/CheckoutPage.duck.js @@ -119,8 +119,8 @@ export const initiateOrder = params => return orderId; }) .catch(e => { - dispatch(logError(e, 'initiate-order-failed')); dispatch(initiateOrderError(e)); + dispatch(logError(e, 'initiate-order-failed')); throw e; }); }; diff --git a/src/containers/SalePage/SalePage.duck.js b/src/containers/SalePage/SalePage.duck.js index ca7825a1..6f3ccf48 100644 --- a/src/containers/SalePage/SalePage.duck.js +++ b/src/containers/SalePage/SalePage.duck.js @@ -144,13 +144,13 @@ export const acceptSale = id => return response; }) .catch(e => { + dispatch(acceptSaleError(e)); dispatch( logError(e, 'accept-sale-failed', { txId: id, transition: propTypes.TX_TRANSITION_ACCEPT, }) ); - dispatch(acceptSaleError(e)); throw e; }); }; @@ -171,13 +171,13 @@ export const rejectSale = id => return response; }) .catch(e => { + dispatch(rejectSaleError(e)); dispatch( logError(e, 'redect-sale-failed', { txId: id, transition: propTypes.TX_TRANSITION_REJECT, }) ); - dispatch(rejectSaleError(e)); throw e; }); }; diff --git a/src/ducks/Auth.duck.js b/src/ducks/Auth.duck.js index 22791717..af0f37b2 100644 --- a/src/ducks/Auth.duck.js +++ b/src/ducks/Auth.duck.js @@ -1,5 +1,6 @@ import { clearCurrentUser, fetchCurrentUser } from './user.duck'; import { logError } from './log.duck'; +import * as log from '../util/log'; const authenticated = authInfo => authInfo.grantType === 'refresh_token'; @@ -157,7 +158,10 @@ export const logout = () => .logout() .then(() => dispatch(clearCurrentUser())) .then(() => dispatch(logoutSuccess())) - .then(() => dispatch(userLogout())) + .then(() => { + dispatch(userLogout()); + log.clearUserId(); + }) .catch(e => dispatch(logoutError(e))); }; @@ -176,7 +180,7 @@ export const signup = params => .then(() => dispatch(signupSuccess())) .then(() => dispatch(login(email, password))) .catch(e => { - dispatch(logError(e, 'signup-failed')); dispatch(signupError(e)); + dispatch(logError(e, 'signup-failed')); }); }; diff --git a/src/ducks/log.duck.js b/src/ducks/log.duck.js index 1eaf9df6..147d6ae0 100644 --- a/src/ducks/log.duck.js +++ b/src/ducks/log.duck.js @@ -1,6 +1,6 @@ /** - * A utility duck file that can be used to pass - * error data to a logger. + * A utility duck file that allows logger to be + * used with Redux's `dispatch` function. */ import * as log from '../util/log'; diff --git a/src/ducks/user.duck.js b/src/ducks/user.duck.js index 44f3a296..9eb994e4 100644 --- a/src/ducks/user.duck.js +++ b/src/ducks/user.duck.js @@ -1,8 +1,8 @@ import { authInfo } from './Auth.duck'; import { updatedEntities, denormalisedEntities } from '../util/data'; import { TX_TRANSITION_PREAUTHORIZE } from '../util/propTypes'; -import { setUserId } from '../util/log'; import { logError } from './log.duck'; +import * as log from '../util/log'; // ================ Action types ================ // @@ -340,7 +340,7 @@ export const fetchCurrentUser = () => const denormalised = denormalisedEntities(entities, 'current-user', [currentUserId]); const currentUser = denormalised[0]; // set current user id to the logger - setUserId(currentUser.id.uuid); + log.setUserId(currentUser.id.uuid); dispatch(currentUserShowSuccess(currentUser)); return currentUser; }) @@ -379,8 +379,8 @@ export const createStripeAccount = payoutDetails => dispatch(stripeAccountCreateSuccess(accountResponse)); }) .catch(e => { - dispatch(logError(e, 'create-stripe-account-failed')); dispatch(stripeAccountCreateError(e)); + dispatch(logError(e, 'create-stripe-account-failed')); throw e; }); };