scratchfoundation/scratch-www
1
0
Fork 0
mirror of https://github.com/scratchfoundation/scratch-www.git synced 2025-03-31 15:21:34 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request from technoboy10/gh548-signout

Browse source 
Fix GH-548: Sign out should take effect before reload
This commit is contained in:
Connor Hudson 2016-06-06 09:06:36 -04:00
commit 8022d76aaa
1 changed files with 3 additions and 3 deletions

6
src/redux/session.js
View file

@ -1,5 +1,5 @@
var keyMirror = require('keymirror');
var defaultsDeep = require('lodash.defaultsdeep');
var defaults = require('lodash.defaults');
var api = require('../mixins/api.jsx').api;
var tokenActions = require('./token.js');
@ -27,9 +27,9 @@ module.exports.sessionReducer = function (state, action) {
}
switch (action.type) {
case Types.SET_SESSION:
return defaultsDeep({session: action.session}, state);
return defaults({session: action.session}, state);
case Types.SET_STATUS:
return defaultsDeep({status: action.status}, state);
return defaults({status: action.status}, state);
case Types.SET_SESSION_ERROR:
// TODO: do something with action.error
return state;