Fix double call to demos sagas

src/modules/demos.js

@@ -175,10 +175,10 @@ export function *watchEndDemoSession() {
     yield take(END_DEMO_SESSION);
     const demoState = yield select(demoSelector);
     try {
-      yield call(api.endDemo, demoState.guid, demoState.token);
+      yield call(api.endDemo, demoState.guid);
     }
     catch (error) {
-      console.log('ERROR DURING LOGOUT: probably because we are calling logout twice. BUG');
+      console.log('Error during logout', error);
     }
     window.localStorage.removeItem('savedGuid');
     yield put(push('/'));

src/services/index.js

@@ -11,7 +11,12 @@ export const callApi = (endpoint, {
     method,
     body: JSON.stringify(body),
   })
-  .then(response => response.json().then(json => ({ json, response })))
+  .then(response => {
+    if (response.status === 204) { // good response but no content
+      return { json: { status: 204, statusText: 'no content' }, response };
+    }
+    return response.json().then(json => ({ json, response }));
+  })
   .then(({ json, response }) => {
     if (!response.ok) {
       console.log(`Error calling URL : ${apiUrl}`);
@@ -28,9 +33,8 @@ export const createDemo = () =>
 
 export const getDemo = guid => callApi(`demos/${guid}`);
 
-export const endDemo = (guid, token) =>
+export const endDemo = (guid) =>
   callApi(`demos/${guid}`, {
-    headers: { Authorization: `Bearer ${token}` },
     method: 'DELETE',
   });
 

src/store/createStore.js

@@ -1,8 +1,9 @@
 import { applyMiddleware, compose, createStore } from 'redux';
 import { routerMiddleware } from 'react-router-redux';
 import createSagaMiddleware from 'redux-saga';
+import { sagas as demosSagas } from 'modules/demos';
 import makeRootReducer from './reducers';
-import makeRootSaga from './sagas';
+import { makeRootSaga, injectSagas } from './sagas';
 
 export default (initialState = {}, history) => {
   // ======================================================
@@ -40,6 +41,9 @@ export default (initialState = {}, history) => {
   };
   store.runSaga(makeRootSaga(store.asyncSagas));
 
+  // inject the base sagas to login/logout of a demo session
+  injectSagas(store, { key: 'demos', sagas: demosSagas });
+
   if (module.hot) {
     module.hot.accept('./reducers', () => {
       const reducers = require('./reducers').default;

src/store/sagas.js

@@ -1,10 +1,7 @@
 import { fork } from 'redux-saga/effects';
 
-const demosSagas = require('modules/demos').sagas;
-
 export const makeRootSaga = asyncSagas => function *rootSaga() {
   yield [
-    ...demosSagas,
     ...asyncSagas,
   ].map(saga => fork(saga));
 };