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

Move session tokens list into security reducer

Browse source
This commit is contained in:
Alex Gleason 2021-03-23 21:15:47 -05:00
parent 6b8fbbff47
commit 60a3a5b403
No known key found for this signature in database
GPG key ID: 7211D1F99744FBB7
4 changed files with 25 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
app/soapbox/features/security/index.js
View file

@ -63,9 +63,8 @@ const messages = defineMessages({
}); });
const mapStateToProps = state => ({ const mapStateToProps = state => ({
backup_codes: state.getIn(['auth', 'backup_codes', 'codes']),
settings: getSettings(state), settings: getSettings(state),
tokens: state.getIn(['auth', 'tokens']), tokens: state.getIn(['security', 'tokens']),
}); });
export default @connect(mapStateToProps) export default @connect(mapStateToProps)

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

@ -3,17 +3,14 @@ import {
AUTH_LOGGED_IN, AUTH_LOGGED_IN,
AUTH_APP_AUTHORIZED, AUTH_APP_AUTHORIZED,
AUTH_LOGGED_OUT, AUTH_LOGGED_OUT,
FETCH_TOKENS_SUCCESS,
REVOKE_TOKEN_SUCCESS,
SWITCH_ACCOUNT, SWITCH_ACCOUNT,
} from '../actions/auth'; } from '../actions/auth';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable'; import { Map as ImmutableMap, fromJS } from 'immutable';
const initialState = ImmutableMap({ const initialState = ImmutableMap({
app: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:app'))), app: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:app'))),
users: fromJS(JSON.parse(localStorage.getItem('soapbox:auth:users'))), users: fromJS(JSON.parse(localStorage.getItem('soapbox:auth:users'))),
me: localStorage.getItem('soapbox:auth:me'), me: localStorage.getItem('soapbox:auth:me'),
tokens: ImmutableList(),
}); });
export default function auth(state = initialState, action) { export default function auth(state = initialState, action) {
@ -30,11 +27,6 @@ export default function auth(state = initialState, action) {
case AUTH_LOGGED_OUT: case AUTH_LOGGED_OUT:
localStorage.removeItem('soapbox:auth:user'); localStorage.removeItem('soapbox:auth:user');
return state.set('user', ImmutableMap()); return state.set('user', ImmutableMap());
case FETCH_TOKENS_SUCCESS:
return state.set('tokens', fromJS(action.tokens));
case REVOKE_TOKEN_SUCCESS:
const idx = state.get('tokens').findIndex(t => t.get('id') === action.id);
return state.deleteIn(['tokens', idx]);
case SWITCH_ACCOUNT: case SWITCH_ACCOUNT:
localStorage.setItem('soapbox:auth:me', action.accountId); localStorage.setItem('soapbox:auth:me', action.accountId);
location.reload(); location.reload();

2
app/soapbox/reducers/index.js
View file

@ -51,6 +51,7 @@ import chat_message_lists from './chat_message_lists';
import profile_hover_card from './profile_hover_card'; import profile_hover_card from './profile_hover_card';
import backups from './backups'; import backups from './backups';
import admin_log from './admin_log'; import admin_log from './admin_log';
import security from './security';
const appReducer = combineReducers({ const appReducer = combineReducers({
dropdown_menu, dropdown_menu,
@ -103,6 +104,7 @@ const appReducer = combineReducers({
profile_hover_card, profile_hover_card,
backups, backups,
admin_log, admin_log,
security,
}); });
// Clear the state (mostly) when the user logs out // Clear the state (mostly) when the user logs out

21
app/soapbox/reducers/security.js Normal file
View file

@ -0,0 +1,21 @@
import {
FETCH_TOKENS_SUCCESS,
REVOKE_TOKEN_SUCCESS,
} from '../actions/auth';
import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
const initialState = ImmutableMap({
tokens: ImmutableList(),
});
export default function security(state = initialState, action) {
switch(action.type) {
case FETCH_TOKENS_SUCCESS:
return state.set('tokens', fromJS(action.tokens));
case REVOKE_TOKEN_SUCCESS:
const idx = state.get('tokens').findIndex(t => t.get('id') === action.id);
return state.deleteIn(['tokens', idx]);
default:
return state;
}
};