Merge pull request #753 from outoftime/log-out-saga

Logout handled by reducers

package.json

@@ -84,6 +84,7 @@
     "react-dom": "^15.4.1",
     "react-ga": "^2.1.2",
     "react-redux": "^5.0.3",
+    "reduce-reducers": "^0.1.2",
     "redux": "^3.6.0",
     "redux-actions": "^1.2.1",
     "redux-immutable": "^3.0.11",

src/actions/index.js

@@ -29,7 +29,7 @@ import {
 
 import {
   userAuthenticated,
-  logOut,
+  userLoggedOut,
 } from './user';
 
 function getCurrentPersistor(state) {
@@ -173,7 +173,7 @@ export {
   updateProjectSource,
   toggleLibrary,
   userAuthenticated,
-  logOut,
+  userLoggedOut,
   addRuntimeError,
   clearRuntimeErrors,
   minimizeComponent,

src/actions/user.js

@@ -1,20 +1,6 @@
 import {createAction} from 'redux-actions';
 import identity from 'lodash/identity';
 
-export const userAuthenticated = createAction(
-  'USER_AUTHENTICATED',
-  identity,
-);
+export const userAuthenticated = createAction('USER_AUTHENTICATED', identity);
 
-const resetWorkspace = createAction('RESET_WORKSPACE', identity);
-
-const userLoggedOut = createAction('USER_LOGGED_OUT');
-
-export function logOut() {
-  return (dispatch, getState) => {
-    const currentProjectKey =
-      getState().getIn(['currentProject', 'projectKey']);
-    dispatch(resetWorkspace({currentProjectKey}));
-    dispatch(userLoggedOut());
-  };
-}
+export const userLoggedOut = createAction('USER_LOGGED_OUT');

src/components/Workspace.jsx

@@ -34,7 +34,7 @@ import {
   createProject,
   updateProjectSource,
   userAuthenticated,
-  logOut,
+  userLoggedOut,
   toggleLibrary,
   minimizeComponent,
   maximizeComponent,
@@ -291,7 +291,7 @@ class Workspace extends React.Component {
     onSignedIn(userCredential =>
       this.props.dispatch(userAuthenticated(userCredential)),
     );
-    onSignedOut(() => this.props.dispatch(logOut()));
+    onSignedOut(() => this.props.dispatch(userLoggedOut()));
   }
 
   _handleStartLogIn() {

src/reducers/index.js

@@ -1,13 +1,14 @@
 import {combineReducers} from 'redux-immutable';
+import reduceReducers from 'reduce-reducers';
 import user from './user';
-import projects from './projects';
+import projects, {reduceRoot as reduceRootForProjects} from './projects';
 import currentProject from './currentProject';
 import errors from './errors';
 import runtimeErrors from './runtimeErrors';
 import ui from './ui';
 import clients from './clients';
 
-const reducers = combineReducers({
+const reduceRoot = combineReducers({
   user,
   projects,
   currentProject,
@@ -17,4 +18,7 @@ const reducers = combineReducers({
   clients,
 });
 
-export default reducers;
+export default reduceReducers(
+  reduceRoot,
+  reduceRootForProjects,
+);

src/reducers/projects.js

@@ -64,7 +64,29 @@ function importGist(state, projectKey, gistData) {
   );
 }
 
-export default function projects(stateIn, action) {
+export function reduceRoot(stateIn, action) {
+  return stateIn.update('projects', (projects) => {
+    switch (action.type) {
+      case 'USER_LOGGED_OUT':
+        {
+          const currentProjectKey =
+            stateIn.getIn(['currentProject', 'projectKey']);
+
+          if (isNil(currentProjectKey)) {
+            return new Immutable.Map();
+          }
+
+          return new Immutable.Map().set(
+            currentProjectKey,
+            projects.get(currentProjectKey),
+          );
+        }
+    }
+    return projects;
+  });
+}
+
+export default function reduceProjects(stateIn, action) {
   let state;
 
   if (stateIn === undefined) {
@@ -95,16 +117,6 @@ export default function projects(stateIn, action) {
     case 'CHANGE_CURRENT_PROJECT':
       return removePristineExcept(state, action.payload.projectKey);
 
-    case 'RESET_WORKSPACE':
-      if (isNil(action.payload.currentProjectKey)) {
-        return emptyMap;
-      }
-
-      return new Immutable.Map().set(
-        action.payload.currentProjectKey,
-        state.get(action.payload.currentProjectKey),
-      );
-
     case 'GIST_IMPORTED':
       return importGist(
         state,

src/reducers/ui.js

@@ -108,11 +108,14 @@ function ui(stateIn, action) {
         ),
       );
 
-    case 'RESET_WORKSPACE':
-      return state.setIn(
-        ['dashboard', 'activeSubmenu'],
-        null,
-      );
+    case 'USER_LOGGED_OUT':
+      if (state.getIn(['dashboard', 'activeSubmenu']) === 'projectList') {
+        return state.setIn(
+          ['dashboard', 'activeSubmenu'],
+          null,
+        );
+      }
+      return state;
 
     default:
       return state;

test/unit/reducers/projects.js

@@ -7,14 +7,17 @@ import Immutable from 'immutable';
 import reducerTest from '../../helpers/reducerTest';
 import {projects as states} from '../../helpers/referenceStates';
 import {gistData, project} from '../../helpers/factory';
-import reducer from '../../../src/reducers/projects';
+import reducer, {
+  reduceRoot as rootReducer,
+} from '../../../src/reducers/projects';
 import {
   changeCurrentProject,
   gistImported,
   projectCreated,
   projectLoaded,
   projectSourceEdited,
 } from '../../../src/actions/projects';
+import {userLoggedOut} from '../../../src/actions/user';
 
 const now = Date.now();
 const projectKey = '12345';
@@ -136,6 +139,18 @@ tap(project(), projectIn =>
   )),
 );
 
+tap(initProjects({1: true, 2: true}), projects =>
+  test('userLoggedOut', reducerTest(
+    rootReducer,
+    Immutable.fromJS({currentProject: {projectKey: '1'}, projects}),
+    userLoggedOut,
+    Immutable.fromJS({
+      currentProject: {projectKey: '1'},
+      projects: projects.take(1),
+    }),
+  )),
+);
+
 function initProjects(map = {}) {
   return reduce(map, (projectsIn, modified, key) => {
     const projects = reducer(projectsIn, projectCreated(key));

test/unit/reducers/ui.js

@@ -7,7 +7,7 @@ import {
   gistNotFound,
   gistImportError,
 } from '../../../src/actions/projects';
-
+import {userLoggedOut} from '../../../src/actions/user';
 
 const initialState = Immutable.fromJS({
   editors: {typing: false},
@@ -49,3 +49,26 @@ test('gistImportError', reducerTest(
     })),
   ),
 ));
+
+test('userLoggedOut', (t) => {
+  const libraryPickerOpen = initialState.setIn(
+    ['dashboard', 'activeSubmenu'],
+    'libraryPicker',
+  );
+  t.test('with active submenu that is not projects', reducerTest(
+    reducer,
+    libraryPickerOpen,
+    userLoggedOut,
+    libraryPickerOpen,
+  ));
+
+  t.test('with projectList active submenu', reducerTest(
+    reducer,
+    initialState.setIn(
+      ['dashboard', 'activeSubmenu'],
+      'projectList',
+    ),
+    userLoggedOut,
+    initialState,
+  ));
+});

test/unit/reducers/user.js

@@ -5,21 +5,30 @@ import reducerTest from '../../helpers/reducerTest';
 import {user as states} from '../../helpers/referenceStates';
 import {userCredential} from '../../helpers/factory';
 import reducer from '../../../src/reducers/user';
-import {userAuthenticated} from '../../../src/actions/user';
+import {userAuthenticated, userLoggedOut} from '../../../src/actions/user';
 
 const userCredentialIn = userCredential();
 
+const loggedInState = Immutable.fromJS({
+  authenticated: true,
+  id: userCredentialIn.user.uid,
+  displayName: userCredentialIn.user.providerData[0].displayName,
+  avatarUrl: userCredentialIn.user.providerData[0].photoURL,
+  accessTokens: {
+    'github.com': userCredentialIn.credential.accessToken,
+  },
+});
+
 test('userAuthenticated', reducerTest(
   reducer,
   states.initial,
   partial(userAuthenticated, userCredentialIn),
-  Immutable.fromJS({
-    authenticated: true,
-    id: userCredentialIn.user.uid,
-    displayName: userCredentialIn.user.providerData[0].displayName,
-    avatarUrl: userCredentialIn.user.providerData[0].photoURL,
-    accessTokens: {
-      'github.com': userCredentialIn.credential.accessToken,
-    },
-  }),
+  loggedInState,
+));
+
+test('userLoggedOut', reducerTest(
+  reducer,
+  loggedInState,
+  userLoggedOut,
+  states.initial,
 ));

yarn.lock

@@ -6515,7 +6515,7 @@ reduce-function-call@^1.0.1:
   dependencies:
     balanced-match "^0.4.2"
 
-reduce-reducers@^0.1.0:
+reduce-reducers@^0.1.0, reduce-reducers@^0.1.2:
   version "0.1.2"
   resolved "https://registry.yarnpkg.com/reduce-reducers/-/reduce-reducers-0.1.2.tgz#fa1b4718bc5292a71ddd1e5d839c9bea9770f14b"