moon
/
soapbox
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Refactor persistState()

This commit is contained in:
Alex Gleason 2021-03-29 20:03:27 -05:00
parent aa7e62e8c0
commit 8e84c83fdc
No known key found for this signature in database
GPG Key ID: 7211D1F99744FBB7
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
app/soapbox/reducers/auth.js
View File

@ -16,6 +16,7 @@ const defaultState = ImmutableMap({
me: null, me: null,
}); });
const sessionUser = sessionStorage.getItem('soapbox:auth:me');
const localState = fromJS(JSON.parse(localStorage.getItem('soapbox:auth'))); const localState = fromJS(JSON.parse(localStorage.getItem('soapbox:auth')));
// If `me` doesn't match an existing user, attempt to shift it. // If `me` doesn't match an existing user, attempt to shift it.
@ -30,15 +31,7 @@ const maybeShiftMe = state => {
} }
}; };
const setSessionUser = state => { const setSessionUser = state => state.update('me', null, me => sessionUser || me);
const sessionUser = sessionStorage.getItem('soapbox:auth:me');
if (sessionUser) {
return state.set('me', sessionUser);
} else {
sessionStorage.setItem('soapbox:auth:me', state.get('me', null));
return state;
}
};
// Upgrade the initial state // Upgrade the initial state
const migrateLegacy = state => { const migrateLegacy = state => {
@ -61,15 +54,21 @@ const migrateLegacy = state => {
}); });
}; };
const persistState = state => {
localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
sessionStorage.setItem('soapbox:auth:me', state.get('me'));
};
const initialize = state => { const initialize = state => {
return state.withMutations(state => { return state.withMutations(state => {
maybeShiftMe(state); maybeShiftMe(state);
setSessionUser(state); setSessionUser(state);
migrateLegacy(state); migrateLegacy(state);
persistState(state);
}); });
}; };
const initialState = defaultState.merge(localState).withMutations(initialize); const initialState = initialize(defaultState.merge(localState));
const importToken = (state, token) => { const importToken = (state, token) => {
return state.setIn(['tokens', token.access_token], fromJS(token)); return state.setIn(['tokens', token.access_token], fromJS(token));
@ -162,8 +161,7 @@ export default function auth(oldState = initialState, action) {
// Persist the state in localStorage // Persist the state in localStorage
if (!state.equals(oldState)) { if (!state.equals(oldState)) {
localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS())); persistState(state);
sessionStorage.setItem('soapbox:auth:me', state.get('me'));
// Reload the page under some conditions // Reload the page under some conditions
maybeReload(oldState, state, action); maybeReload(oldState, state, action);