bigbuffet/bigbuffet-rw
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'auth-fixes' into 'develop'

Browse source 
Handle invalid sessionUser. Don't store invalid sessionUser.

See merge request soapbox-pub/soapbox-fe!472
This commit is contained in:
Alex Gleason 2021-04-10 22:47:30 +00:00
commit 205926f34b
1 changed files with 17 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

19
app/soapbox/reducers/auth.js
View file

@ -16,7 +16,16 @@ const defaultState = ImmutableMap({
me: null, me: null,
}); });
const sessionUser = sessionStorage.getItem('soapbox:auth:me'); const getSessionUser = () => {
const id = sessionStorage.getItem('soapbox:auth:me');
if (id && typeof id === 'string' && id !== 'null' && id !== 'undefined') {
return id;
} else {
return undefined;
}
};
const sessionUser = getSessionUser();
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.
@ -55,7 +64,13 @@ const migrateLegacy = state => {
}; };
const persistAuth = state => localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS())); const persistAuth = state => localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
const persistSession = state => sessionStorage.setItem('soapbox:auth:me', state.get('me'));
const persistSession = state => {
const me = state.get('me');
if (me && typeof me === 'string') {
sessionStorage.setItem('soapbox:auth:me', me);
}
};
const persistState = state => { const persistState = state => {
persistAuth(state); persistAuth(state);