From 0162eac662abfbffaee7cb68754890f88b18278d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Mar 2021 19:06:55 -0500
Subject: [PATCH 01/46] Refactor auth to support multiple accounts

---
 app/soapbox/actions/auth.js                   | 31 +++++++
 app/soapbox/actions/me.js                     | 16 ++--
 app/soapbox/api.js                            | 11 ++-
 .../ui/components/profile_dropdown.js         | 91 +++++++++++++++++++
 .../features/ui/components/tabs_bar.js        |  4 +-
 app/soapbox/reducers/auth.js                  |  9 +-
 app/soapbox/reducers/me.js                    |  1 -
 app/soapbox/reducers/meta.js                  | 18 ++--
 app/styles/components/dropdown-menu.scss      |  1 -
 9 files changed, 162 insertions(+), 20 deletions(-)
 create mode 100644 app/soapbox/features/ui/components/profile_dropdown.js

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index a0bb9b9a2..26662803c 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,11 +1,17 @@
 import api from '../api';
 import snackbar from 'soapbox/actions/snackbar';
 
+export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
+
 export const AUTH_APP_CREATED    = 'AUTH_APP_CREATED';
 export const AUTH_APP_AUTHORIZED = 'AUTH_APP_AUTHORIZED';
 export const AUTH_LOGGED_IN      = 'AUTH_LOGGED_IN';
 export const AUTH_LOGGED_OUT     = 'AUTH_LOGGED_OUT';
 
+export const VERIFY_CREDENTIALS_REQUEST = 'VERIFY_CREDENTIALS_REQUEST';
+export const VERIFY_CREDENTIALS_SUCCESS = 'VERIFY_CREDENTIALS_SUCCESS';
+export const VERIFY_CREDENTIALS_FAIL    = 'VERIFY_CREDENTIALS_FAIL';
+
 export const AUTH_REGISTER_REQUEST = 'AUTH_REGISTER_REQUEST';
 export const AUTH_REGISTER_SUCCESS = 'AUTH_REGISTER_SUCCESS';
 export const AUTH_REGISTER_FAIL    = 'AUTH_REGISTER_FAIL';
@@ -127,6 +133,27 @@ export function otpVerify(code, mfa_token) {
   };
 }
 
+export function verifyCredentials(token) {
+  return (dispatch, getState) => {
+    dispatch({ type: VERIFY_CREDENTIALS_REQUEST });
+
+    const request = {
+      method: 'get',
+      url: '/api/v1/accounts/verify_credentials',
+      headers: {
+        'Authorization': `Bearer ${token.get('access_token')}`,
+      },
+    };
+
+    return api(getState).request(request).then(({ data: account }) => {
+      dispatch({ type: VERIFY_CREDENTIALS_SUCCESS, token, account });
+      return account;
+    }).catch(error => {
+      dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error });
+    });
+  };
+}
+
 export function logIn(username, password) {
   return (dispatch, getState) => {
     return dispatch(createAppAndToken()).then(() => {
@@ -161,6 +188,10 @@ export function logOut() {
   };
 }
 
+export function switchAccount(accountId) {
+  return { type: SWITCH_ACCOUNT, accountId };
+}
+
 export function register(params) {
   return (dispatch, getState) => {
     params.fullname = params.username;
diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js
index a05f2b516..c0571b27d 100644
--- a/app/soapbox/actions/me.js
+++ b/app/soapbox/actions/me.js
@@ -1,5 +1,7 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
+import { List as ImmutableList } from 'immutable';
+import { verifyCredentials } from './auth';
 
 export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
 export const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS';
@@ -10,23 +12,25 @@ export const ME_PATCH_REQUEST = 'ME_PATCH_REQUEST';
 export const ME_PATCH_SUCCESS = 'ME_PATCH_SUCCESS';
 export const ME_PATCH_FAIL    = 'ME_PATCH_FAIL';
 
-const hasToken = getState => getState().hasIn(['auth', 'user', 'access_token']);
 const noOp = () => new Promise(f => f());
 
 export function fetchMe() {
   return (dispatch, getState) => {
+    const state = getState();
 
-    if (!hasToken(getState)) {
+    const me = state.getIn(['auth', 'me']);
+    const token = state.getIn(['auth', 'users', me]);
+
+    if (!token) {
       dispatch({ type: ME_FETCH_SKIP }); return noOp();
     };
 
     dispatch(fetchMeRequest());
-
-    return api(getState).get('/api/v1/accounts/verify_credentials').then(response => {
-      dispatch(fetchMeSuccess(response.data));
+    return dispatch(verifyCredentials(token)).then(account => {
+      dispatch(fetchMeSuccess(account));
     }).catch(error => {
       dispatch(fetchMeFail(error));
-    });
+    });;
   };
 }
 
diff --git a/app/soapbox/api.js b/app/soapbox/api.js
index f65971e64..dc9be3add 100644
--- a/app/soapbox/api.js
+++ b/app/soapbox/api.js
@@ -9,8 +9,15 @@ export const getLinks = response => {
   return LinkHeader.parse(value);
 };
 
-const getToken = (getState, authType) =>
-  getState().getIn(['auth', authType, 'access_token']);
+const getToken = (getState, authType) => {
+  const state = getState();
+  if (authType === 'app') {
+    return state.getIn(['auth', 'app', 'access_token']);
+  } else {
+    const me = state.get('me');
+    return state.getIn(['auth', 'users', me, 'access_token']);
+  }
+};
 
 export default (getState, authType = 'user') => {
   const accessToken = getToken(getState, authType);
diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
new file mode 100644
index 000000000..57114f275
--- /dev/null
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -0,0 +1,91 @@
+import React from 'react';
+import { connect } from 'react-redux';
+// import { openModal } from '../../../actions/modal';
+import PropTypes from 'prop-types';
+import ImmutablePropTypes from 'react-immutable-proptypes';
+import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
+import { isStaff } from 'soapbox/utils/accounts';
+import { defineMessages, injectIntl } from 'react-intl';
+import { logOut, switchAccount } from 'soapbox/actions/auth';
+import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+
+const messages = defineMessages({
+  switch: { id: 'profile_dropdown.switch_account', defaultMessage: 'Switch to @{acct}' },
+  logout: { id: 'profile_dropdown.logout', defaultMessage: 'Log out @{acct}' },
+});
+
+const mapStateToProps = state => {
+  const me = state.get('me');
+
+  const otherAccounts =
+    state
+      .getIn(['auth', 'users'])
+      .keySeq()
+      .reduce((list, id) => {
+        if (id === me) return list;
+        const account = state.getIn(['accounts', id]) || ImmutableMap({ id: id, acct: id });
+        return list.push(account);
+      }, ImmutableList());
+
+  return {
+    account: state.getIn(['accounts', me]),
+    otherAccounts,
+    isStaff: isStaff(state.getIn(['accounts', me])),
+  };
+};
+
+class ProfileDropdown extends React.PureComponent {
+
+  static propTypes = {
+    intl: PropTypes.object.isRequired,
+    dispatch: PropTypes.func.isRequired,
+    size: PropTypes.number,
+    account: ImmutablePropTypes.map,
+    otherAccounts: ImmutablePropTypes.list,
+    isStaff: PropTypes.bool.isRequired,
+  };
+
+  static defaultProps = {
+    isStaff: false,
+  }
+
+  handleLogOut = e => {
+    this.props.dispatch(logOut());
+    e.preventDefault();
+  };
+
+  handleSwitchAccount = account => {
+    return e => {
+      this.props.dispatch(switchAccount(account.get('id')));
+      e.preventDefault();
+    };
+  }
+
+  render() {
+    const { intl, account, otherAccounts } = this.props;
+    const size = this.props.size || 16;
+
+    let menu = [];
+
+    otherAccounts.forEach(account => {
+      menu.push({ text: intl.formatMessage(messages.switch, { acct: account.get('acct') }), action: this.handleSwitchAccount(account) });
+    });
+
+    if (otherAccounts.size > 0) {
+      menu.push(null);
+    }
+
+    menu.push({ text: intl.formatMessage(messages.logout, { acct: account.get('acct') }), to: '/auth/sign_out', action: this.handleLogOut });
+
+    return (
+      <div className='compose__action-bar' style={{ 'marginTop':'-6px' }}>
+        <div className='compose__action-bar-dropdown'>
+          <DropdownMenuContainer items={menu} icon='chevron-down' size={size} direction='right' />
+        </div>
+      </div>
+    );
+  }
+
+}
+
+export default injectIntl(connect(mapStateToProps)(ProfileDropdown));
diff --git a/app/soapbox/features/ui/components/tabs_bar.js b/app/soapbox/features/ui/components/tabs_bar.js
index fa4a685f4..e11044ba7 100644
--- a/app/soapbox/features/ui/components/tabs_bar.js
+++ b/app/soapbox/features/ui/components/tabs_bar.js
@@ -8,7 +8,7 @@ import classNames from 'classnames';
 import IconWithCounter from 'soapbox/components/icon_with_counter';
 import SearchContainer from 'soapbox/features/compose/containers/search_container';
 import Avatar from '../../../components/avatar';
-import ActionBar from 'soapbox/features/compose/components/action_bar';
+import ProfileDropdown from './profile_dropdown';
 import { openModal } from '../../../actions/modal';
 import { openSidebar } from '../../../actions/sidebar';
 import Icon from '../../../components/icon';
@@ -126,7 +126,7 @@ class TabsBar extends React.PureComponent {
                 <div className='tabs-bar__profile'>
                   <Avatar account={account} />
                   <button className='tabs-bar__sidebar-btn' onClick={onOpenSidebar} />
-                  <ActionBar account={account} size={34} />
+                  <ProfileDropdown account={account} size={34} />
                 </div>
                 <button className='tabs-bar__button-compose button' onClick={onOpenCompose} aria-label={intl.formatMessage(messages.post)}>
                   <span>{intl.formatMessage(messages.post)}</span>
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 5bd996f34..9518073c5 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -5,12 +5,14 @@ import {
   AUTH_LOGGED_OUT,
   FETCH_TOKENS_SUCCESS,
   REVOKE_TOKEN_SUCCESS,
+  SWITCH_ACCOUNT,
 } from '../actions/auth';
 import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
 
 const initialState = ImmutableMap({
   app: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:app'))),
-  user: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:user'))),
+  users: fromJS(JSON.parse(localStorage.getItem('soapbox:auth:users'))),
+  me: localStorage.getItem('soapbox:auth:me'),
   tokens: ImmutableList(),
 });
 
@@ -24,7 +26,6 @@ export default function auth(state = initialState, action) {
     localStorage.setItem('soapbox:auth:app', JSON.stringify(merged)); // TODO: Better persistence
     return state.set('app', merged);
   case AUTH_LOGGED_IN:
-    localStorage.setItem('soapbox:auth:user', JSON.stringify(action.user)); // TODO: Better persistence
     return state.set('user', ImmutableMap(action.user));
   case AUTH_LOGGED_OUT:
     localStorage.removeItem('soapbox:auth:user');
@@ -34,6 +35,10 @@ export default function auth(state = initialState, action) {
   case REVOKE_TOKEN_SUCCESS:
     const idx = state.get('tokens').findIndex(t => t.get('id') === action.id);
     return state.deleteIn(['tokens', idx]);
+  case SWITCH_ACCOUNT:
+    localStorage.setItem('soapbox:auth:me', action.accountId);
+    location.reload();
+    return state;
   default:
     return state;
   }
diff --git a/app/soapbox/reducers/me.js b/app/soapbox/reducers/me.js
index a34c16541..d5304c4e4 100644
--- a/app/soapbox/reducers/me.js
+++ b/app/soapbox/reducers/me.js
@@ -16,7 +16,6 @@ export default function me(state = initialState, action) {
   case ME_FETCH_FAIL:
   case ME_FETCH_SKIP:
   case AUTH_LOGGED_OUT:
-    localStorage.removeItem('soapbox:auth:user');
     return false;
   default:
     return state;
diff --git a/app/soapbox/reducers/meta.js b/app/soapbox/reducers/meta.js
index c3f5062df..24a8977ef 100644
--- a/app/soapbox/reducers/meta.js
+++ b/app/soapbox/reducers/meta.js
@@ -1,7 +1,8 @@
 'use strict';
 
 import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from 'soapbox/actions/me';
-import { Map as ImmutableMap, fromJS } from 'immutable';
+import { VERIFY_CREDENTIALS_SUCCESS } from 'soapbox/actions/auth';
+import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
 
 const initialState = ImmutableMap();
 
@@ -10,11 +11,16 @@ export default function meta(state = initialState, action) {
   case ME_FETCH_SUCCESS:
   case ME_PATCH_SUCCESS:
     const me = fromJS(action.me);
-    if (me.has('pleroma')) {
-      const pleroPrefs = me.get('pleroma').delete('settings_store');
-      return state.mergeIn(['pleroma'], pleroPrefs);
-    }
-    return state;
+    return state.withMutations(state => {
+      state.set('me', me.get('id'));
+      state.update('users', ImmutableOrderedSet(), v => v.add(me.get('id')));
+      if (me.has('pleroma')) {
+        const pleroPrefs = me.get('pleroma').delete('settings_store');
+        state.mergeIn(['pleroma'], pleroPrefs);
+      }
+    });
+  case VERIFY_CREDENTIALS_SUCCESS:
+    return state.update('users', ImmutableOrderedSet(), v => v.add(action.account.id));
   default:
     return state;
   }
diff --git a/app/styles/components/dropdown-menu.scss b/app/styles/components/dropdown-menu.scss
index 7d51eefcf..320a7cb94 100644
--- a/app/styles/components/dropdown-menu.scss
+++ b/app/styles/components/dropdown-menu.scss
@@ -62,7 +62,6 @@
     text-decoration: none;
     text-overflow: ellipsis;
     white-space: nowrap;
-    text-transform: capitalize;
     color: var(--primary-text-color);
 
     &:focus,

From 88420ccca671bddc9d958d9b96dd8d1d32b529bb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Mar 2021 21:01:50 -0500
Subject: [PATCH 02/46] Fetch unfetched otherAccounts

---
 app/soapbox/actions/auth.js                       | 15 +++++++++++++++
 app/soapbox/actions/me.js                         |  1 -
 .../features/ui/components/profile_dropdown.js    | 15 ++++++++++++---
 3 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 26662803c..28bbfed2a 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,4 +1,6 @@
 import api from '../api';
+import { importFetchedAccount } from './importer';
+import { throttle } from 'lodash';
 import snackbar from 'soapbox/actions/snackbar';
 
 export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
@@ -146,6 +148,7 @@ export function verifyCredentials(token) {
     };
 
     return api(getState).request(request).then(({ data: account }) => {
+      dispatch(importFetchedAccount(account));
       dispatch({ type: VERIFY_CREDENTIALS_SUCCESS, token, account });
       return account;
     }).catch(error => {
@@ -192,6 +195,18 @@ export function switchAccount(accountId) {
   return { type: SWITCH_ACCOUNT, accountId };
 }
 
+export function fetchOwnAccounts() {
+  return throttle((dispatch, getState) => {
+    const state = getState();
+    state.getIn(['auth', 'users']).forEach((token, id) => {
+      const account = state.getIn(['accounts', id]);
+      if (!account) {
+        dispatch(verifyCredentials(token));
+      }
+    });
+  }, 2000);
+}
+
 export function register(params) {
   return (dispatch, getState) => {
     params.fullname = params.username;
diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js
index c0571b27d..7ccf07757 100644
--- a/app/soapbox/actions/me.js
+++ b/app/soapbox/actions/me.js
@@ -1,6 +1,5 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
-import { List as ImmutableList } from 'immutable';
 import { verifyCredentials } from './auth';
 
 export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
index 57114f275..abb257852 100644
--- a/app/soapbox/features/ui/components/profile_dropdown.js
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -1,13 +1,14 @@
 import React from 'react';
 import { connect } from 'react-redux';
 // import { openModal } from '../../../actions/modal';
+import { fetchOwnAccounts } from 'soapbox/actions/auth';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
 import { isStaff } from 'soapbox/utils/accounts';
 import { defineMessages, injectIntl } from 'react-intl';
 import { logOut, switchAccount } from 'soapbox/actions/auth';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { List as ImmutableList } from 'immutable';
 
 const messages = defineMessages({
   switch: { id: 'profile_dropdown.switch_account', defaultMessage: 'Switch to @{acct}' },
@@ -23,8 +24,8 @@ const mapStateToProps = state => {
       .keySeq()
       .reduce((list, id) => {
         if (id === me) return list;
-        const account = state.getIn(['accounts', id]) || ImmutableMap({ id: id, acct: id });
-        return list.push(account);
+        const account = state.getIn(['accounts', id]);
+        return account ? list.push(account) : list;
       }, ImmutableList());
 
   return {
@@ -61,6 +62,14 @@ class ProfileDropdown extends React.PureComponent {
     };
   }
 
+  componentDidMount() {
+    this.props.dispatch(fetchOwnAccounts());
+  }
+
+  componentDidUpdate() {
+    this.props.dispatch(fetchOwnAccounts());
+  }
+
   render() {
     const { intl, account, otherAccounts } = this.props;
     const size = this.props.size || 16;

From 6b8fbbff47607d10035b73402c8f7a2a8d9a28ef Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Mar 2021 21:04:12 -0500
Subject: [PATCH 03/46] Remove dead code

---
 app/soapbox/reducers/meta.js | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/app/soapbox/reducers/meta.js b/app/soapbox/reducers/meta.js
index 24a8977ef..0e784fe30 100644
--- a/app/soapbox/reducers/meta.js
+++ b/app/soapbox/reducers/meta.js
@@ -1,8 +1,7 @@
 'use strict';
 
 import { ME_FETCH_SUCCESS, ME_PATCH_SUCCESS } from 'soapbox/actions/me';
-import { VERIFY_CREDENTIALS_SUCCESS } from 'soapbox/actions/auth';
-import { Map as ImmutableMap, OrderedSet as ImmutableOrderedSet, fromJS } from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const initialState = ImmutableMap();
 
@@ -12,15 +11,11 @@ export default function meta(state = initialState, action) {
   case ME_PATCH_SUCCESS:
     const me = fromJS(action.me);
     return state.withMutations(state => {
-      state.set('me', me.get('id'));
-      state.update('users', ImmutableOrderedSet(), v => v.add(me.get('id')));
       if (me.has('pleroma')) {
         const pleroPrefs = me.get('pleroma').delete('settings_store');
         state.mergeIn(['pleroma'], pleroPrefs);
       }
     });
-  case VERIFY_CREDENTIALS_SUCCESS:
-    return state.update('users', ImmutableOrderedSet(), v => v.add(action.account.id));
   default:
     return state;
   }

From 60a3a5b403c202f9f8455876edd3e5991e863c78 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Mar 2021 21:15:47 -0500
Subject: [PATCH 04/46] Move session tokens list into security reducer

---
 app/soapbox/features/security/index.js |  3 +--
 app/soapbox/reducers/auth.js           | 10 +---------
 app/soapbox/reducers/index.js          |  2 ++
 app/soapbox/reducers/security.js       | 21 +++++++++++++++++++++
 4 files changed, 25 insertions(+), 11 deletions(-)
 create mode 100644 app/soapbox/reducers/security.js

diff --git a/app/soapbox/features/security/index.js b/app/soapbox/features/security/index.js
index f45416518..30c5e9686 100644
--- a/app/soapbox/features/security/index.js
+++ b/app/soapbox/features/security/index.js
@@ -63,9 +63,8 @@ const messages = defineMessages({
 });
 
 const mapStateToProps = state => ({
-  backup_codes: state.getIn(['auth', 'backup_codes', 'codes']),
   settings: getSettings(state),
-  tokens: state.getIn(['auth', 'tokens']),
+  tokens: state.getIn(['security', 'tokens']),
 });
 
 export default @connect(mapStateToProps)
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 9518073c5..c36cf4ef5 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -3,17 +3,14 @@ import {
   AUTH_LOGGED_IN,
   AUTH_APP_AUTHORIZED,
   AUTH_LOGGED_OUT,
-  FETCH_TOKENS_SUCCESS,
-  REVOKE_TOKEN_SUCCESS,
   SWITCH_ACCOUNT,
 } from '../actions/auth';
-import { Map as ImmutableMap, List as ImmutableList, fromJS } from 'immutable';
+import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const initialState = ImmutableMap({
   app: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:app'))),
   users: fromJS(JSON.parse(localStorage.getItem('soapbox:auth:users'))),
   me: localStorage.getItem('soapbox:auth:me'),
-  tokens: ImmutableList(),
 });
 
 export default function auth(state = initialState, action) {
@@ -30,11 +27,6 @@ export default function auth(state = initialState, action) {
   case AUTH_LOGGED_OUT:
     localStorage.removeItem('soapbox:auth:user');
     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:
     localStorage.setItem('soapbox:auth:me', action.accountId);
     location.reload();
diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js
index 45ab583d0..116766fab 100644
--- a/app/soapbox/reducers/index.js
+++ b/app/soapbox/reducers/index.js
@@ -51,6 +51,7 @@ import chat_message_lists from './chat_message_lists';
 import profile_hover_card from './profile_hover_card';
 import backups from './backups';
 import admin_log from './admin_log';
+import security from './security';
 
 const appReducer = combineReducers({
   dropdown_menu,
@@ -103,6 +104,7 @@ const appReducer = combineReducers({
   profile_hover_card,
   backups,
   admin_log,
+  security,
 });
 
 // Clear the state (mostly) when the user logs out
diff --git a/app/soapbox/reducers/security.js b/app/soapbox/reducers/security.js
new file mode 100644
index 000000000..93f6fa632
--- /dev/null
+++ b/app/soapbox/reducers/security.js
@@ -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;
+  }
+};

From 0daa95646eae52178320845d133dcaae06b61aad Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Tue, 23 Mar 2021 21:52:08 -0500
Subject: [PATCH 05/46] Refactor auth reducer localStorage

---
 app/soapbox/actions/auth.js  |  4 ++--
 app/soapbox/reducers/auth.js | 39 ++++++++++++++++++++++--------------
 2 files changed, 26 insertions(+), 17 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 28bbfed2a..e70c0bcbe 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -331,9 +331,9 @@ export function authAppAuthorized(app) {
   };
 }
 
-export function authLoggedIn(user) {
+export function authLoggedIn(token) {
   return {
     type: AUTH_LOGGED_IN,
-    user,
+    token,
   };
 }
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index c36cf4ef5..6a4a4f502 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -7,31 +7,40 @@ import {
 } from '../actions/auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
-const initialState = ImmutableMap({
-  app: ImmutableMap(JSON.parse(localStorage.getItem('soapbox:auth:app'))),
-  users: fromJS(JSON.parse(localStorage.getItem('soapbox:auth:users'))),
-  me: localStorage.getItem('soapbox:auth:me'),
+const defaultState = ImmutableMap({
+  app: ImmutableMap(),
+  user: ImmutableMap(),
+  users: ImmutableMap(),
+  me: null,
 });
 
-export default function auth(state = initialState, action) {
+const localState = fromJS(JSON.parse(localStorage.getItem('soapbox:auth')));
+const initialState = defaultState.merge(localState);
+
+const reducer = (state, action) => {
   switch(action.type) {
   case AUTH_APP_CREATED:
-    localStorage.setItem('soapbox:auth:app', JSON.stringify(action.app)); // TODO: Better persistence
-    return state.set('app', ImmutableMap(action.app));
+    return state.set('app', fromJS(action.app));
   case AUTH_APP_AUTHORIZED:
-    const merged = state.get('app').merge(ImmutableMap(action.app));
-    localStorage.setItem('soapbox:auth:app', JSON.stringify(merged)); // TODO: Better persistence
-    return state.set('app', merged);
+    return state.update('app', ImmutableMap(), app => app.merge(fromJS(action.app)));
   case AUTH_LOGGED_IN:
-    return state.set('user', ImmutableMap(action.user));
+    return state.set('user', fromJS(action.token));
   case AUTH_LOGGED_OUT:
-    localStorage.removeItem('soapbox:auth:user');
     return state.set('user', ImmutableMap());
   case SWITCH_ACCOUNT:
-    localStorage.setItem('soapbox:auth:me', action.accountId);
-    location.reload();
-    return state;
+    return state.set('me', action.accountId);
   default:
     return state;
   }
 };
+
+export default function auth(state = initialState, action) {
+  state = reducer(state, action);
+  localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
+
+  if (action.type === SWITCH_ACCOUNT) {
+    location.reload();
+  }
+
+  return state;
+};

From a731ac88cfe4680f2f5d7e41000f2629a97da212 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 00:05:06 -0500
Subject: [PATCH 06/46] Make login work again

---
 app/soapbox/actions/auth.js                   | 13 ++++++-----
 app/soapbox/actions/me.js                     |  2 +-
 .../auth_login/components/login_page.js       |  7 +++---
 .../public_layout/components/header.js        |  7 +++---
 app/soapbox/reducers/auth.js                  | 23 ++++++++++++++++---
 app/soapbox/reducers/me.js                    |  4 +++-
 app/soapbox/reducers/settings.js              | 13 ++++++++---
 7 files changed, 47 insertions(+), 22 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index e70c0bcbe..6b0418b8b 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -94,8 +94,9 @@ function createUserToken(username, password) {
       grant_type:    'password',
       username:      username,
       password:      password,
-    }).then(response => {
-      dispatch(authLoggedIn(response.data));
+    }).then(({ data: token }) => {
+      dispatch(authLoggedIn(token));
+      return token;
     });
   };
 }
@@ -143,7 +144,7 @@ export function verifyCredentials(token) {
       method: 'get',
       url: '/api/v1/accounts/verify_credentials',
       headers: {
-        'Authorization': `Bearer ${token.get('access_token')}`,
+        'Authorization': `Bearer ${token}`,
       },
     };
 
@@ -198,10 +199,10 @@ export function switchAccount(accountId) {
 export function fetchOwnAccounts() {
   return throttle((dispatch, getState) => {
     const state = getState();
-    state.getIn(['auth', 'users']).forEach((token, id) => {
-      const account = state.getIn(['accounts', id]);
+    state.getIn(['auth', 'users']).forEach(user => {
+      const account = state.getIn(['accounts', user.get('id')]);
       if (!account) {
-        dispatch(verifyCredentials(token));
+        dispatch(verifyCredentials(user.get('access_token')));
       }
     });
   }, 2000);
diff --git a/app/soapbox/actions/me.js b/app/soapbox/actions/me.js
index 7ccf07757..5b58b50b1 100644
--- a/app/soapbox/actions/me.js
+++ b/app/soapbox/actions/me.js
@@ -18,7 +18,7 @@ export function fetchMe() {
     const state = getState();
 
     const me = state.getIn(['auth', 'me']);
-    const token = state.getIn(['auth', 'users', me]);
+    const token = state.getIn(['auth', 'users', me, 'access_token']);
 
     if (!token) {
       dispatch({ type: ME_FETCH_SKIP }); return noOp();
diff --git a/app/soapbox/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js
index 3e2cea0e1..30e0cc94b 100644
--- a/app/soapbox/features/auth_login/components/login_page.js
+++ b/app/soapbox/features/auth_login/components/login_page.js
@@ -4,8 +4,7 @@ import { Redirect } from 'react-router-dom';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import LoginForm from './login_form';
 import OtpAuthForm from './otp_auth_form';
-import { logIn } from 'soapbox/actions/auth';
-import { fetchMe } from 'soapbox/actions/me';
+import { logIn, verifyCredentials } from 'soapbox/actions/auth';
 
 const mapStateToProps = state => ({
   me: state.get('me'),
@@ -35,8 +34,8 @@ class LoginPage extends ImmutablePureComponent {
   handleSubmit = (event) => {
     const { dispatch } = this.props;
     const { username, password } = this.getFormData(event.target);
-    dispatch(logIn(username, password)).then(() => {
-      return dispatch(fetchMe());
+    dispatch(logIn(username, password)).then(({ access_token }) => {
+      return dispatch(verifyCredentials(access_token));
     }).catch(error => {
       if (error.response.data.error === 'mfa_required') {
         this.setState({ mfa_auth_needed: true, mfa_token: error.response.data.mfa_token });
diff --git a/app/soapbox/features/public_layout/components/header.js b/app/soapbox/features/public_layout/components/header.js
index 453be4b1d..7d3d864b5 100644
--- a/app/soapbox/features/public_layout/components/header.js
+++ b/app/soapbox/features/public_layout/components/header.js
@@ -8,8 +8,7 @@ import SiteLogo from './site_logo';
 import SoapboxPropTypes from 'soapbox/utils/soapbox_prop_types';
 import { defineMessages, injectIntl } from 'react-intl';
 import PropTypes from 'prop-types';
-import { logIn } from 'soapbox/actions/auth';
-import { fetchMe } from 'soapbox/actions/me';
+import { logIn, verifyCredentials } from 'soapbox/actions/auth';
 import OtpAuthForm from 'soapbox/features/auth_login/components/otp_auth_form';
 import IconButton from 'soapbox/components/icon_button';
 
@@ -55,8 +54,8 @@ class Header extends ImmutablePureComponent {
   handleSubmit = (event) => {
     const { dispatch } = this.props;
     const { username, password } = this.getFormData(event.target);
-    dispatch(logIn(username, password)).then(() => {
-      return dispatch(fetchMe());
+    dispatch(logIn(username, password)).then(({ access_token }) => {
+      return dispatch(verifyCredentials(access_token));
     }).catch(error => {
       if (error.response.data.error === 'mfa_required') {
         this.setState({ mfa_auth_needed: true, mfa_token: error.response.data.mfa_token });
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 6a4a4f502..c6ae6035c 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -4,19 +4,34 @@ import {
   AUTH_APP_AUTHORIZED,
   AUTH_LOGGED_OUT,
   SWITCH_ACCOUNT,
+  VERIFY_CREDENTIALS_SUCCESS,
 } from '../actions/auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const defaultState = ImmutableMap({
   app: ImmutableMap(),
-  user: ImmutableMap(),
-  users: ImmutableMap(),
+  tokens: ImmutableMap(),
   me: null,
 });
 
 const localState = fromJS(JSON.parse(localStorage.getItem('soapbox:auth')));
 const initialState = defaultState.merge(localState);
 
+const importToken = (state, token) => {
+  return state.setIn(['tokens', token.access_token], fromJS(token));
+};
+
+const importCredentials = (state, token, account) => {
+  return state.withMutations(state => {
+    state.setIn(['users', account.id], ImmutableMap({
+      id: account.id,
+      access_token: token,
+    }));
+    state.setIn(['tokens', token, 'account'], account.id);
+    state.update('me', null, me => me || account.id);
+  });
+};
+
 const reducer = (state, action) => {
   switch(action.type) {
   case AUTH_APP_CREATED:
@@ -24,9 +39,11 @@ const reducer = (state, action) => {
   case AUTH_APP_AUTHORIZED:
     return state.update('app', ImmutableMap(), app => app.merge(fromJS(action.app)));
   case AUTH_LOGGED_IN:
-    return state.set('user', fromJS(action.token));
+    return importToken(state, action.token);
   case AUTH_LOGGED_OUT:
     return state.set('user', ImmutableMap());
+  case VERIFY_CREDENTIALS_SUCCESS:
+    return importCredentials(state, action.token, action.account);
   case SWITCH_ACCOUNT:
     return state.set('me', action.accountId);
   default:
diff --git a/app/soapbox/reducers/me.js b/app/soapbox/reducers/me.js
index d5304c4e4..a7bd1a94f 100644
--- a/app/soapbox/reducers/me.js
+++ b/app/soapbox/reducers/me.js
@@ -4,7 +4,7 @@ import {
   ME_FETCH_SKIP,
   ME_PATCH_SUCCESS,
 } from '../actions/me';
-import { AUTH_LOGGED_OUT } from '../actions/auth';
+import { AUTH_LOGGED_OUT, VERIFY_CREDENTIALS_SUCCESS } from '../actions/auth';
 
 const initialState = null;
 
@@ -13,6 +13,8 @@ export default function me(state = initialState, action) {
   case ME_FETCH_SUCCESS:
   case ME_PATCH_SUCCESS:
     return action.me.id;
+  case VERIFY_CREDENTIALS_SUCCESS:
+    return state || action.account.id;
   case ME_FETCH_FAIL:
   case ME_FETCH_SKIP:
   case AUTH_LOGGED_OUT:
diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js
index be4f6b88d..297cf2ff1 100644
--- a/app/soapbox/reducers/settings.js
+++ b/app/soapbox/reducers/settings.js
@@ -3,6 +3,7 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { EMOJI_USE } from '../actions/emojis';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
+import { VERIFY_CREDENTIALS_SUCCESS } from 'soapbox/actions/auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 // Default settings are in action/settings.js
@@ -17,12 +18,18 @@ const updateFrequentEmojis = (state, emoji) => state.update('frequentlyUsedEmoji
 
 const filterDeadListColumns = (state, listId) => state.update('columns', columns => columns.filterNot(column => column.get('id') === 'LIST' && column.get('params').get('id') === listId));
 
+const importSettings = (state, account) => {
+  account = fromJS(account);
+  const prefs = account.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap());
+  return state.merge(prefs);
+};
+
 export default function settings(state = initialState, action) {
   switch(action.type) {
   case ME_FETCH_SUCCESS:
-    const me = fromJS(action.me);
-    let fePrefs = me.getIn(['pleroma', 'settings_store', FE_NAME], ImmutableMap());
-    return state.merge(fePrefs);
+    return importSettings(state, action.me);
+  case VERIFY_CREDENTIALS_SUCCESS:
+    return importSettings(state, action.account);
   case NOTIFICATIONS_FILTER_SET:
   case SETTING_CHANGE:
     return state

From 9cd06a15d507195fd9b1a96d3231685e28fe795b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 11:44:51 -0500
Subject: [PATCH 07/46] Refactor loggedin check

---
 app/soapbox/actions/accounts.js      | 35 ++++++++++++++--------------
 app/soapbox/actions/blocks.js        |  5 ++--
 app/soapbox/actions/compose.js       |  7 +++---
 app/soapbox/actions/conversations.js |  5 ++--
 app/soapbox/actions/domain_blocks.js |  9 +++----
 app/soapbox/actions/favourites.js    |  5 ++--
 app/soapbox/actions/filters.js       |  3 ++-
 app/soapbox/actions/group_editor.js  |  5 ++--
 app/soapbox/actions/groups.js        | 25 ++++++++++----------
 app/soapbox/actions/interactions.js  | 17 +++++++-------
 app/soapbox/actions/lists.js         | 21 +++++++++--------
 app/soapbox/actions/mutes.js         |  5 ++--
 app/soapbox/actions/notifications.js |  5 ++--
 app/soapbox/actions/statuses.js      |  7 +++---
 app/soapbox/actions/suggestions.js   |  3 ++-
 app/soapbox/utils/accounts.js        |  2 ++
 16 files changed, 88 insertions(+), 71 deletions(-)

diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js
index 55e5926e4..725fb8130 100644
--- a/app/soapbox/actions/accounts.js
+++ b/app/soapbox/actions/accounts.js
@@ -6,6 +6,7 @@ import {
   importFetchedAccounts,
   importErrorWhileFetchingAccountByUsername,
 } from './importer';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
@@ -162,7 +163,7 @@ export function fetchAccountFail(id, error) {
 
 export function followAccount(id, reblogs = true) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const alreadyFollowing = getState().getIn(['relationships', id, 'following']);
     const locked = getState().getIn(['accounts', id, 'locked'], false);
@@ -179,7 +180,7 @@ export function followAccount(id, reblogs = true) {
 
 export function unfollowAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unfollowAccountRequest(id));
 
@@ -245,7 +246,7 @@ export function unfollowAccountFail(error) {
 
 export function blockAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(blockAccountRequest(id));
 
@@ -260,7 +261,7 @@ export function blockAccount(id) {
 
 export function unblockAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unblockAccountRequest(id));
 
@@ -318,7 +319,7 @@ export function unblockAccountFail(error) {
 
 export function muteAccount(id, notifications) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(muteAccountRequest(id));
 
@@ -333,7 +334,7 @@ export function muteAccount(id, notifications) {
 
 export function unmuteAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unmuteAccountRequest(id));
 
@@ -391,7 +392,7 @@ export function unmuteAccountFail(error) {
 
 export function fetchFollowers(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchFollowersRequest(id));
 
@@ -433,7 +434,7 @@ export function fetchFollowersFail(id, error) {
 
 export function expandFollowers(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'followers', id, 'next']);
 
@@ -481,7 +482,7 @@ export function expandFollowersFail(id, error) {
 
 export function fetchFollowing(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchFollowingRequest(id));
 
@@ -523,7 +524,7 @@ export function fetchFollowingFail(id, error) {
 
 export function expandFollowing(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'following', id, 'next']);
 
@@ -571,7 +572,7 @@ export function expandFollowingFail(id, error) {
 
 export function fetchRelationships(accountIds) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const loadedRelationships = getState().get('relationships');
     const newAccountIds = accountIds.filter(id => loadedRelationships.get(id, null) === null);
@@ -616,7 +617,7 @@ export function fetchRelationshipsFail(error) {
 
 export function fetchFollowRequests() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchFollowRequestsRequest());
 
@@ -651,7 +652,7 @@ export function fetchFollowRequestsFail(error) {
 
 export function expandFollowRequests() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'follow_requests', 'next']);
 
@@ -692,7 +693,7 @@ export function expandFollowRequestsFail(error) {
 
 export function authorizeFollowRequest(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(authorizeFollowRequestRequest(id));
 
@@ -728,7 +729,7 @@ export function authorizeFollowRequestFail(id, error) {
 
 export function rejectFollowRequest(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(rejectFollowRequestRequest(id));
 
@@ -763,7 +764,7 @@ export function rejectFollowRequestFail(id, error) {
 
 export function pinAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(pinAccountRequest(id));
 
@@ -777,7 +778,7 @@ export function pinAccount(id) {
 
 export function unpinAccount(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unpinAccountRequest(id));
 
diff --git a/app/soapbox/actions/blocks.js b/app/soapbox/actions/blocks.js
index d891999bb..66d13d4ec 100644
--- a/app/soapbox/actions/blocks.js
+++ b/app/soapbox/actions/blocks.js
@@ -1,6 +1,7 @@
 import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
@@ -12,7 +13,7 @@ export const BLOCKS_EXPAND_FAIL    = 'BLOCKS_EXPAND_FAIL';
 
 export function fetchBlocks() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchBlocksRequest());
 
@@ -48,7 +49,7 @@ export function fetchBlocksFail(error) {
 
 export function expandBlocks() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'blocks', 'next']);
 
diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index 782dee74a..f7af6de51 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -13,6 +13,7 @@ import { openModal, closeModal } from './modal';
 import { getSettings } from './settings';
 import { getFeatures } from 'soapbox/utils/features';
 import { uploadMedia } from './media';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 let cancelFetchComposeSuggestionsAccounts;
 
@@ -157,7 +158,7 @@ export function handleComposeSubmit(dispatch, getState, response, status) {
 
 export function submitCompose(routerHistory, group) {
   return function(dispatch, getState) {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const status = getState().getIn(['compose', 'text'], '');
     const media  = getState().getIn(['compose', 'media_attachments']);
@@ -216,7 +217,7 @@ export function submitComposeFail(error) {
 
 export function uploadCompose(files) {
   return function(dispatch, getState) {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
     const uploadLimit = getFeatures(getState().get('instance')).attachmentLimit;
 
     const media  = getState().getIn(['compose', 'media_attachments']);
@@ -254,7 +255,7 @@ export function uploadCompose(files) {
 
 export function changeUploadCompose(id, params) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(changeUploadComposeRequest());
 
diff --git a/app/soapbox/actions/conversations.js b/app/soapbox/actions/conversations.js
index fc1305156..c43fe3efb 100644
--- a/app/soapbox/actions/conversations.js
+++ b/app/soapbox/actions/conversations.js
@@ -4,6 +4,7 @@ import {
   importFetchedStatuses,
   importFetchedStatus,
 } from './importer';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
 export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
@@ -24,7 +25,7 @@ export const unmountConversations = () => ({
 });
 
 export const markConversationRead = conversationId => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch({
     type: CONVERSATIONS_READ,
@@ -35,7 +36,7 @@ export const markConversationRead = conversationId => (dispatch, getState) => {
 };
 
 export const expandConversations = ({ maxId } = {}) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(expandConversationsRequest());
 
diff --git a/app/soapbox/actions/domain_blocks.js b/app/soapbox/actions/domain_blocks.js
index a5ebb0c99..c8da042f0 100644
--- a/app/soapbox/actions/domain_blocks.js
+++ b/app/soapbox/actions/domain_blocks.js
@@ -1,4 +1,5 @@
 import api, { getLinks } from '../api';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
@@ -18,7 +19,7 @@ export const DOMAIN_BLOCKS_EXPAND_FAIL    = 'DOMAIN_BLOCKS_EXPAND_FAIL';
 
 export function blockDomain(domain) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(blockDomainRequest(domain));
 
@@ -57,7 +58,7 @@ export function blockDomainFail(domain, error) {
 
 export function unblockDomain(domain) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unblockDomainRequest(domain));
 
@@ -102,7 +103,7 @@ export function unblockDomainFail(domain, error) {
 
 export function fetchDomainBlocks() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchDomainBlocksRequest());
 
@@ -138,7 +139,7 @@ export function fetchDomainBlocksFail(error) {
 
 export function expandDomainBlocks() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['domain_lists', 'blocks', 'next']);
 
diff --git a/app/soapbox/actions/favourites.js b/app/soapbox/actions/favourites.js
index d5b774f12..d5c362ebf 100644
--- a/app/soapbox/actions/favourites.js
+++ b/app/soapbox/actions/favourites.js
@@ -1,5 +1,6 @@
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
@@ -11,7 +12,7 @@ export const FAVOURITED_STATUSES_EXPAND_FAIL    = 'FAVOURITED_STATUSES_EXPAND_FA
 
 export function fetchFavouritedStatuses() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     if (getState().getIn(['status_lists', 'favourites', 'isLoading'])) {
       return;
@@ -55,7 +56,7 @@ export function fetchFavouritedStatusesFail(error) {
 
 export function expandFavouritedStatuses() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['status_lists', 'favourites', 'next'], null);
 
diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js
index e3ad557f5..9823509e6 100644
--- a/app/soapbox/actions/filters.js
+++ b/app/soapbox/actions/filters.js
@@ -1,5 +1,6 @@
 import api from '../api';
 import snackbar from 'soapbox/actions/snackbar';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
 export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
@@ -14,7 +15,7 @@ export const FILTERS_DELETE_SUCCESS = 'FILTERS_DELETE_SUCCESS';
 export const FILTERS_DELETE_FAIL    = 'FILTERS_DELETE_FAIL';
 
 export const fetchFilters = () => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch({
     type: FILTERS_FETCH_REQUEST,
diff --git a/app/soapbox/actions/group_editor.js b/app/soapbox/actions/group_editor.js
index 4b9245081..b165e0236 100644
--- a/app/soapbox/actions/group_editor.js
+++ b/app/soapbox/actions/group_editor.js
@@ -1,4 +1,5 @@
 import api from '../api';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const GROUP_CREATE_REQUEST      = 'GROUP_CREATE_REQUEST';
 export const GROUP_CREATE_SUCCESS      = 'GROUP_CREATE_SUCCESS';
@@ -27,7 +28,7 @@ export const submit = (routerHistory) => (dispatch, getState) => {
 
 
 export const create = (title, description, coverImage, routerHistory) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(createRequest());
 
@@ -62,7 +63,7 @@ export const createFail = error => ({
 });
 
 export const update = (groupId, title, description, coverImage, routerHistory) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(updateRequest());
 
diff --git a/app/soapbox/actions/groups.js b/app/soapbox/actions/groups.js
index 959b1b0b2..14a487370 100644
--- a/app/soapbox/actions/groups.js
+++ b/app/soapbox/actions/groups.js
@@ -1,6 +1,7 @@
 import api, { getLinks } from '../api';
 import { importFetchedAccounts } from './importer';
 import { fetchRelationships } from './accounts';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST';
 export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS';
@@ -51,7 +52,7 @@ export const GROUP_REMOVE_STATUS_SUCCESS = 'GROUP_REMOVE_STATUS_SUCCESS';
 export const GROUP_REMOVE_STATUS_FAIL    = 'GROUP_REMOVE_STATUS_FAIL';
 
 export const fetchGroup = id => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(fetchGroupRelationships([id]));
 
@@ -84,7 +85,7 @@ export const fetchGroupFail = (id, error) => ({
 
 export function fetchGroupRelationships(groupIds) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const loadedRelationships = getState().get('group_relationships');
     const newGroupIds = groupIds.filter(id => loadedRelationships.get(id, null) === null);
@@ -128,7 +129,7 @@ export function fetchGroupRelationshipsFail(error) {
 };
 
 export const fetchGroups = (tab) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(fetchGroupsRequest());
 
@@ -157,7 +158,7 @@ export const fetchGroupsFail = error => ({
 
 export function joinGroup(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(joinGroupRequest(id));
 
@@ -171,7 +172,7 @@ export function joinGroup(id) {
 
 export function leaveGroup(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(leaveGroupRequest(id));
 
@@ -227,7 +228,7 @@ export function leaveGroupFail(error) {
 
 export function fetchMembers(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchMembersRequest(id));
 
@@ -269,7 +270,7 @@ export function fetchMembersFail(id, error) {
 
 export function expandMembers(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'groups', id, 'next']);
 
@@ -317,7 +318,7 @@ export function expandMembersFail(id, error) {
 
 export function fetchRemovedAccounts(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchRemovedAccountsRequest(id));
 
@@ -359,7 +360,7 @@ export function fetchRemovedAccountsFail(id, error) {
 
 export function expandRemovedAccounts(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'groups_removed_accounts', id, 'next']);
 
@@ -407,7 +408,7 @@ export function expandRemovedAccountsFail(id, error) {
 
 export function removeRemovedAccount(groupId, id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(removeRemovedAccountRequest(groupId, id));
 
@@ -446,7 +447,7 @@ export function removeRemovedAccountFail(groupId, id, error) {
 
 export function createRemovedAccount(groupId, id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(createRemovedAccountRequest(groupId, id));
 
@@ -485,7 +486,7 @@ export function createRemovedAccountFail(groupId, id, error) {
 
 export function groupRemoveStatus(groupId, id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(groupRemoveStatusRequest(groupId, id));
 
diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js
index b07feac1b..bd6f3218d 100644
--- a/app/soapbox/actions/interactions.js
+++ b/app/soapbox/actions/interactions.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import snackbar from 'soapbox/actions/snackbar';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
@@ -44,7 +45,7 @@ export const UNBOOKMARK_FAIL    = 'UNBOOKMARKED_FAIL';
 
 export function reblog(status) {
   return function(dispatch, getState) {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(reblogRequest(status));
 
@@ -61,7 +62,7 @@ export function reblog(status) {
 
 export function unreblog(status) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unreblogRequest(status));
 
@@ -126,7 +127,7 @@ export function unreblogFail(status, error) {
 
 export function favourite(status) {
   return function(dispatch, getState) {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(favouriteRequest(status));
 
@@ -141,7 +142,7 @@ export function favourite(status) {
 
 export function unfavourite(status) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unfavouriteRequest(status));
 
@@ -280,7 +281,7 @@ export function unbookmarkFail(status, error) {
 
 export function fetchReblogs(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchReblogsRequest(id));
 
@@ -317,7 +318,7 @@ export function fetchReblogsFail(id, error) {
 
 export function fetchFavourites(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchFavouritesRequest(id));
 
@@ -354,7 +355,7 @@ export function fetchFavouritesFail(id, error) {
 
 export function pin(status) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(pinRequest(status));
 
@@ -394,7 +395,7 @@ export function pinFail(status, error) {
 
 export function unpin(status) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unpinRequest(status));
 
diff --git a/app/soapbox/actions/lists.js b/app/soapbox/actions/lists.js
index d93ddc43c..13a28ddf0 100644
--- a/app/soapbox/actions/lists.js
+++ b/app/soapbox/actions/lists.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts } from './importer';
 import { showAlertForError } from './alerts';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
 export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS';
@@ -50,7 +51,7 @@ export const LIST_ADDER_LISTS_FETCH_SUCCESS = 'LIST_ADDER_LISTS_FETCH_SUCCESS';
 export const LIST_ADDER_LISTS_FETCH_FAIL    = 'LIST_ADDER_LISTS_FETCH_FAIL';
 
 export const fetchList = id => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   if (getState().getIn(['lists', id])) {
     return;
@@ -80,7 +81,7 @@ export const fetchListFail = (id, error) => ({
 });
 
 export const fetchLists = () => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(fetchListsRequest());
 
@@ -129,7 +130,7 @@ export const changeListEditorTitle = value => ({
 });
 
 export const createList = (title, shouldReset) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(createListRequest());
 
@@ -157,7 +158,7 @@ export const createListFail = error => ({
 });
 
 export const updateList = (id, title, shouldReset) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(updateListRequest(id));
 
@@ -191,7 +192,7 @@ export const resetListEditor = () => ({
 });
 
 export const deleteList = id => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(deleteListRequest(id));
 
@@ -217,7 +218,7 @@ export const deleteListFail = (id, error) => ({
 });
 
 export const fetchListAccounts = listId => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(fetchListAccountsRequest(listId));
 
@@ -246,7 +247,7 @@ export const fetchListAccountsFail = (id, error) => ({
 });
 
 export const fetchListSuggestions = q => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   const params = {
     q,
@@ -281,7 +282,7 @@ export const addToListEditor = accountId => (dispatch, getState) => {
 };
 
 export const addToList = (listId, accountId) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(addToListRequest(listId, accountId));
 
@@ -314,7 +315,7 @@ export const removeFromListEditor = accountId => (dispatch, getState) => {
 };
 
 export const removeFromList = (listId, accountId) => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(removeFromListRequest(listId, accountId));
 
@@ -356,7 +357,7 @@ export const setupListAdder = accountId => (dispatch, getState) => {
 };
 
 export const fetchAccountLists = accountId => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch(fetchAccountListsRequest(accountId));
 
diff --git a/app/soapbox/actions/mutes.js b/app/soapbox/actions/mutes.js
index 00d791197..1d081584a 100644
--- a/app/soapbox/actions/mutes.js
+++ b/app/soapbox/actions/mutes.js
@@ -2,6 +2,7 @@ import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
 import { openModal } from './modal';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
@@ -16,7 +17,7 @@ export const MUTES_TOGGLE_HIDE_NOTIFICATIONS = 'MUTES_TOGGLE_HIDE_NOTIFICATIONS'
 
 export function fetchMutes() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(fetchMutesRequest());
 
@@ -52,7 +53,7 @@ export function fetchMutesFail(error) {
 
 export function expandMutes() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const url = getState().getIn(['user_lists', 'mutes', 'next']);
 
diff --git a/app/soapbox/actions/notifications.js b/app/soapbox/actions/notifications.js
index 63d4adab3..7b30fc332 100644
--- a/app/soapbox/actions/notifications.js
+++ b/app/soapbox/actions/notifications.js
@@ -17,6 +17,7 @@ import {
 } from 'immutable';
 import { unescapeHTML } from '../utils/html';
 import { getFilters, regexFromFilters } from '../selectors';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
@@ -156,7 +157,7 @@ const noOp = () => {};
 
 export function expandNotifications({ maxId } = {}, done = noOp) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     const activeFilter = getSettings(getState()).getIn(['notifications', 'quickFilter', 'active']);
     const notifications = getState().get('notifications');
@@ -222,7 +223,7 @@ export function expandNotificationsFail(error, isLoadingMore) {
 
 export function clearNotifications() {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch({
       type: NOTIFICATIONS_CLEAR,
diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js
index bdf31da8f..7712e1bd9 100644
--- a/app/soapbox/actions/statuses.js
+++ b/app/soapbox/actions/statuses.js
@@ -4,6 +4,7 @@ import { evictStatus } from '../storage/modifier';
 import { deleteFromTimelines } from './timelines';
 import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
 import { openModal } from './modal';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
@@ -141,7 +142,7 @@ export function redraft(status, raw_text) {
 
 export function deleteStatus(id, routerHistory, withRedraft = false) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     let status = getState().getIn(['statuses', id]);
 
@@ -233,7 +234,7 @@ export function fetchContextFail(id, error) {
 
 export function muteStatus(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(muteStatusRequest(id));
 
@@ -269,7 +270,7 @@ export function muteStatusFail(id, error) {
 
 export function unmuteStatus(id) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
     dispatch(unmuteStatusRequest(id));
 
diff --git a/app/soapbox/actions/suggestions.js b/app/soapbox/actions/suggestions.js
index d84bb758f..bf6edffb4 100644
--- a/app/soapbox/actions/suggestions.js
+++ b/app/soapbox/actions/suggestions.js
@@ -1,5 +1,6 @@
 import api from '../api';
 import { importFetchedAccounts } from './importer';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
 export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
@@ -43,7 +44,7 @@ export function fetchSuggestionsFail(error) {
 };
 
 export const dismissSuggestion = accountId => (dispatch, getState) => {
-  if (!getState().get('me')) return;
+  if (!isLoggedIn(getState)) return;
 
   dispatch({
     type: SUGGESTIONS_DISMISS,
diff --git a/app/soapbox/utils/accounts.js b/app/soapbox/utils/accounts.js
index 7e25f868c..6dd60feae 100644
--- a/app/soapbox/utils/accounts.js
+++ b/app/soapbox/utils/accounts.js
@@ -49,3 +49,5 @@ export const isLocal = account => {
 export const isVerified = account => (
   account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified')
 );
+
+export const isLoggedIn = getState => typeof getState().get('me') === 'string';

From 1e531f472e60e2e7f6e4aa1167f03a66c3d370f3 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 11:52:12 -0500
Subject: [PATCH 08/46] More isLoggedIn refactoring

---
 app/soapbox/actions/emoji_reacts.js  | 7 ++++---
 app/soapbox/actions/notifications.js | 4 ++--
 app/soapbox/actions/settings.js      | 4 +++-
 3 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/actions/emoji_reacts.js b/app/soapbox/actions/emoji_reacts.js
index 7b041d4ee..206c4fc43 100644
--- a/app/soapbox/actions/emoji_reacts.js
+++ b/app/soapbox/actions/emoji_reacts.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import { favourite, unfavourite } from './interactions';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 
 export const EMOJI_REACT_REQUEST = 'EMOJI_REACT_REQUEST';
 export const EMOJI_REACT_SUCCESS = 'EMOJI_REACT_SUCCESS';
@@ -44,7 +45,7 @@ export const simpleEmojiReact = (status, emoji) => {
 
 export function fetchEmojiReacts(id, emoji) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return dispatch(noOp());
+    if (!isLoggedIn(getState)) return dispatch(noOp());
 
     dispatch(fetchEmojiReactsRequest(id, emoji));
 
@@ -65,7 +66,7 @@ export function fetchEmojiReacts(id, emoji) {
 
 export function emojiReact(status, emoji) {
   return function(dispatch, getState) {
-    if (!getState().get('me')) return dispatch(noOp());
+    if (!isLoggedIn(getState)) return dispatch(noOp());
 
     dispatch(emojiReactRequest(status, emoji));
 
@@ -82,7 +83,7 @@ export function emojiReact(status, emoji) {
 
 export function unEmojiReact(status, emoji) {
   return (dispatch, getState) => {
-    if (!getState().get('me')) return dispatch(noOp());
+    if (!isLoggedIn(getState)) return dispatch(noOp());
 
     dispatch(unEmojiReactRequest(status, emoji));
 
diff --git a/app/soapbox/actions/notifications.js b/app/soapbox/actions/notifications.js
index 7b30fc332..4013934f6 100644
--- a/app/soapbox/actions/notifications.js
+++ b/app/soapbox/actions/notifications.js
@@ -257,9 +257,9 @@ export function setFilter(filterType) {
 
 export function markReadNotifications() {
   return (dispatch, getState) => {
-    const state = getState();
-    if (!state.get('me')) return;
+    if (!isLoggedIn(getState)) return;
 
+    const state = getState();
     const topNotification = state.getIn(['notifications', 'items'], ImmutableOrderedMap()).first(ImmutableMap()).get('id');
     const lastRead = state.getIn(['notifications', 'lastRead']);
 
diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index b96504647..2e72c65ad 100644
--- a/app/soapbox/actions/settings.js
+++ b/app/soapbox/actions/settings.js
@@ -2,6 +2,7 @@ import { debounce } from 'lodash';
 import { showAlertForError } from './alerts';
 import { patchMe } from 'soapbox/actions/me';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
+import { isLoggedIn } from 'soapbox/utils/accounts';
 import uuid from '../uuid';
 
 export const SETTING_CHANGE = 'SETTING_CHANGE';
@@ -147,8 +148,9 @@ export function changeSetting(path, value) {
 };
 
 const debouncedSave = debounce((dispatch, getState) => {
+  if (!isLoggedIn(getState)) return;
+
   const state = getState();
-  if (!state.get('me')) return;
   if (getSettings(state).getIn(['saved'])) return;
 
   const data = state.get('settings').delete('saved').toJS();

From 47dd4287d0190b65e436ebbebf3450b32bb6e4b8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 12:02:12 -0500
Subject: [PATCH 09/46] Don't import frontend settings on
 VERIFY_CREDENTIALS_SUCCESS

---
 app/soapbox/reducers/settings.js | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/app/soapbox/reducers/settings.js b/app/soapbox/reducers/settings.js
index 297cf2ff1..40f5bcf78 100644
--- a/app/soapbox/reducers/settings.js
+++ b/app/soapbox/reducers/settings.js
@@ -3,7 +3,6 @@ import { NOTIFICATIONS_FILTER_SET } from '../actions/notifications';
 import { EMOJI_USE } from '../actions/emojis';
 import { LIST_DELETE_SUCCESS, LIST_FETCH_FAIL } from '../actions/lists';
 import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
-import { VERIFY_CREDENTIALS_SUCCESS } from 'soapbox/actions/auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
 // Default settings are in action/settings.js
@@ -28,8 +27,6 @@ export default function settings(state = initialState, action) {
   switch(action.type) {
   case ME_FETCH_SUCCESS:
     return importSettings(state, action.me);
-  case VERIFY_CREDENTIALS_SUCCESS:
-    return importSettings(state, action.account);
   case NOTIFICATIONS_FILTER_SET:
   case SETTING_CHANGE:
     return state

From 760bac13771e719893d74fee0c70002b0916f2cf Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 13:37:41 -0500
Subject: [PATCH 10/46] Add styled console warning

---
 app/soapbox/containers/soapbox.js | 24 ++++++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js
index 138d12701..8a3a52f3e 100644
--- a/app/soapbox/containers/soapbox.js
+++ b/app/soapbox/containers/soapbox.js
@@ -150,6 +150,30 @@ class SoapboxMount extends React.PureComponent {
 
 export default class Soapbox extends React.PureComponent {
 
+  printConsoleWarning = () => {
+    /* eslint-disable no-console */
+    console.log('%cStop!', [
+      'color: #ff0000',
+      'display: block',
+      'font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, Ubuntu, "Helvetica Neue", sans-serif',
+      'font-size: 50px',
+      'font-weight: 800',
+      'padding: 4px 0',
+    ].join(';'));
+    console.log('%cThis is a browser feature intended for developers. If someone told you to copy-paste something here it is a scam and will give them access to your account.', [
+      'color: #111111',
+      'display: block',
+      'font-family: system-ui, -apple-system, BlinkMacSystemFont, Roboto, Ubuntu, "Helvetica Neue", sans-serif',
+      'font-size: 18px',
+      'padding: 4px 0 16px',
+    ].join(';'));
+    /* eslint-enable no-console */
+  }
+
+  componentDidMount() {
+    this.printConsoleWarning();
+  }
+
   render() {
     return (
       <Provider store={store}>

From 79c9c46a9a69ff11e40d752bf678ad9a0ebed3e5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 14:15:36 -0500
Subject: [PATCH 11/46] Nuke tokens on VERIFY_CREDENTIALS_FAIL

---
 app/soapbox/reducers/auth.js | 30 +++++++++++++++++++++++++++---
 1 file changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index c6ae6035c..ef099bd4e 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -5,6 +5,7 @@ import {
   AUTH_LOGGED_OUT,
   SWITCH_ACCOUNT,
   VERIFY_CREDENTIALS_SUCCESS,
+  VERIFY_CREDENTIALS_FAIL,
 } from '../actions/auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
 
@@ -32,6 +33,26 @@ const importCredentials = (state, token, account) => {
   });
 };
 
+// If `me` doesn't match an existing user, attempt to shift it.
+const maybeShiftMe = state => {
+  const users = state.get('users', ImmutableMap());
+  const me = state.get('me');
+
+  if (!users.get(me)) {
+    return state.set('me', users.first(ImmutableMap()).get('id'));
+  } else {
+    return state;
+  }
+};
+
+const importFailedToken = (state, token) => {
+  return state.withMutations(state => {
+    state.update('tokens', ImmutableMap(), tokens => tokens.delete(token));
+    state.update('users', ImmutableMap(), users => users.filterNot(user => user.get('access_token') === token));
+    maybeShiftMe(state);
+  });
+};
+
 const reducer = (state, action) => {
   switch(action.type) {
   case AUTH_APP_CREATED:
@@ -44,6 +65,8 @@ const reducer = (state, action) => {
     return state.set('user', ImmutableMap());
   case VERIFY_CREDENTIALS_SUCCESS:
     return importCredentials(state, action.token, action.account);
+  case VERIFY_CREDENTIALS_FAIL:
+    return importFailedToken(state, action.token);
   case SWITCH_ACCOUNT:
     return state.set('me', action.accountId);
   default:
@@ -51,11 +74,12 @@ const reducer = (state, action) => {
   }
 };
 
-export default function auth(state = initialState, action) {
-  state = reducer(state, action);
+export default function auth(oldState = initialState, action) {
+  const state = reducer(oldState, action);
   localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
 
-  if (action.type === SWITCH_ACCOUNT) {
+  // Reload the page when the current user changes.
+  if (state.get('me') !== oldState.get('me')) {
     location.reload();
   }
 

From 886ab93c70ff552ed0e0ec3a980f7f0a7f9b573b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 15:01:10 -0500
Subject: [PATCH 12/46] Refactor auth reducer tests, add tests for
 VERIFY_CREDENTIALS_FAIL

---
 app/soapbox/reducers/__tests__/auth-test.js | 207 +++++++++-----------
 app/soapbox/reducers/auth.js                |   1 +
 2 files changed, 98 insertions(+), 110 deletions(-)

diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index acbf77ffb..381a871a3 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -1,124 +1,111 @@
 import reducer from '../auth';
-import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import * as actions from 'soapbox/actions/auth';
-// import app from 'soapbox/__fixtures__/app.json';
-import user from 'soapbox/__fixtures__/user.json';
+import { Map as ImmutableMap, fromJS } from 'immutable';
+import {
+  AUTH_APP_CREATED,
+  AUTH_LOGGED_IN,
+  VERIFY_CREDENTIALS_FAIL,
+} from 'soapbox/actions/auth';
 
 describe('auth reducer', () => {
   it('should return the initial state', () => {
     expect(reducer(undefined, {})).toEqual(ImmutableMap({
       app: ImmutableMap(),
-      user: ImmutableMap(),
-      tokens: ImmutableList(),
+      users: ImmutableMap(),
+      tokens: ImmutableMap(),
+      me: null,
     }));
   });
 
-  it('should handle AUTH_APP_CREATED', () => {
-    const state = ImmutableMap({ });
-    const auth = {
-      auth: {
-        app: {
-          vapid_key: 'BHczIFh4Wn3Q_7wDgehaB8Ti3Uu8BoyOgXxkOVuEJRuEqxtd9TAno8K9ycz4myiQ1ruiyVfG6xT1JLeXtpxDzUs',
-          token_type: 'Bearer',
-          client_secret: 'HU6RGO4284Edr4zucuWmn8OFjcpVtMsoXJU0-8tpwRM',
-          redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-          created_at: 1594050270,
-          name: 'SoapboxFE_2020-07-06T15:43:31.989Z',
-          client_id: 'Q0A2r_9ZcEORMenj9kuDRQc3UVL8ypQRoNJ6XQHWJU8',
-          expires_in: 600,
-          scope: 'read write follow push admin',
-          refresh_token: 'aydRA4eragIhavCdAyg6QQnDJmiMbdc-oEBvHYcW_PQ',
-          website: null,
-          id: '113',
-          access_token: 'pbXS8HkoWodrAt_QE1NENcwqigxgWr3P1RIQCKMN0Os',
+  describe('AUTH_APP_CREATED', () => {
+    it('should copy in the app', () => {
+      const token = { token_type: 'Bearer', access_token: 'ABCDEFG' };
+      const action = { type: AUTH_APP_CREATED, app: token };
+
+      const result = reducer(undefined, action);
+      const expected = fromJS(token);
+
+      expect(result.get('app')).toEqual(expected);
+    });
+  });
+
+  describe('AUTH_LOGGED_IN', () => {
+    it('should import the token', () => {
+      const token = { token_type: 'Bearer', access_token: 'ABCDEFG' };
+      const action = { type: AUTH_LOGGED_IN, token };
+
+      const result = reducer(undefined, action);
+      const expected = fromJS({ 'ABCDEFG': token });
+
+      expect(result.get('tokens')).toEqual(expected);
+    });
+
+    it('should merge the token with existing state', () => {
+      const state = fromJS({
+        tokens: { 'ABCDEFG': { token_type: 'Bearer', access_token: 'ABCDEFG' } },
+      });
+
+      const expected = fromJS({
+        'ABCDEFG': { token_type: 'Bearer', access_token: 'ABCDEFG' },
+        'HIJKLMN': { token_type: 'Bearer', access_token: 'HIJKLMN' },
+      });
+
+      const action = {
+        type: AUTH_LOGGED_IN,
+        token: { token_type: 'Bearer', access_token: 'HIJKLMN' },
+      };
+
+      const result = reducer(state, action);
+      expect(result.get('tokens')).toEqual(expected);
+    });
+  });
+
+  describe('VERIFY_CREDENTIALS_FAIL', () => {
+    it('should delete the failed token', () => {
+      const state = fromJS({
+        tokens: {
+          'ABCDEFG': { token_type: 'Bearer', access_token: 'ABCDEFG' },
+          'HIJKLMN': { token_type: 'Bearer', access_token: 'HIJKLMN' },
         },
-        user: {
-          access_token: 'UVBP2e17b4pTpb_h8fImIm3F5a66IBVb-JkyZHs4gLE',
-          expires_in: 600,
-          me: 'https://social.teci.world/users/curtis',
-          refresh_token: 'c2DpbVxYZBJDogNn-VBNFES72yXPNUYQCv0CrXGOplY',
-          scope: 'read write follow push admin',
-          token_type: 'Bearer',
+      });
+
+      const expected = fromJS({
+        'HIJKLMN': { token_type: 'Bearer', access_token: 'HIJKLMN' },
+      });
+
+      const action = { type: VERIFY_CREDENTIALS_FAIL, token: 'ABCDEFG' };
+      const result = reducer(state, action);
+      expect(result.get('tokens')).toEqual(expected);
+    });
+
+    it('should delete any users associated with the failed token', () => {
+      const state = fromJS({
+        users: {
+          '1234': { id: '1234', access_token: 'ABCDEFG' },
+          '5678': { id: '5678', access_token: 'HIJKLMN' },
         },
-        tokens: [],
-      },
-    };
-    const action = {
-      type: actions.AUTH_APP_CREATED,
-      app: auth,
-    };
-    expect(reducer(state, action).toJS()).toMatchObject({
-      app: auth,
+      });
+
+      const expected = fromJS({
+        '5678': { id: '5678', access_token: 'HIJKLMN' },
+      });
+
+      const action = { type: VERIFY_CREDENTIALS_FAIL, token: 'ABCDEFG' };
+      const result = reducer(state, action);
+      expect(result.get('users')).toEqual(expected);
+    });
+
+    it('should reassign `me` to the next in line', () => {
+      const state = fromJS({
+        me: '1234',
+        users: {
+          '1234': { id: '1234', access_token: 'ABCDEFG' },
+          '5678': { id: '5678', access_token: 'HIJKLMN' },
+        },
+      });
+
+      const action = { type: VERIFY_CREDENTIALS_FAIL, token: 'ABCDEFG' };
+      const result = reducer(state, action);
+      expect(result.get('me')).toEqual('5678');
     });
   });
-
-  // Fails with TypeError: cannot read property merge of undefined
-  // it('should handle the Action AUTH_APP_AUTHORIZED', () => {
-  //   const state = ImmutableMap({
-  //     auth: {
-  //       app: {
-  //         vapid_key: 'oldVapidKey',
-  //         token_type: 'Bearer',
-  //         client_secret: 'oldClientSecret',
-  //         redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-  //         created_at: 1594764335,
-  //         name: 'SoapboxFE_2020-07-14T22:05:17.054Z',
-  //         client_id: 'bjiy8AxGKXXesfZcyp_iN-uQVE6Cnl03efWoSdOPh9M',
-  //         expires_in: 600,
-  //         scope: 'read write follow push admin',
-  //         refresh_token: 'oldRefreshToken',
-  //         website: null,
-  //         id: '134',
-  //         access_token: 'oldAccessToken',
-  //       },
-  //     },
-  //   });
-  //   const action = {
-  //     type: actions.AUTH_APP_AUTHORIZED,
-  //     app: app,
-  //   };
-  //   expect(reducer(state, action).toJS()).toMatchObject({
-  //     app: app,
-  //   });
-  // });
-
-  it('should handle the Action AUTH_LOGGED_IN', () => {
-    const state = ImmutableMap({
-      user: {
-        access_token: 'UVBP2e17b4pTpb_h8fImIm3F5a66IBVb-JkyZHs4gLE',
-        expires_in: 600,
-        me: 'https://social.teci.world/users/curtis',
-        refresh_token: 'c2DpbVxYZBJDogNn-VBNFES72yXPNUYQCv0CrXGOplY',
-        scope: 'read write follow push admin',
-        token_type: 'Bearer',
-      },
-    });
-    const action = {
-      type: actions.AUTH_LOGGED_IN,
-      user: user,
-    };
-    expect(reducer(state, action).toJS()).toMatchObject({
-      user: user,
-    });
-  });
-
-  it('should handle the Action AUTH_LOGGED_OUT', () => {
-    const state = ImmutableMap({
-      user: {
-        access_token: 'UVBP2e17b4pTpb_h8fImIm3F5a66IBVb-JkyZHs4gLE',
-        expires_in: 600,
-        me: 'https://social.teci.world/users/curtis',
-        refresh_token: 'c2DpbVxYZBJDogNn-VBNFES72yXPNUYQCv0CrXGOplY',
-        scope: 'read write follow push admin',
-        token_type: 'Bearer',
-      },
-    });
-    const action = {
-      type: actions.AUTH_LOGGED_OUT,
-    };
-    expect(reducer(state, action).toJS()).toMatchObject({
-      user: {},
-    });
-  });
-
 });
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index ef099bd4e..671ef0d0a 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -11,6 +11,7 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 
 const defaultState = ImmutableMap({
   app: ImmutableMap(),
+  users: ImmutableMap(),
   tokens: ImmutableMap(),
   me: null,
 });

From 431e41a71194346f16c9efdfc3e2f221ad60d71a Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 15:11:18 -0500
Subject: [PATCH 13/46] Add tests for VERIFY_CREDENTIALS_SUCCESS

---
 app/soapbox/reducers/__tests__/auth-test.js | 37 +++++++++++++++++++++
 1 file changed, 37 insertions(+)

diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index 381a871a3..090f80868 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -3,6 +3,7 @@ import { Map as ImmutableMap, fromJS } from 'immutable';
 import {
   AUTH_APP_CREATED,
   AUTH_LOGGED_IN,
+  VERIFY_CREDENTIALS_SUCCESS,
   VERIFY_CREDENTIALS_FAIL,
 } from 'soapbox/actions/auth';
 
@@ -59,6 +60,42 @@ describe('auth reducer', () => {
     });
   });
 
+  describe('VERIFY_CREDENTIALS_SUCCESS', () => {
+    it('should import the user', () => {
+      const action = {
+        type: VERIFY_CREDENTIALS_SUCCESS,
+        token: 'ABCDEFG',
+        account: { id: '1234' },
+      };
+
+      const expected = fromJS({
+        '1234': { id: '1234', access_token: 'ABCDEFG' },
+      });
+
+      const result = reducer(undefined, action);
+      expect(result.get('users')).toEqual(expected);
+    });
+
+    it('should set the account in the token', () => {
+      const action = {
+        type: VERIFY_CREDENTIALS_SUCCESS,
+        token: 'ABCDEFG',
+        account: { id: '1234' },
+      };
+
+      const state = fromJS({
+        tokens: { 'ABCDEFG': { token_type: 'Bearer', access_token: 'ABCDEFG' } },
+      });
+
+      const expected = fromJS({
+        'ABCDEFG': { token_type: 'Bearer', access_token: 'ABCDEFG', account: '1234' },
+      });
+
+      const result = reducer(state, action);
+      expect(result.get('tokens')).toEqual(expected);
+    });
+  });
+
   describe('VERIFY_CREDENTIALS_FAIL', () => {
     it('should delete the failed token', () => {
       const state = fromJS({

From 4682cecd33560b330f395d361d8c0ef19ddf5ab5 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 15:14:20 -0500
Subject: [PATCH 14/46] Add test for SWITCH_ACCOUNT

---
 app/soapbox/reducers/__tests__/auth-test.js | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index 090f80868..b07716431 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -5,6 +5,7 @@ import {
   AUTH_LOGGED_IN,
   VERIFY_CREDENTIALS_SUCCESS,
   VERIFY_CREDENTIALS_FAIL,
+  SWITCH_ACCOUNT,
 } from 'soapbox/actions/auth';
 
 describe('auth reducer', () => {
@@ -145,4 +146,12 @@ describe('auth reducer', () => {
       expect(result.get('me')).toEqual('5678');
     });
   });
+
+  describe('SWITCH_ACCOUNT', () => {
+    it('sets the value of `me`', () => {
+      const action = { type: SWITCH_ACCOUNT, accountId: '5678' };
+      const result = reducer(undefined, action);
+      expect(result.get('me')).toEqual('5678');
+    });
+  });
 });

From a00a1bbc3048b27add5ca47398179d092f6bcd33 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 15:17:05 -0500
Subject: [PATCH 15/46] Test VERIFY_CREDENTIALS_SUCCESS interactions with `me`

---
 app/soapbox/reducers/__tests__/auth-test.js | 24 +++++++++++++++++++++
 1 file changed, 24 insertions(+)

diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index b07716431..42bae3bf0 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -95,6 +95,30 @@ describe('auth reducer', () => {
       const result = reducer(state, action);
       expect(result.get('tokens')).toEqual(expected);
     });
+
+    it('sets `me` to the account if unset', () => {
+      const action = {
+        type: VERIFY_CREDENTIALS_SUCCESS,
+        token: 'ABCDEFG',
+        account: { id: '1234' },
+      };
+
+      const result = reducer(undefined, action);
+      expect(result.get('me')).toEqual('1234');
+    });
+
+    it('leaves `me` alone if already set', () => {
+      const action = {
+        type: VERIFY_CREDENTIALS_SUCCESS,
+        token: 'ABCDEFG',
+        account: { id: '1234' },
+      };
+
+      const state = fromJS({ me: '5678' });
+
+      const result = reducer(state, action);
+      expect(result.get('me')).toEqual('5678');
+    });
   });
 
   describe('VERIFY_CREDENTIALS_FAIL', () => {

From ee9b4cb969a3bc85526e75f1c07b3b639b43380c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 16:18:14 -0500
Subject: [PATCH 16/46] Upgrade user localStorage auth to the new format

---
 app/soapbox/reducers/__tests__/auth-test.js | 16 ++++++++
 app/soapbox/reducers/auth.js                | 41 +++++++++++++++++++++
 2 files changed, 57 insertions(+)

diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index 42bae3bf0..4adce1eae 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -18,6 +18,22 @@ describe('auth reducer', () => {
     }));
   });
 
+  describe('@@INIT', () => {
+    it('sets `me` to the next available user if blank', () => {
+      const state = fromJS({
+        me: null,
+        users: {
+          '1234': { id: '1234', access_token: 'ABCDEFG' },
+          '5678': { id: '5678', access_token: 'HIJKLMN' },
+        },
+      });
+
+      const action = { type: '@@INIT' };
+      const result = reducer(state, action);
+      expect(result.get('me')).toEqual('1234');
+    });
+  });
+
   describe('AUTH_APP_CREATED', () => {
     it('should copy in the app', () => {
       const token = { token_type: 'Bearer', access_token: 'ABCDEFG' };
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 671ef0d0a..c0b0ffe09 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -31,6 +31,7 @@ const importCredentials = (state, token, account) => {
     }));
     state.setIn(['tokens', token, 'account'], account.id);
     state.update('me', null, me => me || account.id);
+    upgradeLegacyId(state, account);
   });
 };
 
@@ -54,8 +55,48 @@ const importFailedToken = (state, token) => {
   });
 };
 
+// Upgrade the initial state
+const migrateLegacy = state => {
+  if (localState) return state;
+  return state.withMutations(state => {
+    const app = fromJS(JSON.parse(localStorage.getItem('soapbox:auth:app')));
+    const user = fromJS(JSON.parse(localStorage.getItem('soapbox:auth:user')));
+    state.set('me', '_legacy'); // Placeholder account ID
+    state.set('app', app);
+    state.set('tokens', ImmutableMap({
+      [user.get('access_token')]: user.set('account', '_legacy'),
+    }));
+    state.set('users', ImmutableMap({
+      '_legacy': ImmutableMap({
+        id: '_legacy',
+        access_token: user.get('access_token'),
+      }),
+    }));
+  });
+};
+
+// Upgrade the `_legacy` placeholder ID with a real account
+const upgradeLegacyId = (state, account) => {
+  if (localState) return state;
+  return state.withMutations(state => {
+    state.update('me', null, me => me === '_legacy' ? account.id : me);
+    state.deleteIn(['users', '_legacy']);
+  });
+  // TODO: Delete `soapbox:auth:app` and `soapbox:auth:user` localStorage?
+  // By this point it's probably safe, but we'll leave it just in case.
+};
+
+const initialize = state => {
+  return state.withMutations(state => {
+    maybeShiftMe(state);
+    migrateLegacy(state);
+  });
+};
+
 const reducer = (state, action) => {
   switch(action.type) {
+  case '@@INIT':
+    return initialize(state);
   case AUTH_APP_CREATED:
     return state.set('app', fromJS(action.app));
   case AUTH_APP_AUTHORIZED:

From b4cab465536f011d5e14290be660dea60ac75f93 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 16:24:46 -0500
Subject: [PATCH 17/46] Only reload with SWITCH_ACCOUNT (for now)

---
 app/soapbox/reducers/auth.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index c0b0ffe09..dc9e67f4f 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -120,8 +120,7 @@ export default function auth(oldState = initialState, action) {
   const state = reducer(oldState, action);
   localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
 
-  // Reload the page when the current user changes.
-  if (state.get('me') !== oldState.get('me')) {
+  if (action.type === SWITCH_ACCOUNT) {
     location.reload();
   }
 

From 94da1f67226f1b1b9974426536ba2a445c5e99f2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 16:49:24 -0500
Subject: [PATCH 18/46] Reload the page conditionally

---
 app/soapbox/reducers/auth.js | 23 +++++++++++++++++++----
 1 file changed, 19 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index dc9e67f4f..1a9a72c82 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -116,13 +116,28 @@ const reducer = (state, action) => {
   }
 };
 
-export default function auth(oldState = initialState, action) {
-  const state = reducer(oldState, action);
-  localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
+const maybeReload = (oldState, state, action) => {
+  const conds = [
+    action.type === SWITCH_ACCOUNT,
+    action.type === VERIFY_CREDENTIALS_FAIL && state.get('me') !== oldState.get('me'),
+  ];
 
-  if (action.type === SWITCH_ACCOUNT) {
+  // Reload if any of these conditions are true
+  const shouldReload = conds.some(cond => cond);
+
+  if (shouldReload) {
     location.reload();
   }
+};
+
+export default function auth(oldState = initialState, action) {
+  const state = reducer(oldState, action);
+
+  // Persist the state in localStorage
+  localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
+
+  // Reload the page under some conditions
+  maybeReload(oldState, state, action);
 
   return state;
 };

From 74f48229fc53be06b18dbba0e446ae1a2fa679d4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Wed, 24 Mar 2021 17:53:09 -0500
Subject: [PATCH 19/46] Fix streaming access token

---
 app/soapbox/features/ui/index.js | 3 ++-
 app/soapbox/stream.js            | 3 ++-
 app/soapbox/utils/auth.js        | 4 ++++
 3 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 app/soapbox/utils/auth.js

diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 194f2cdc0..8b5c1318c 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -40,6 +40,7 @@ import Icon from 'soapbox/components/icon';
 import { isStaff } from 'soapbox/utils/accounts';
 import ChatPanes from 'soapbox/features/chats/components/chat_panes';
 import ProfileHoverCard from 'soapbox/components/profile_hover_card';
+import { getAccessToken } from 'soapbox/utils/auth';
 
 import {
   Status,
@@ -111,7 +112,7 @@ const mapStateToProps = state => {
     hasComposingText: state.getIn(['compose', 'text']).trim().length !== 0,
     hasMediaAttachments: state.getIn(['compose', 'media_attachments']).size > 0,
     dropdownMenuIsOpen: state.getIn(['dropdown_menu', 'openId']) !== null,
-    accessToken: state.getIn(['auth', 'user', 'access_token']),
+    accessToken: getAccessToken(state),
     streamingUrl: state.getIn(['instance', 'urls', 'streaming_api']),
     me,
     account,
diff --git a/app/soapbox/stream.js b/app/soapbox/stream.js
index 4622df344..cd6a16bf7 100644
--- a/app/soapbox/stream.js
+++ b/app/soapbox/stream.js
@@ -1,13 +1,14 @@
 'use strict';
 
 import WebSocketClient from 'websocket.js';
+import { getAccessToken } from 'soapbox/utils/auth';
 
 const randomIntUpTo = max => Math.floor(Math.random() * Math.floor(max));
 
 export function connectStream(path, pollingRefresh = null, callbacks = () => ({ onConnect() {}, onDisconnect() {}, onReceive() {} })) {
   return (dispatch, getState) => {
     const streamingAPIBaseURL = getState().getIn(['instance', 'urls', 'streaming_api']);
-    const accessToken = getState().getIn(['auth', 'user', 'access_token']);
+    const accessToken = getAccessToken(getState());
     const { onConnect, onDisconnect, onReceive } = callbacks(dispatch, getState);
 
     let polling = null;
diff --git a/app/soapbox/utils/auth.js b/app/soapbox/utils/auth.js
new file mode 100644
index 000000000..3fb5e7483
--- /dev/null
+++ b/app/soapbox/utils/auth.js
@@ -0,0 +1,4 @@
+export const getAccessToken = state => {
+  const me = state.getIn(['auth', 'me']);
+  return state.getIn(['auth', 'users', me, 'access_token']);
+};

From 007527328ef05cbbc1925225f8dfbdc51907edbd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 12:21:48 -0500
Subject: [PATCH 20/46] Start building LoginModal

---
 .../features/ui/components/login_modal.js     | 66 +++++++++++++++++++
 .../features/ui/components/modal_root.js      |  2 +
 .../ui/components/profile_dropdown.js         |  9 ++-
 app/styles/components/modal.scss              |  3 +-
 4 files changed, 78 insertions(+), 2 deletions(-)
 create mode 100644 app/soapbox/features/ui/components/login_modal.js

diff --git a/app/soapbox/features/ui/components/login_modal.js b/app/soapbox/features/ui/components/login_modal.js
new file mode 100644
index 000000000..3f3e7a1fa
--- /dev/null
+++ b/app/soapbox/features/ui/components/login_modal.js
@@ -0,0 +1,66 @@
+import React from 'react';
+import { connect } from 'react-redux';
+import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
+import { Link } from 'react-router-dom';
+import ImmutablePureComponent from 'react-immutable-pure-component';
+import PropTypes from 'prop-types';
+import Button from '../../../components/button';
+import { SimpleForm, FieldsGroup, Checkbox } from 'soapbox/features/forms';
+
+const messages = defineMessages({
+  username: { id: 'login.fields.username_placeholder', defaultMessage: 'Username' },
+  password: { id: 'login.fields.password_placeholder', defaultMessage: 'Password' },
+});
+
+export default @connect()
+@injectIntl
+class LoginModal extends ImmutablePureComponent {
+
+  render() {
+    const { intl, isLoading, handleSubmit } = this.props;
+
+    return (
+      <div className='modal-root__modal login-modal'>
+        <form className='simple_form new_user' method='post' onSubmit={handleSubmit}>
+          <fieldset disabled={isLoading}>
+            <div className='fields-group'>
+              <div className='input email user_email'>
+                <input
+                  aria-label={intl.formatMessage(messages.username)}
+                  className='string email'
+                  placeholder={intl.formatMessage(messages.username)}
+                  type='text'
+                  name='username'
+                  autoComplete='off'
+                  required
+                />
+              </div>
+              <div className='input password user_password'>
+                <input
+                  aria-label={intl.formatMessage(messages.password)}
+                  className='password'
+                  placeholder={intl.formatMessage(messages.password)}
+                  type='password'
+                  name='password'
+                  autoComplete='off'
+                  required
+                />
+              </div>
+              <p className='hint subtle-hint'>
+                <Link to='/auth/reset_password'>
+                  <FormattedMessage id='login.reset_password_hint' defaultMessage='Trouble logging in?' />
+                </Link>
+              </p>
+            </div>
+          </fieldset>
+          <div className='actions'>
+            <button name='button' type='submit' className='btn button button-primary'>
+              <FormattedMessage id='login.log_in' defaultMessage='Log in' />
+            </button>
+          </div>
+        </form>
+      </div>
+    );
+  }
+
+}
diff --git a/app/soapbox/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal_root.js
index b6cfa5737..4f27024c1 100644
--- a/app/soapbox/features/ui/components/modal_root.js
+++ b/app/soapbox/features/ui/components/modal_root.js
@@ -13,6 +13,7 @@ import FocalPointModal from './focal_point_modal';
 import HotkeysModal from './hotkeys_modal';
 import ComposeModal from './compose_modal';
 import UnauthorizedModal from './unauthorized_modal';
+import LoginModal from './login_modal';
 
 import {
   MuteModal,
@@ -37,6 +38,7 @@ const MODAL_COMPONENTS = {
   'HOTKEYS': () => Promise.resolve({ default: HotkeysModal }),
   'COMPOSE': () => Promise.resolve({ default: ComposeModal }),
   'UNAUTHORIZED': () => Promise.resolve({ default: UnauthorizedModal }),
+  'LOGIN': () => Promise.resolve({ default: LoginModal }),
 };
 
 export default class ModalRoot extends React.PureComponent {
diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
index abb257852..c53533d7f 100644
--- a/app/soapbox/features/ui/components/profile_dropdown.js
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -1,6 +1,6 @@
 import React from 'react';
 import { connect } from 'react-redux';
-// import { openModal } from '../../../actions/modal';
+import { openModal } from '../../../actions/modal';
 import { fetchOwnAccounts } from 'soapbox/actions/auth';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
@@ -11,6 +11,7 @@ import { logOut, switchAccount } from 'soapbox/actions/auth';
 import { List as ImmutableList } from 'immutable';
 
 const messages = defineMessages({
+  add: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
   switch: { id: 'profile_dropdown.switch_account', defaultMessage: 'Switch to @{acct}' },
   logout: { id: 'profile_dropdown.logout', defaultMessage: 'Log out @{acct}' },
 });
@@ -62,6 +63,11 @@ class ProfileDropdown extends React.PureComponent {
     };
   }
 
+  handleAddAccount = e => {
+    this.props.dispatch(openModal('LOGIN'));
+    e.preventDefault();
+  }
+
   componentDidMount() {
     this.props.dispatch(fetchOwnAccounts());
   }
@@ -84,6 +90,7 @@ class ProfileDropdown extends React.PureComponent {
       menu.push(null);
     }
 
+    menu.push({ text: intl.formatMessage(messages.add), action: this.handleAddAccount });
     menu.push({ text: intl.formatMessage(messages.logout, { acct: account.get('acct') }), to: '/auth/sign_out', action: this.handleLogOut });
 
     return (
diff --git a/app/styles/components/modal.scss b/app/styles/components/modal.scss
index e64965da4..a4c82d516 100644
--- a/app/styles/components/modal.scss
+++ b/app/styles/components/modal.scss
@@ -193,7 +193,8 @@
 
 .onboarding-modal,
 .error-modal,
-.embed-modal {
+.embed-modal,
+.login-modal {
   background: var(--background-color);
   color: var(--primary-text-color);
   border-radius: 8px;

From 71c62c05b8fe1e384912a9b807e391ec1475a592 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 12:25:45 -0500
Subject: [PATCH 21/46] Move isLoggedIn to utils/auth.js

---
 app/soapbox/actions/accounts.js      | 2 +-
 app/soapbox/actions/blocks.js        | 2 +-
 app/soapbox/actions/compose.js       | 2 +-
 app/soapbox/actions/conversations.js | 2 +-
 app/soapbox/actions/domain_blocks.js | 2 +-
 app/soapbox/actions/emoji_reacts.js  | 2 +-
 app/soapbox/actions/favourites.js    | 2 +-
 app/soapbox/actions/filters.js       | 2 +-
 app/soapbox/actions/group_editor.js  | 2 +-
 app/soapbox/actions/groups.js        | 2 +-
 app/soapbox/actions/interactions.js  | 2 +-
 app/soapbox/actions/lists.js         | 2 +-
 app/soapbox/actions/mutes.js         | 2 +-
 app/soapbox/actions/notifications.js | 2 +-
 app/soapbox/actions/settings.js      | 2 +-
 app/soapbox/actions/statuses.js      | 2 +-
 app/soapbox/actions/suggestions.js   | 2 +-
 app/soapbox/utils/accounts.js        | 2 --
 app/soapbox/utils/auth.js            | 4 ++++
 19 files changed, 21 insertions(+), 19 deletions(-)

diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js
index 725fb8130..4ac4f2769 100644
--- a/app/soapbox/actions/accounts.js
+++ b/app/soapbox/actions/accounts.js
@@ -6,7 +6,7 @@ import {
   importFetchedAccounts,
   importErrorWhileFetchingAccountByUsername,
 } from './importer';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/blocks.js b/app/soapbox/actions/blocks.js
index 66d13d4ec..5c351b674 100644
--- a/app/soapbox/actions/blocks.js
+++ b/app/soapbox/actions/blocks.js
@@ -1,7 +1,7 @@
 import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const BLOCKS_FETCH_REQUEST = 'BLOCKS_FETCH_REQUEST';
 export const BLOCKS_FETCH_SUCCESS = 'BLOCKS_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/compose.js b/app/soapbox/actions/compose.js
index f7af6de51..54519c112 100644
--- a/app/soapbox/actions/compose.js
+++ b/app/soapbox/actions/compose.js
@@ -13,7 +13,7 @@ import { openModal, closeModal } from './modal';
 import { getSettings } from './settings';
 import { getFeatures } from 'soapbox/utils/features';
 import { uploadMedia } from './media';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 let cancelFetchComposeSuggestionsAccounts;
 
diff --git a/app/soapbox/actions/conversations.js b/app/soapbox/actions/conversations.js
index c43fe3efb..e019441f9 100644
--- a/app/soapbox/actions/conversations.js
+++ b/app/soapbox/actions/conversations.js
@@ -4,7 +4,7 @@ import {
   importFetchedStatuses,
   importFetchedStatus,
 } from './importer';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const CONVERSATIONS_MOUNT   = 'CONVERSATIONS_MOUNT';
 export const CONVERSATIONS_UNMOUNT = 'CONVERSATIONS_UNMOUNT';
diff --git a/app/soapbox/actions/domain_blocks.js b/app/soapbox/actions/domain_blocks.js
index c8da042f0..533885a56 100644
--- a/app/soapbox/actions/domain_blocks.js
+++ b/app/soapbox/actions/domain_blocks.js
@@ -1,5 +1,5 @@
 import api, { getLinks } from '../api';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const DOMAIN_BLOCK_REQUEST = 'DOMAIN_BLOCK_REQUEST';
 export const DOMAIN_BLOCK_SUCCESS = 'DOMAIN_BLOCK_SUCCESS';
diff --git a/app/soapbox/actions/emoji_reacts.js b/app/soapbox/actions/emoji_reacts.js
index 206c4fc43..60bb46c2f 100644
--- a/app/soapbox/actions/emoji_reacts.js
+++ b/app/soapbox/actions/emoji_reacts.js
@@ -1,7 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import { favourite, unfavourite } from './interactions';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const EMOJI_REACT_REQUEST = 'EMOJI_REACT_REQUEST';
 export const EMOJI_REACT_SUCCESS = 'EMOJI_REACT_SUCCESS';
diff --git a/app/soapbox/actions/favourites.js b/app/soapbox/actions/favourites.js
index d5c362ebf..02ecc81c3 100644
--- a/app/soapbox/actions/favourites.js
+++ b/app/soapbox/actions/favourites.js
@@ -1,6 +1,6 @@
 import api, { getLinks } from '../api';
 import { importFetchedStatuses } from './importer';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const FAVOURITED_STATUSES_FETCH_REQUEST = 'FAVOURITED_STATUSES_FETCH_REQUEST';
 export const FAVOURITED_STATUSES_FETCH_SUCCESS = 'FAVOURITED_STATUSES_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/filters.js b/app/soapbox/actions/filters.js
index 9823509e6..ab2767a14 100644
--- a/app/soapbox/actions/filters.js
+++ b/app/soapbox/actions/filters.js
@@ -1,6 +1,6 @@
 import api from '../api';
 import snackbar from 'soapbox/actions/snackbar';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const FILTERS_FETCH_REQUEST = 'FILTERS_FETCH_REQUEST';
 export const FILTERS_FETCH_SUCCESS = 'FILTERS_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/group_editor.js b/app/soapbox/actions/group_editor.js
index b165e0236..b74533a14 100644
--- a/app/soapbox/actions/group_editor.js
+++ b/app/soapbox/actions/group_editor.js
@@ -1,5 +1,5 @@
 import api from '../api';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const GROUP_CREATE_REQUEST      = 'GROUP_CREATE_REQUEST';
 export const GROUP_CREATE_SUCCESS      = 'GROUP_CREATE_SUCCESS';
diff --git a/app/soapbox/actions/groups.js b/app/soapbox/actions/groups.js
index 14a487370..588cbe6e2 100644
--- a/app/soapbox/actions/groups.js
+++ b/app/soapbox/actions/groups.js
@@ -1,7 +1,7 @@
 import api, { getLinks } from '../api';
 import { importFetchedAccounts } from './importer';
 import { fetchRelationships } from './accounts';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const GROUP_FETCH_REQUEST = 'GROUP_FETCH_REQUEST';
 export const GROUP_FETCH_SUCCESS = 'GROUP_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/interactions.js b/app/soapbox/actions/interactions.js
index bd6f3218d..73da37c96 100644
--- a/app/soapbox/actions/interactions.js
+++ b/app/soapbox/actions/interactions.js
@@ -1,7 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts, importFetchedStatus } from './importer';
 import snackbar from 'soapbox/actions/snackbar';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const REBLOG_REQUEST = 'REBLOG_REQUEST';
 export const REBLOG_SUCCESS = 'REBLOG_SUCCESS';
diff --git a/app/soapbox/actions/lists.js b/app/soapbox/actions/lists.js
index 13a28ddf0..68171cbe3 100644
--- a/app/soapbox/actions/lists.js
+++ b/app/soapbox/actions/lists.js
@@ -1,7 +1,7 @@
 import api from '../api';
 import { importFetchedAccounts } from './importer';
 import { showAlertForError } from './alerts';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const LIST_FETCH_REQUEST = 'LIST_FETCH_REQUEST';
 export const LIST_FETCH_SUCCESS = 'LIST_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/mutes.js b/app/soapbox/actions/mutes.js
index 1d081584a..7ad66a3c0 100644
--- a/app/soapbox/actions/mutes.js
+++ b/app/soapbox/actions/mutes.js
@@ -2,7 +2,7 @@ import api, { getLinks } from '../api';
 import { fetchRelationships } from './accounts';
 import { importFetchedAccounts } from './importer';
 import { openModal } from './modal';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const MUTES_FETCH_REQUEST = 'MUTES_FETCH_REQUEST';
 export const MUTES_FETCH_SUCCESS = 'MUTES_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/notifications.js b/app/soapbox/actions/notifications.js
index 4013934f6..07bc3e1cf 100644
--- a/app/soapbox/actions/notifications.js
+++ b/app/soapbox/actions/notifications.js
@@ -17,7 +17,7 @@ import {
 } from 'immutable';
 import { unescapeHTML } from '../utils/html';
 import { getFilters, regexFromFilters } from '../selectors';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const NOTIFICATIONS_UPDATE      = 'NOTIFICATIONS_UPDATE';
 export const NOTIFICATIONS_UPDATE_NOOP = 'NOTIFICATIONS_UPDATE_NOOP';
diff --git a/app/soapbox/actions/settings.js b/app/soapbox/actions/settings.js
index 2e72c65ad..77ab9b91d 100644
--- a/app/soapbox/actions/settings.js
+++ b/app/soapbox/actions/settings.js
@@ -2,7 +2,7 @@ import { debounce } from 'lodash';
 import { showAlertForError } from './alerts';
 import { patchMe } from 'soapbox/actions/me';
 import { Map as ImmutableMap, List as ImmutableList } from 'immutable';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 import uuid from '../uuid';
 
 export const SETTING_CHANGE = 'SETTING_CHANGE';
diff --git a/app/soapbox/actions/statuses.js b/app/soapbox/actions/statuses.js
index 7712e1bd9..f06aefa39 100644
--- a/app/soapbox/actions/statuses.js
+++ b/app/soapbox/actions/statuses.js
@@ -4,7 +4,7 @@ import { evictStatus } from '../storage/modifier';
 import { deleteFromTimelines } from './timelines';
 import { importFetchedStatus, importFetchedStatuses, importAccount, importStatus } from './importer';
 import { openModal } from './modal';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const STATUS_FETCH_REQUEST = 'STATUS_FETCH_REQUEST';
 export const STATUS_FETCH_SUCCESS = 'STATUS_FETCH_SUCCESS';
diff --git a/app/soapbox/actions/suggestions.js b/app/soapbox/actions/suggestions.js
index bf6edffb4..788166d8b 100644
--- a/app/soapbox/actions/suggestions.js
+++ b/app/soapbox/actions/suggestions.js
@@ -1,6 +1,6 @@
 import api from '../api';
 import { importFetchedAccounts } from './importer';
-import { isLoggedIn } from 'soapbox/utils/accounts';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const SUGGESTIONS_FETCH_REQUEST = 'SUGGESTIONS_FETCH_REQUEST';
 export const SUGGESTIONS_FETCH_SUCCESS = 'SUGGESTIONS_FETCH_SUCCESS';
diff --git a/app/soapbox/utils/accounts.js b/app/soapbox/utils/accounts.js
index 6dd60feae..7e25f868c 100644
--- a/app/soapbox/utils/accounts.js
+++ b/app/soapbox/utils/accounts.js
@@ -49,5 +49,3 @@ export const isLocal = account => {
 export const isVerified = account => (
   account.getIn(['pleroma', 'tags'], ImmutableList()).includes('verified')
 );
-
-export const isLoggedIn = getState => typeof getState().get('me') === 'string';
diff --git a/app/soapbox/utils/auth.js b/app/soapbox/utils/auth.js
index 3fb5e7483..6d3bb3d7f 100644
--- a/app/soapbox/utils/auth.js
+++ b/app/soapbox/utils/auth.js
@@ -1,3 +1,7 @@
+export const isLoggedIn = getState => {
+  return typeof getState().get('me') === 'string';
+};
+
 export const getAccessToken = state => {
   const me = state.getIn(['auth', 'me']);
   return state.getIn(['auth', 'users', me, 'access_token']);

From 4ff1f0fa6338c831ac194d599bcb761dfa76741d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 12:28:53 -0500
Subject: [PATCH 22/46] Add another isLoggedIn condition

---
 app/soapbox/actions/pin_statuses.js | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/app/soapbox/actions/pin_statuses.js b/app/soapbox/actions/pin_statuses.js
index 0a4a320c1..17f1bfd14 100644
--- a/app/soapbox/actions/pin_statuses.js
+++ b/app/soapbox/actions/pin_statuses.js
@@ -1,5 +1,6 @@
 import api from '../api';
 import { importFetchedStatuses } from './importer';
+import { isLoggedIn } from 'soapbox/utils/auth';
 
 export const PINNED_STATUSES_FETCH_REQUEST = 'PINNED_STATUSES_FETCH_REQUEST';
 export const PINNED_STATUSES_FETCH_SUCCESS = 'PINNED_STATUSES_FETCH_SUCCESS';
@@ -7,8 +8,8 @@ export const PINNED_STATUSES_FETCH_FAIL = 'PINNED_STATUSES_FETCH_FAIL';
 
 export function fetchPinnedStatuses() {
   return (dispatch, getState) => {
+    if (!isLoggedIn(getState)) return;
     const me = getState().get('me');
-    if (!me) return;
 
     dispatch(fetchPinnedStatusesRequest());
 

From c14fc83ac15d482f091be91084fa8f6ef17540fb Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 13:23:11 -0500
Subject: [PATCH 23/46] Improve style of profile dropdown

---
 .../features/ui/components/profile_dropdown.js | 18 ++++++++++++++++--
 app/styles/components/dropdown-menu.scss       |  8 ++++++++
 2 files changed, 24 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
index c53533d7f..0836682ba 100644
--- a/app/soapbox/features/ui/components/profile_dropdown.js
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -9,10 +9,11 @@ import { isStaff } from 'soapbox/utils/accounts';
 import { defineMessages, injectIntl } from 'react-intl';
 import { logOut, switchAccount } from 'soapbox/actions/auth';
 import { List as ImmutableList } from 'immutable';
+import Avatar from 'soapbox/components/avatar';
+import DisplayName from 'soapbox/components/display_name';
 
 const messages = defineMessages({
   add: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
-  switch: { id: 'profile_dropdown.switch_account', defaultMessage: 'Switch to @{acct}' },
   logout: { id: 'profile_dropdown.logout', defaultMessage: 'Log out @{acct}' },
 });
 
@@ -76,6 +77,19 @@ class ProfileDropdown extends React.PureComponent {
     this.props.dispatch(fetchOwnAccounts());
   }
 
+  renderAccount = account => {
+    return (
+      <div className='account'>
+        <div className='account__wrapper'>
+          <div className='account__display-name' title={account.get('acct')} href={`/@${account.get('acct')}`} to={`/@${account.get('acct')}`}>
+            <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+            <DisplayName account={account} />
+          </div>
+        </div>
+      </div>
+    );
+  }
+
   render() {
     const { intl, account, otherAccounts } = this.props;
     const size = this.props.size || 16;
@@ -83,7 +97,7 @@ class ProfileDropdown extends React.PureComponent {
     let menu = [];
 
     otherAccounts.forEach(account => {
-      menu.push({ text: intl.formatMessage(messages.switch, { acct: account.get('acct') }), action: this.handleSwitchAccount(account) });
+      menu.push({ text: this.renderAccount(account), action: this.handleSwitchAccount(account) });
     });
 
     if (otherAccounts.size > 0) {
diff --git a/app/styles/components/dropdown-menu.scss b/app/styles/components/dropdown-menu.scss
index 320a7cb94..4a101b5e4 100644
--- a/app/styles/components/dropdown-menu.scss
+++ b/app/styles/components/dropdown-menu.scss
@@ -70,6 +70,10 @@
       outline: 0;
       color: #fff;
       background: var(--brand-color) !important;
+
+      * {
+        color: #fff;
+      }
     }
   }
 
@@ -79,6 +83,10 @@
     height: 1px;
     background: var(--foreground-color);
   }
+
+  &__item .account {
+    line-height: normal;
+  }
 }
 // end .dropdown-menu
 

From 663d375dc5b5e165c03e1a9afbe2e3f6f4a3ed70 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 13:47:01 -0500
Subject: [PATCH 24/46] Throttle fetchOwnAccounts correctly

---
 app/soapbox/actions/auth.js                           |  5 ++---
 .../features/ui/components/profile_dropdown.js        | 11 ++++++++---
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 6b0418b8b..6b74c6234 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,6 +1,5 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
-import { throttle } from 'lodash';
 import snackbar from 'soapbox/actions/snackbar';
 
 export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
@@ -197,7 +196,7 @@ export function switchAccount(accountId) {
 }
 
 export function fetchOwnAccounts() {
-  return throttle((dispatch, getState) => {
+  return (dispatch, getState) => {
     const state = getState();
     state.getIn(['auth', 'users']).forEach(user => {
       const account = state.getIn(['accounts', user.get('id')]);
@@ -205,7 +204,7 @@ export function fetchOwnAccounts() {
         dispatch(verifyCredentials(user.get('access_token')));
       }
     });
-  }, 2000);
+  };
 }
 
 export function register(params) {
diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
index 0836682ba..34311ca17 100644
--- a/app/soapbox/features/ui/components/profile_dropdown.js
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -2,6 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { openModal } from '../../../actions/modal';
 import { fetchOwnAccounts } from 'soapbox/actions/auth';
+import { throttle } from 'lodash';
 import PropTypes from 'prop-types';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import DropdownMenuContainer from '../../../containers/dropdown_menu_container';
@@ -69,12 +70,16 @@ class ProfileDropdown extends React.PureComponent {
     e.preventDefault();
   }
 
-  componentDidMount() {
+  fetchOwnAccounts = throttle(() => {
     this.props.dispatch(fetchOwnAccounts());
+  }, 2000);
+
+  componentDidMount() {
+    this.fetchOwnAccounts();
   }
 
   componentDidUpdate() {
-    this.props.dispatch(fetchOwnAccounts());
+    this.fetchOwnAccounts();
   }
 
   renderAccount = account => {
@@ -104,7 +109,7 @@ class ProfileDropdown extends React.PureComponent {
       menu.push(null);
     }
 
-    menu.push({ text: intl.formatMessage(messages.add), action: this.handleAddAccount });
+    menu.push({ text: intl.formatMessage(messages.add), to: '/auth/sign_in' });
     menu.push({ text: intl.formatMessage(messages.logout, { acct: account.get('acct') }), to: '/auth/sign_out', action: this.handleLogOut });
 
     return (

From 7a5fb6abb54c86a958411719b5a4c20da686f853 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 14:42:09 -0500
Subject: [PATCH 25/46] Add new account from login page

---
 app/soapbox/actions/auth.js                      |  2 +-
 .../features/auth_login/components/login_page.js | 11 ++++++-----
 app/soapbox/reducers/auth.js                     | 16 ++++++++--------
 3 files changed, 15 insertions(+), 14 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 6b74c6234..83cb82aea 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -191,7 +191,7 @@ export function logOut() {
   };
 }
 
-export function switchAccount(accountId) {
+export function switchAccount(accountId,) {
   return { type: SWITCH_ACCOUNT, accountId };
 }
 
diff --git a/app/soapbox/features/auth_login/components/login_page.js b/app/soapbox/features/auth_login/components/login_page.js
index 30e0cc94b..1ebdc8dda 100644
--- a/app/soapbox/features/auth_login/components/login_page.js
+++ b/app/soapbox/features/auth_login/components/login_page.js
@@ -1,10 +1,9 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { Redirect } from 'react-router-dom';
 import ImmutablePureComponent from 'react-immutable-pure-component';
 import LoginForm from './login_form';
 import OtpAuthForm from './otp_auth_form';
-import { logIn, verifyCredentials } from 'soapbox/actions/auth';
+import { logIn, verifyCredentials, switchAccount } from 'soapbox/actions/auth';
 
 const mapStateToProps = state => ({
   me: state.get('me'),
@@ -32,10 +31,14 @@ class LoginPage extends ImmutablePureComponent {
   }
 
   handleSubmit = (event) => {
-    const { dispatch } = this.props;
+    const { dispatch, me } = this.props;
     const { username, password } = this.getFormData(event.target);
     dispatch(logIn(username, password)).then(({ access_token }) => {
       return dispatch(verifyCredentials(access_token));
+    }).then(account => {
+      if (typeof me === 'string') {
+        dispatch(switchAccount(account.id));
+      }
     }).catch(error => {
       if (error.response.data.error === 'mfa_required') {
         this.setState({ mfa_auth_needed: true, mfa_token: error.response.data.mfa_token });
@@ -47,9 +50,7 @@ class LoginPage extends ImmutablePureComponent {
   }
 
   render() {
-    const { me } = this.props;
     const { isLoading, mfa_auth_needed, mfa_token } = this.state;
-    if (me) return <Redirect to='/' />;
 
     if (mfa_auth_needed) return <OtpAuthForm mfa_token={mfa_token} />;
 
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 1a9a72c82..d44767f87 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -117,15 +117,15 @@ const reducer = (state, action) => {
 };
 
 const maybeReload = (oldState, state, action) => {
-  const conds = [
-    action.type === SWITCH_ACCOUNT,
-    action.type === VERIFY_CREDENTIALS_FAIL && state.get('me') !== oldState.get('me'),
-  ];
+  if (action.type === SWITCH_ACCOUNT) {
+    if (location.pathname === '/auth/sign_in') {
+      location.replace('/');
+    } else {
+      location.reload();
+    }
+  }
 
-  // Reload if any of these conditions are true
-  const shouldReload = conds.some(cond => cond);
-
-  if (shouldReload) {
+  if (action.type === VERIFY_CREDENTIALS_FAIL && state.get('me') !== oldState.get('me')) {
     location.reload();
   }
 };

From a5f6fa66acb64924e8192c458994d6a85fe538ab Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 14:44:02 -0500
Subject: [PATCH 26/46] Remove LoginModal for now

---
 .../features/ui/components/login_modal.js     | 66 -------------------
 .../features/ui/components/modal_root.js      |  2 -
 2 files changed, 68 deletions(-)
 delete mode 100644 app/soapbox/features/ui/components/login_modal.js

diff --git a/app/soapbox/features/ui/components/login_modal.js b/app/soapbox/features/ui/components/login_modal.js
deleted file mode 100644
index 3f3e7a1fa..000000000
--- a/app/soapbox/features/ui/components/login_modal.js
+++ /dev/null
@@ -1,66 +0,0 @@
-import React from 'react';
-import { connect } from 'react-redux';
-import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
-import { Link } from 'react-router-dom';
-import ImmutablePureComponent from 'react-immutable-pure-component';
-import PropTypes from 'prop-types';
-import Button from '../../../components/button';
-import { SimpleForm, FieldsGroup, Checkbox } from 'soapbox/features/forms';
-
-const messages = defineMessages({
-  username: { id: 'login.fields.username_placeholder', defaultMessage: 'Username' },
-  password: { id: 'login.fields.password_placeholder', defaultMessage: 'Password' },
-});
-
-export default @connect()
-@injectIntl
-class LoginModal extends ImmutablePureComponent {
-
-  render() {
-    const { intl, isLoading, handleSubmit } = this.props;
-
-    return (
-      <div className='modal-root__modal login-modal'>
-        <form className='simple_form new_user' method='post' onSubmit={handleSubmit}>
-          <fieldset disabled={isLoading}>
-            <div className='fields-group'>
-              <div className='input email user_email'>
-                <input
-                  aria-label={intl.formatMessage(messages.username)}
-                  className='string email'
-                  placeholder={intl.formatMessage(messages.username)}
-                  type='text'
-                  name='username'
-                  autoComplete='off'
-                  required
-                />
-              </div>
-              <div className='input password user_password'>
-                <input
-                  aria-label={intl.formatMessage(messages.password)}
-                  className='password'
-                  placeholder={intl.formatMessage(messages.password)}
-                  type='password'
-                  name='password'
-                  autoComplete='off'
-                  required
-                />
-              </div>
-              <p className='hint subtle-hint'>
-                <Link to='/auth/reset_password'>
-                  <FormattedMessage id='login.reset_password_hint' defaultMessage='Trouble logging in?' />
-                </Link>
-              </p>
-            </div>
-          </fieldset>
-          <div className='actions'>
-            <button name='button' type='submit' className='btn button button-primary'>
-              <FormattedMessage id='login.log_in' defaultMessage='Log in' />
-            </button>
-          </div>
-        </form>
-      </div>
-    );
-  }
-
-}
diff --git a/app/soapbox/features/ui/components/modal_root.js b/app/soapbox/features/ui/components/modal_root.js
index 4f27024c1..b6cfa5737 100644
--- a/app/soapbox/features/ui/components/modal_root.js
+++ b/app/soapbox/features/ui/components/modal_root.js
@@ -13,7 +13,6 @@ import FocalPointModal from './focal_point_modal';
 import HotkeysModal from './hotkeys_modal';
 import ComposeModal from './compose_modal';
 import UnauthorizedModal from './unauthorized_modal';
-import LoginModal from './login_modal';
 
 import {
   MuteModal,
@@ -38,7 +37,6 @@ const MODAL_COMPONENTS = {
   'HOTKEYS': () => Promise.resolve({ default: HotkeysModal }),
   'COMPOSE': () => Promise.resolve({ default: ComposeModal }),
   'UNAUTHORIZED': () => Promise.resolve({ default: UnauthorizedModal }),
-  'LOGIN': () => Promise.resolve({ default: LoginModal }),
 };
 
 export default class ModalRoot extends React.PureComponent {

From bbd4edf226b0cf1552e56bad196ec7915e9af89d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 14:52:51 -0500
Subject: [PATCH 27/46] Typofix

---
 app/soapbox/actions/auth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 83cb82aea..6b74c6234 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -191,7 +191,7 @@ export function logOut() {
   };
 }
 
-export function switchAccount(accountId,) {
+export function switchAccount(accountId) {
   return { type: SWITCH_ACCOUNT, accountId };
 }
 

From 6ead42b06d832fd3b922c140c1ab81fcb76ee784 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 15:15:37 -0500
Subject: [PATCH 28/46] Handle logout

---
 app/soapbox/actions/auth.js                        | 13 ++++++-------
 .../features/ui/components/profile_dropdown.js     |  6 ------
 app/soapbox/reducers/auth.js                       | 14 +++++++++++---
 3 files changed, 17 insertions(+), 16 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 6b74c6234..be18746a9 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -177,17 +177,16 @@ export function logIn(username, password) {
 export function logOut() {
   return (dispatch, getState) => {
     const state = getState();
+    const me = state.getIn(['auth', 'me']);
 
-    dispatch({ type: AUTH_LOGGED_OUT });
-
-    // Attempt to destroy OAuth token on logout
-    api(getState).post('/oauth/revoke', {
+    return api(getState).post('/oauth/revoke', {
       client_id: state.getIn(['auth', 'app', 'client_id']),
       client_secret: state.getIn(['auth', 'app', 'client_secret']),
-      token: state.getIn(['auth', 'user', 'access_token']),
+      token: state.getIn(['auth', 'users', me, 'access_token']),
+    }).finally(() => {
+      dispatch({ type: AUTH_LOGGED_OUT, accountId: me });
+      dispatch(snackbar.success('Logged out.'));
     });
-
-    dispatch(snackbar.success('Logged out.'));
   };
 }
 
diff --git a/app/soapbox/features/ui/components/profile_dropdown.js b/app/soapbox/features/ui/components/profile_dropdown.js
index 34311ca17..7d644591a 100644
--- a/app/soapbox/features/ui/components/profile_dropdown.js
+++ b/app/soapbox/features/ui/components/profile_dropdown.js
@@ -1,6 +1,5 @@
 import React from 'react';
 import { connect } from 'react-redux';
-import { openModal } from '../../../actions/modal';
 import { fetchOwnAccounts } from 'soapbox/actions/auth';
 import { throttle } from 'lodash';
 import PropTypes from 'prop-types';
@@ -65,11 +64,6 @@ class ProfileDropdown extends React.PureComponent {
     };
   }
 
-  handleAddAccount = e => {
-    this.props.dispatch(openModal('LOGIN'));
-    e.preventDefault();
-  }
-
   fetchOwnAccounts = throttle(() => {
     this.props.dispatch(fetchOwnAccounts());
   }, 2000);
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index d44767f87..8b5b2e0fc 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -47,7 +47,7 @@ const maybeShiftMe = state => {
   }
 };
 
-const importFailedToken = (state, token) => {
+const deleteToken = (state, token) => {
   return state.withMutations(state => {
     state.update('tokens', ImmutableMap(), tokens => tokens.delete(token));
     state.update('users', ImmutableMap(), users => users.filterNot(user => user.get('access_token') === token));
@@ -55,6 +55,14 @@ const importFailedToken = (state, token) => {
   });
 };
 
+const deleteUser = (state, accountId) => {
+  return state.withMutations(state => {
+    state.update('users', ImmutableMap(), users => users.delete(accountId));
+    state.update('tokens', ImmutableMap(), tokens => tokens.filterNot(token => token.get('account') === accountId));
+    maybeShiftMe(state);
+  });
+};
+
 // Upgrade the initial state
 const migrateLegacy = state => {
   if (localState) return state;
@@ -104,11 +112,11 @@ const reducer = (state, action) => {
   case AUTH_LOGGED_IN:
     return importToken(state, action.token);
   case AUTH_LOGGED_OUT:
-    return state.set('user', ImmutableMap());
+    return deleteUser(state, action.accountId);
   case VERIFY_CREDENTIALS_SUCCESS:
     return importCredentials(state, action.token, action.account);
   case VERIFY_CREDENTIALS_FAIL:
-    return importFailedToken(state, action.token);
+    return deleteToken(state, action.token);
   case SWITCH_ACCOUNT:
     return state.set('me', action.accountId);
   default:

From 659cee1c491653eadfdf2eaf85a9279fd14d21c2 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 15:59:09 -0500
Subject: [PATCH 29/46] Refresh the page under more general conditions

---
 app/soapbox/reducers/auth.js  | 39 ++++++++++++++++++++++++++---------
 app/soapbox/reducers/index.js |  2 +-
 2 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 8b5b2e0fc..a6d1d58cb 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -124,17 +124,36 @@ const reducer = (state, action) => {
   }
 };
 
-const maybeReload = (oldState, state, action) => {
-  if (action.type === SWITCH_ACCOUNT) {
-    if (location.pathname === '/auth/sign_in') {
-      location.replace('/');
-    } else {
-      location.reload();
-    }
-  }
+// The user has a token stored in their browser
+const canAuth = state => {
+  state = maybeShiftMe(state);
+  const me = state.get('me');
+  const token = state.getIn(['users', me, 'access_token']);
+  return typeof token === 'string';
+};
 
-  if (action.type === VERIFY_CREDENTIALS_FAIL && state.get('me') !== oldState.get('me')) {
-    location.reload();
+// Reload, but redirect home if the user is already logged in
+const reload = state => {
+  if (location.pathname === '/auth/sign_in' && canAuth(state)) {
+    return location.replace('/');
+  } else {
+    return location.reload();
+  }
+};
+
+// `me` has changed from one valid ID to another
+const userSwitched = (oldState, state) => {
+  const validMe = state => typeof state.get('me') === 'string';
+
+  const stillValid = validMe(oldState) && validMe(state);
+  const didChange = oldState.get('me') !== state.get('me');
+
+  return stillValid && didChange;
+};
+
+const maybeReload = (oldState, state, action) => {
+  if (userSwitched(oldState, state)) {
+    reload(state);
   }
 };
 
diff --git a/app/soapbox/reducers/index.js b/app/soapbox/reducers/index.js
index 116766fab..48ddd77b8 100644
--- a/app/soapbox/reducers/index.js
+++ b/app/soapbox/reducers/index.js
@@ -109,7 +109,7 @@ const appReducer = combineReducers({
 
 // Clear the state (mostly) when the user logs out
 const logOut = (state = ImmutableMap()) => {
-  const whitelist = ['instance', 'soapbox', 'custom_emojis'];
+  const whitelist = ['instance', 'soapbox', 'custom_emojis', 'auth'];
 
   return ImmutableMap(
     whitelist.reduce((acc, curr) => {

From 619d2985478b377ff5bced38519ffb7366e9f232 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 16:39:52 -0500
Subject: [PATCH 30/46] Correctly import settings on login

---
 app/soapbox/actions/auth.js | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index be18746a9..3c576e6c5 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
 import snackbar from 'soapbox/actions/snackbar';
+import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
 
 export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
 
@@ -150,6 +151,7 @@ export function verifyCredentials(token) {
     return api(getState).request(request).then(({ data: account }) => {
       dispatch(importFetchedAccount(account));
       dispatch({ type: VERIFY_CREDENTIALS_SUCCESS, token, account });
+      if (account.id === getState().get('me')) dispatch({ type: ME_FETCH_SUCCESS, me: account });
       return account;
     }).catch(error => {
       dispatch({ type: VERIFY_CREDENTIALS_FAIL, token, error });

From 1e2b0c9eee261c50d0e44d062b2a35c3dcb4cdc9 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 17:12:31 -0500
Subject: [PATCH 31/46] Fix tests

---
 app/soapbox/actions/__tests__/auth-test.js    | 20 ------
 .../__snapshots__/login_page-test.js.snap     | 64 ++++++++++++++++++-
 app/soapbox/reducers/auth.js                  |  1 +
 3 files changed, 64 insertions(+), 21 deletions(-)
 delete mode 100644 app/soapbox/actions/__tests__/auth-test.js

diff --git a/app/soapbox/actions/__tests__/auth-test.js b/app/soapbox/actions/__tests__/auth-test.js
deleted file mode 100644
index 0e1e3d2b4..000000000
--- a/app/soapbox/actions/__tests__/auth-test.js
+++ /dev/null
@@ -1,20 +0,0 @@
-import {
-  AUTH_LOGGED_OUT,
-  logOut,
-} from '../auth';
-import { ALERT_SHOW } from '../alerts';
-import { Map as ImmutableMap } from 'immutable';
-import { mockStore } from 'soapbox/test_helpers';
-
-describe('logOut()', () => {
-  it('creates expected actions', () => {
-    const expectedActions = [
-      { type: AUTH_LOGGED_OUT },
-      { type: ALERT_SHOW, message: 'Logged out.', severity: 'success' },
-    ];
-    const store = mockStore(ImmutableMap());
-
-    store.dispatch(logOut());
-    return expect(store.getActions()).toEqual(expectedActions);
-  });
-});
diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
index c6cdc64e3..82586223c 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/login_page-test.js.snap
@@ -64,4 +64,66 @@ exports[`<LoginPage /> renders correctly on load 1`] = `
 </form>
 `;
 
-exports[`<LoginPage /> renders correctly on load 2`] = `null`;
+exports[`<LoginPage /> renders correctly on load 2`] = `
+<form
+  className="simple_form new_user"
+  method="post"
+  onSubmit={[Function]}
+>
+  <fieldset
+    disabled={false}
+  >
+    <div
+      className="fields-group"
+    >
+      <div
+        className="input email user_email"
+      >
+        <input
+          aria-label="Username"
+          autoComplete="off"
+          className="string email"
+          name="username"
+          placeholder="Username"
+          required={true}
+          type="text"
+        />
+      </div>
+      <div
+        className="input password user_password"
+      >
+        <input
+          aria-label="Password"
+          autoComplete="off"
+          className="password"
+          name="password"
+          placeholder="Password"
+          required={true}
+          type="password"
+        />
+      </div>
+      <p
+        className="hint subtle-hint"
+      >
+        <a
+          href="/auth/reset_password"
+          onClick={[Function]}
+        >
+          Trouble logging in?
+        </a>
+      </p>
+    </div>
+  </fieldset>
+  <div
+    className="actions"
+  >
+    <button
+      className="btn button button-primary"
+      name="button"
+      type="submit"
+    >
+      Log in
+    </button>
+  </div>
+</form>
+`;
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index a6d1d58cb..5509371bc 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -69,6 +69,7 @@ const migrateLegacy = state => {
   return state.withMutations(state => {
     const app = fromJS(JSON.parse(localStorage.getItem('soapbox:auth:app')));
     const user = fromJS(JSON.parse(localStorage.getItem('soapbox:auth:user')));
+    if (!user) return;
     state.set('me', '_legacy'); // Placeholder account ID
     state.set('app', app);
     state.set('tokens', ImmutableMap({

From 5c6fa253c7d23e7615e6174501500ab86e286f97 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 18:38:28 -0500
Subject: [PATCH 32/46] ['auth', 'me'] -> 'me'

---
 app/soapbox/actions/auth.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 3c576e6c5..80f58a950 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -179,7 +179,7 @@ export function logIn(username, password) {
 export function logOut() {
   return (dispatch, getState) => {
     const state = getState();
-    const me = state.getIn(['auth', 'me']);
+    const me = state.get('me');
 
     return api(getState).post('/oauth/revoke', {
       client_id: state.getIn(['auth', 'app', 'client_id']),

From fa4d36b7a7513fd20b278cc1c3453ef7c02a3ea8 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 18:56:07 -0500
Subject: [PATCH 33/46] Move ActionBar links into LinkFooter

---
 .../features/ui/components/link_footer.js      | 18 ++++++++++++++----
 1 file changed, 14 insertions(+), 4 deletions(-)

diff --git a/app/soapbox/features/ui/components/link_footer.js b/app/soapbox/features/ui/components/link_footer.js
index 68034c076..dcdbf70a2 100644
--- a/app/soapbox/features/ui/components/link_footer.js
+++ b/app/soapbox/features/ui/components/link_footer.js
@@ -6,6 +6,7 @@ import { Link } from 'react-router-dom';
 import { connect } from 'react-redux';
 import { openModal } from '../../../actions/modal';
 import { logOut } from 'soapbox/actions/auth';
+import { isStaff } from 'soapbox/utils/accounts';
 
 // FIXME: Let this be configured
 const sourceCode = {
@@ -35,10 +36,19 @@ const mapDispatchToProps = (dispatch) => ({
 const LinkFooter = ({ onOpenHotkeys, account, onClickLogOut }) => (
   <div className='getting-started__footer'>
     <ul>
-      {account && <li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a></li>}
-      {/* {account && <li><a href='/auth/edit'><FormattedMessage id='getting_started.security' defaultMessage='Security' /></a> · </li>} */}
-      <li><a href='/about'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></a></li>
-      {/* <li><a href='/settings/applications'><FormattedMessage id='getting_started.developers' defaultMessage='Developers' /></a> · </li> */}
+      {account && <>
+        <li><Link to='/blocks'><FormattedMessage id='navigation_bar.blocks' defaultMessage='Blocked users' /></Link></li>
+        <li><Link to='/mutes'><FormattedMessage id='navigation_bar.mutes' defaultMessage='Muted users' /></Link></li>
+        <li><Link to='/filters'><FormattedMessage id='navigation_bar.filters' defaultMessage='Muted words' /></Link></li>
+        <li><Link to='/domain_blocks'><FormattedMessage id='navigation_bar.domain_blocks' defaultMessage='Hidden domains' /></Link></li>
+        {isStaff(account) && <>
+          <li><a href='/pleroma/admin'><FormattedMessage id='navigation_bar.admin_settings' defaultMessage='Admin settings' /></a></li>
+          <li><Link to='/soapbox/config'><FormattedMessage id='navigation_bar.soapbox_config' defaultMessage='Soapbox config' /></Link></li>
+        </>}
+        <li><Link to='/settings/import'><FormattedMessage id='navigation_bar.import_data' defaultMessage='Import data' /></Link></li>
+        <li><a href='#' onClick={onOpenHotkeys}><FormattedMessage id='navigation_bar.keyboard_shortcuts' defaultMessage='Hotkeys' /></a></li>
+      </>}
+      <li><Link to='/about'><FormattedMessage id='navigation_bar.info' defaultMessage='About this server' /></Link></li>
       {account && <li><Link to='/auth/sign_out' onClick={onClickLogOut}><FormattedMessage id='navigation_bar.logout' defaultMessage='Logout' /></Link></li>}
     </ul>
 

From ad3362e3cdfdca19113e74c96c6288694183404c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 20:32:40 -0500
Subject: [PATCH 34/46] auth: persist the state only if changed

---
 app/soapbox/reducers/auth.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 5509371bc..22e0d166b 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -162,10 +162,12 @@ export default function auth(oldState = initialState, action) {
   const state = reducer(oldState, action);
 
   // Persist the state in localStorage
-  localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
+  if (!state.equals(oldState)) {
+    localStorage.setItem('soapbox:auth', JSON.stringify(state.toJS()));
 
-  // Reload the page under some conditions
-  maybeReload(oldState, state, action);
+    // Reload the page under some conditions
+    maybeReload(oldState, state, action);
+  }
 
   return state;
 };

From c7c0c41ce6f439cf1fbf149d39958ecdc495be34 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 22:37:10 -0500
Subject: [PATCH 35/46] Use our own INIT_STORE action instead of relying on
 Redux's internal actions

---
 app/soapbox/actions/store.js                | 7 +++++++
 app/soapbox/containers/soapbox.js           | 2 ++
 app/soapbox/reducers/__tests__/auth-test.js | 5 +++--
 app/soapbox/reducers/auth.js                | 3 ++-
 4 files changed, 14 insertions(+), 3 deletions(-)
 create mode 100644 app/soapbox/actions/store.js

diff --git a/app/soapbox/actions/store.js b/app/soapbox/actions/store.js
new file mode 100644
index 000000000..d6921d7f1
--- /dev/null
+++ b/app/soapbox/actions/store.js
@@ -0,0 +1,7 @@
+export const INIT_STORE = 'INIT_STORE';
+
+export function initStore() {
+  return {
+    type: INIT_STORE,
+  };
+}
diff --git a/app/soapbox/containers/soapbox.js b/app/soapbox/containers/soapbox.js
index 8a3a52f3e..041fced17 100644
--- a/app/soapbox/containers/soapbox.js
+++ b/app/soapbox/containers/soapbox.js
@@ -14,6 +14,7 @@ import { ScrollContext } from 'react-router-scroll-4';
 import UI from '../features/ui';
 // import Introduction from '../features/introduction';
 import { fetchCustomEmojis } from '../actions/custom_emojis';
+import { initStore } from '../actions/store';
 import { preload } from '../actions/preload';
 import { IntlProvider } from 'react-intl';
 import ErrorBoundary from '../components/error_boundary';
@@ -30,6 +31,7 @@ const validLocale = locale => Object.keys(messages).includes(locale);
 
 export const store = configureStore();
 
+store.dispatch(initStore());
 store.dispatch(preload());
 store.dispatch(fetchMe());
 store.dispatch(fetchInstance());
diff --git a/app/soapbox/reducers/__tests__/auth-test.js b/app/soapbox/reducers/__tests__/auth-test.js
index 4adce1eae..6ea1111dc 100644
--- a/app/soapbox/reducers/__tests__/auth-test.js
+++ b/app/soapbox/reducers/__tests__/auth-test.js
@@ -1,5 +1,6 @@
 import reducer from '../auth';
 import { Map as ImmutableMap, fromJS } from 'immutable';
+import { INIT_STORE } from 'soapbox/actions/store';
 import {
   AUTH_APP_CREATED,
   AUTH_LOGGED_IN,
@@ -18,7 +19,7 @@ describe('auth reducer', () => {
     }));
   });
 
-  describe('@@INIT', () => {
+  describe('INIT_STORE', () => {
     it('sets `me` to the next available user if blank', () => {
       const state = fromJS({
         me: null,
@@ -28,7 +29,7 @@ describe('auth reducer', () => {
         },
       });
 
-      const action = { type: '@@INIT' };
+      const action = { type: INIT_STORE };
       const result = reducer(state, action);
       expect(result.get('me')).toEqual('1234');
     });
diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 22e0d166b..18d7d1219 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -1,3 +1,4 @@
+import { INIT_STORE } from '../actions/store';
 import {
   AUTH_APP_CREATED,
   AUTH_LOGGED_IN,
@@ -104,7 +105,7 @@ const initialize = state => {
 
 const reducer = (state, action) => {
   switch(action.type) {
-  case '@@INIT':
+  case INIT_STORE:
     return initialize(state);
   case AUTH_APP_CREATED:
     return state.set('app', fromJS(action.app));

From 41c7612b47bee707750baa588a1e11d9cc43203c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Thu, 25 Mar 2021 23:03:58 -0500
Subject: [PATCH 36/46] Don't refresh when '_legacy' changes

---
 app/soapbox/reducers/auth.js | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/reducers/auth.js b/app/soapbox/reducers/auth.js
index 18d7d1219..c3cf164ab 100644
--- a/app/soapbox/reducers/auth.js
+++ b/app/soapbox/reducers/auth.js
@@ -143,10 +143,14 @@ const reload = state => {
   }
 };
 
+// `me` is a user ID string
+const validMe = state => {
+  const me = state.get('me');
+  return typeof me === 'string' && me !== '_legacy';
+};
+
 // `me` has changed from one valid ID to another
 const userSwitched = (oldState, state) => {
-  const validMe = state => typeof state.get('me') === 'string';
-
   const stillValid = validMe(oldState) && validMe(state);
   const didChange = oldState.get('me') !== state.get('me');
 

From 4d1af4764f1ee929d65ef5767322a7934cdd156b Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 15:29:15 -0500
Subject: [PATCH 37/46] Refactor registration action

---
 app/soapbox/actions/accounts.js | 16 ++++++++++++++++
 app/soapbox/actions/auth.js     | 17 +++++------------
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js
index 4ac4f2769..52a06afdc 100644
--- a/app/soapbox/actions/accounts.js
+++ b/app/soapbox/actions/accounts.js
@@ -8,6 +8,10 @@ import {
 } from './importer';
 import { isLoggedIn } from 'soapbox/utils/auth';
 
+export const ACCOUNT_CREATE_REQUEST = 'ACCOUNT_CREATE_REQUEST';
+export const ACCOUNT_CREATE_SUCCESS = 'ACCOUNT_CREATE_SUCCESS';
+export const ACCOUNT_CREATE_FAIL    = 'ACCOUNT_CREATE_FAIL';
+
 export const ACCOUNT_FETCH_REQUEST = 'ACCOUNT_FETCH_REQUEST';
 export const ACCOUNT_FETCH_SUCCESS = 'ACCOUNT_FETCH_SUCCESS';
 export const ACCOUNT_FETCH_FAIL    = 'ACCOUNT_FETCH_FAIL';
@@ -98,6 +102,18 @@ function getFromDB(dispatch, getState, index, id) {
   });
 }
 
+export function createAccount(params) {
+  return (dispatch, getState) => {
+    dispatch({ type: ACCOUNT_CREATE_REQUEST, params });
+    return api(getState, 'app').post('/api/v1/accounts', params).then(({ data: token }) => {
+      dispatch({ type: ACCOUNT_CREATE_SUCCESS, params, token });
+    }).catch(error => {
+      dispatch({ type: ACCOUNT_CREATE_FAIL, error, params });
+      throw error;
+    });
+  };
+}
+
 export function fetchAccount(id) {
   return (dispatch, getState) => {
     dispatch(fetchRelationships([id]));
diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 80f58a950..5e1672a6d 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -1,6 +1,7 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
 import snackbar from 'soapbox/actions/snackbar';
+import { createAccount } from 'soapbox/actions/accounts';
 import { ME_FETCH_SUCCESS } from 'soapbox/actions/me';
 
 export const SWITCH_ACCOUNT = 'SWITCH_ACCOUNT';
@@ -14,10 +15,6 @@ export const VERIFY_CREDENTIALS_REQUEST = 'VERIFY_CREDENTIALS_REQUEST';
 export const VERIFY_CREDENTIALS_SUCCESS = 'VERIFY_CREDENTIALS_SUCCESS';
 export const VERIFY_CREDENTIALS_FAIL    = 'VERIFY_CREDENTIALS_FAIL';
 
-export const AUTH_REGISTER_REQUEST = 'AUTH_REGISTER_REQUEST';
-export const AUTH_REGISTER_SUCCESS = 'AUTH_REGISTER_SUCCESS';
-export const AUTH_REGISTER_FAIL    = 'AUTH_REGISTER_FAIL';
-
 export const RESET_PASSWORD_REQUEST = 'RESET_PASSWORD_REQUEST';
 export const RESET_PASSWORD_SUCCESS = 'RESET_PASSWORD_SUCCESS';
 export const RESET_PASSWORD_FAIL    = 'RESET_PASSWORD_FAIL';
@@ -211,15 +208,11 @@ export function fetchOwnAccounts() {
 export function register(params) {
   return (dispatch, getState) => {
     params.fullname = params.username;
-    dispatch({ type: AUTH_REGISTER_REQUEST });
+
     return dispatch(createAppAndToken()).then(() => {
-      return api(getState, 'app').post('/api/v1/accounts', params);
-    }).then(response => {
-      dispatch({ type: AUTH_REGISTER_SUCCESS, token: response.data });
-      dispatch(authLoggedIn(response.data));
-    }).catch(error => {
-      dispatch({ type: AUTH_REGISTER_FAIL, error });
-      throw error;
+      return dispatch(createAccount(params));
+    }).then(token => {
+      dispatch(authLoggedIn(token));
     });
   };
 }

From eae309e150505257d69f9aba006d5e19d0b95abd Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 15:30:14 -0500
Subject: [PATCH 38/46] Clear captcha form when registration fails

---
 .../features/auth_login/components/captcha.js        | 12 +++++++-----
 .../landing_page/components/registration_form.js     |  4 ++++
 2 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/soapbox/features/auth_login/components/captcha.js b/app/soapbox/features/auth_login/components/captcha.js
index 74ad686ac..0e5b95815 100644
--- a/app/soapbox/features/auth_login/components/captcha.js
+++ b/app/soapbox/features/auth_login/components/captcha.js
@@ -81,15 +81,14 @@ class CaptchaField extends React.Component {
 
   render() {
     const { captcha } = this.state;
-    const { onChange } = this.props;
-    const { onClick } = this.props;
+    const { onChange, onClick, ...props } = this.props;
 
     switch(captcha.get('type')) {
     case 'native':
       return (
         <div>
           <p>{<FormattedMessage id='registration.captcha.hint' defaultMessage='Click the image to get a new captcha' />}</p>
-          <NativeCaptchaField captcha={captcha} onChange={onChange} onClick={onClick} />
+          <NativeCaptchaField captcha={captcha} onChange={onChange} onClick={onClick} {...props} />
         </div>
       );
     case 'none':
@@ -100,12 +99,13 @@ class CaptchaField extends React.Component {
 
 }
 
-export const NativeCaptchaField = ({ captcha, onChange, onClick }) => (
+export const NativeCaptchaField = ({ captcha, onChange, onClick, name, value }) => (
   <div className='captcha' >
     <img alt='captcha' src={captcha.get('url')} onClick={onClick} />
     <TextInput
       placeholder='Enter the pictured text'
-      name='captcha_solution'
+      name={name}
+      value={value}
       autoComplete='off'
       onChange={onChange}
       required
@@ -117,4 +117,6 @@ NativeCaptchaField.propTypes = {
   captcha: ImmutablePropTypes.map.isRequired,
   onChange: PropTypes.func,
   onClick: PropTypes.func,
+  name: PropTypes.string,
+  value: PropTypes.string,
 };
diff --git a/app/soapbox/features/landing_page/components/registration_form.js b/app/soapbox/features/landing_page/components/registration_form.js
index b520f6a9e..4f862c587 100644
--- a/app/soapbox/features/landing_page/components/registration_form.js
+++ b/app/soapbox/features/landing_page/components/registration_form.js
@@ -132,10 +132,12 @@ class RegistrationForm extends ImmutablePureComponent {
 
   refreshCaptcha = () => {
     this.setState({ captchaIdempotencyKey: uuidv4() });
+    this.setParams({ captcha_solution: '' });
   }
 
   render() {
     const { instance, intl } = this.props;
+    const { params } = this.state;
     const isOpen = instance.get('registrations');
     const isLoading = this.state.captchaLoading || this.state.submissionLoading;
 
@@ -221,6 +223,8 @@ class RegistrationForm extends ImmutablePureComponent {
               onChange={this.onInputChange}
               onClick={this.onCaptchaClick}
               idempotencyKey={this.state.captchaIdempotencyKey}
+              name='captcha_solution'
+              value={params.get('captcha_solution', '')}
             />
             <div className='fields-group'>
               <Checkbox

From f24422d5206de82f34ad3e720d05edd44868e0e4 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 15:45:46 -0500
Subject: [PATCH 39/46] Fix registration form workflow

---
 app/soapbox/actions/accounts.js | 2 +-
 app/soapbox/actions/auth.js     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/soapbox/actions/accounts.js b/app/soapbox/actions/accounts.js
index 52a06afdc..c1e2341fd 100644
--- a/app/soapbox/actions/accounts.js
+++ b/app/soapbox/actions/accounts.js
@@ -106,7 +106,7 @@ export function createAccount(params) {
   return (dispatch, getState) => {
     dispatch({ type: ACCOUNT_CREATE_REQUEST, params });
     return api(getState, 'app').post('/api/v1/accounts', params).then(({ data: token }) => {
-      dispatch({ type: ACCOUNT_CREATE_SUCCESS, params, token });
+      return dispatch({ type: ACCOUNT_CREATE_SUCCESS, params, token });
     }).catch(error => {
       dispatch({ type: ACCOUNT_CREATE_FAIL, error, params });
       throw error;
diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 5e1672a6d..98deb2e1d 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -212,7 +212,7 @@ export function register(params) {
     return dispatch(createAppAndToken()).then(() => {
       return dispatch(createAccount(params));
     }).then(token => {
-      dispatch(authLoggedIn(token));
+      return dispatch(authLoggedIn(token));
     });
   };
 }

From 597546e98904e241f3e518f2e8a117f9a869f7da Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 16:20:31 -0500
Subject: [PATCH 40/46] Update captcha snapshot

---
 .../components/__tests__/__snapshots__/captcha-test.js.snap      | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/captcha-test.js.snap b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/captcha-test.js.snap
index 0e6cd2204..333d04f8d 100644
--- a/app/soapbox/features/auth_login/components/__tests__/__snapshots__/captcha-test.js.snap
+++ b/app/soapbox/features/auth_login/components/__tests__/__snapshots__/captcha-test.js.snap
@@ -15,7 +15,6 @@ exports[`<NativeCaptchaField /> renders correctly 1`] = `
   >
     <input
       autoComplete="off"
-      name="captcha_solution"
       onChange={[Function]}
       placeholder="Enter the pictured text"
       required={true}

From 20ef262cfc1054b802f441b680158bc7afe3461d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 16:42:47 -0500
Subject: [PATCH 41/46] Fix MFA

---
 app/soapbox/actions/auth.js                                | 5 +++--
 .../features/auth_login/components/otp_auth_form.js        | 7 +++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/app/soapbox/actions/auth.js b/app/soapbox/actions/auth.js
index 98deb2e1d..e99ad9fdb 100644
--- a/app/soapbox/actions/auth.js
+++ b/app/soapbox/actions/auth.js
@@ -127,8 +127,9 @@ export function otpVerify(code, mfa_token) {
       code: code,
       challenge_type: 'totp',
       redirect_uri: 'urn:ietf:wg:oauth:2.0:oob',
-    }).then(response => {
-      dispatch(authLoggedIn(response.data));
+    }).then(({ data: token }) => {
+      dispatch(authLoggedIn(token));
+      return token;
     });
   };
 }
diff --git a/app/soapbox/features/auth_login/components/otp_auth_form.js b/app/soapbox/features/auth_login/components/otp_auth_form.js
index 091d2a48f..438e24bff 100644
--- a/app/soapbox/features/auth_login/components/otp_auth_form.js
+++ b/app/soapbox/features/auth_login/components/otp_auth_form.js
@@ -2,8 +2,7 @@ import React from 'react';
 import { connect } from 'react-redux';
 import { injectIntl, FormattedMessage, defineMessages } from 'react-intl';
 import ImmutablePureComponent from 'react-immutable-pure-component';
-import { otpVerify } from 'soapbox/actions/auth';
-import { fetchMe } from 'soapbox/actions/me';
+import { otpVerify, verifyCredentials } from 'soapbox/actions/auth';
 import { SimpleInput } from 'soapbox/features/forms';
 import PropTypes from 'prop-types';
 
@@ -36,9 +35,9 @@ class OtpAuthForm extends ImmutablePureComponent {
   handleSubmit = (event) => {
     const { dispatch, mfa_token } = this.props;
     const { code } = this.getFormData(event.target);
-    dispatch(otpVerify(code, mfa_token)).then(() => {
+    dispatch(otpVerify(code, mfa_token)).then(({ access_token }) => {
       this.setState({ code_error: false });
-      return dispatch(fetchMe());
+      return dispatch(verifyCredentials(access_token));
     }).catch(error => {
       this.setState({ isLoading: false });
       if (error.response.data.error === 'Invalid code') {

From c5778472f58fb66e9abd631b471d673f8f354a07 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 16:45:20 -0500
Subject: [PATCH 42/46] .dropdown-menu { max-width: 300px; }

---
 app/styles/components/dropdown-menu.scss | 1 +
 1 file changed, 1 insertion(+)

diff --git a/app/styles/components/dropdown-menu.scss b/app/styles/components/dropdown-menu.scss
index 4a101b5e4..93c0d3bdc 100644
--- a/app/styles/components/dropdown-menu.scss
+++ b/app/styles/components/dropdown-menu.scss
@@ -9,6 +9,7 @@
   padding: 4px 0;
   color: var(--primary-text-color);
   box-shadow: 0 0 6px 0 rgba(0, 0, 0, 0.5);
+  max-width: 300px;
   &.left { transform-origin: 100% 50%; }
   &.top { transform-origin: 50% 100%; }
   &.bottom { transform-origin: 50% 0; }

From 16ce14e40331ec7db0d480a147131f502c0e5971 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 22:34:30 -0500
Subject: [PATCH 43/46] Add mobile account switcher

---
 app/soapbox/components/sidebar_menu.js  | 98 ++++++++++++++++++++-----
 app/styles/components/sidebar-menu.scss | 15 +++-
 2 files changed, 95 insertions(+), 18 deletions(-)

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index 306303417..b4bda0099 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.js
@@ -1,6 +1,7 @@
 import React from 'react';
 import PropTypes from 'prop-types';
 import { connect } from 'react-redux';
+import { throttle } from 'lodash';
 import { Link, NavLink } from 'react-router-dom';
 import ImmutablePropTypes from 'react-immutable-proptypes';
 import ImmutablePureComponent from 'react-immutable-pure-component';
@@ -14,8 +15,10 @@ import { closeSidebar } from '../actions/sidebar';
 import { shortNumberFormat } from '../utils/numbers';
 import { isStaff } from '../utils/accounts';
 import { makeGetAccount } from '../selectors';
-import { logOut } from 'soapbox/actions/auth';
+import { logOut, switchAccount } from 'soapbox/actions/auth';
 import ThemeToggle from '../features/ui/components/theme_toggle_container';
+import { fetchOwnAccounts } from 'soapbox/actions/auth';
+import { List as ImmutableList } from 'immutable';
 
 const messages = defineMessages({
   followers: { id: 'account.followers', defaultMessage: 'Followers' },
@@ -38,17 +41,30 @@ const messages = defineMessages({
   news: { id: 'tabs_bar.news', defaultMessage: 'News' },
   donate: { id: 'donate', defaultMessage: 'Donate' },
   info: { id: 'column.info', defaultMessage: 'Server information' },
+  add_account: { id: 'profile_dropdown.add_account', defaultMessage: 'Add an existing account' },
 });
 
 const mapStateToProps = state => {
   const me = state.get('me');
   const getAccount = makeGetAccount();
 
+  const otherAccounts =
+    state
+      .getIn(['auth', 'users'])
+      .keySeq()
+      .reduce((list, id) => {
+        if (id === me) return list;
+        const account = state.getIn(['accounts', id]);
+        return account ? list.push(account) : list;
+      }, ImmutableList());
+
   return {
     account: getAccount(state, me),
     sidebarOpen: state.get('sidebar').sidebarOpen,
     donateUrl: state.getIn(['patron', 'instance', 'url']),
     isStaff: isStaff(state.getIn(['accounts', me])),
+    otherAccounts,
+
   };
 };
 
@@ -60,6 +76,12 @@ const mapDispatchToProps = (dispatch) => ({
     dispatch(logOut());
     e.preventDefault();
   },
+  fetchOwnAccounts() {
+    dispatch(fetchOwnAccounts());
+  },
+  switchAccount(account) {
+    dispatch(switchAccount(account.get('id')));
+  },
 });
 
 export default @connect(mapStateToProps, mapDispatchToProps)
@@ -78,8 +100,52 @@ class SidebarMenu extends ImmutablePureComponent {
     isStaff: false,
   }
 
+  state = {
+    switcher: false,
+  }
+
+  handleSwitchAccount = account => {
+    return e => {
+      this.props.switchAccount(account);
+      e.preventDefault();
+    };
+  }
+
+  handleSwitcherClick = e => {
+    this.setState({ switcher: !this.state.switcher });
+    e.preventDefault();
+  }
+
+  fetchOwnAccounts = throttle(() => {
+    this.props.fetchOwnAccounts();
+  }, 2000);
+
+  componentDidMount() {
+    this.fetchOwnAccounts();
+  }
+
+  componentDidUpdate() {
+    this.fetchOwnAccounts();
+  }
+
+  renderAccount = account => {
+    return (
+      <a href='#' className='sidebar-account' onClick={this.handleSwitchAccount(account)} key={account.get('id')}>
+        <div className='account'>
+          <div className='account__wrapper'>
+            <div className='account__display-name' title={account.get('acct')} href={`/@${account.get('acct')}`} to={`/@${account.get('acct')}`}>
+              <div className='account__avatar-wrapper'><Avatar account={account} size={36} /></div>
+              <DisplayName account={account} />
+            </div>
+          </div>
+        </div>
+      </a>
+    );
+  }
+
   render() {
-    const { sidebarOpen, onClose, intl, account, onClickLogOut, donateUrl, isStaff } = this.props;
+    const { sidebarOpen, onClose, intl, account, onClickLogOut, donateUrl, isStaff, otherAccounts } = this.props;
+    const { switcher } = this.state;
     if (!account) return null;
     const acct = account.get('acct');
 
@@ -105,24 +171,22 @@ class SidebarMenu extends ImmutablePureComponent {
                   <Avatar account={account} />
                 </Link>
               </div>
-              <div className='sidebar-menu-profile__name'>
+              <a href='#' className='sidebar-menu-profile__name' onClick={this.handleSwitcherClick}>
                 <DisplayName account={account} />
-              </div>
-
-              <div className='sidebar-menu-profile__stats'>
-                <NavLink className='sidebar-menu-profile-stat' to={`/@${acct}/followers`} onClick={onClose} title={intl.formatNumber(account.get('followers_count'))}>
-                  <strong className='sidebar-menu-profile-stat__value'>{shortNumberFormat(account.get('followers_count'))}</strong>
-                  <span className='sidebar-menu-profile-stat__label'>{intl.formatMessage(messages.followers)}</span>
-                </NavLink>
-                <NavLink className='sidebar-menu-profile-stat' to={`/@${acct}/following`} onClick={onClose} title={intl.formatNumber(account.get('following_count'))}>
-                  <strong className='sidebar-menu-profile-stat__value'>{shortNumberFormat(account.get('following_count'))}</strong>
-                  <span className='sidebar-menu-profile-stat__label'>{intl.formatMessage(messages.follows)}</span>
-                </NavLink>
-              </div>
-
+                <Icon id={switcher ? 'caret-up' : 'caret-down'} />
+              </a>
             </div>
 
-            <div className='sidebar-menu__section sidebar-menu__section--borderless'>
+            {switcher && <div className='sidebar-menu__section'>
+              {otherAccounts.map(account => this.renderAccount(account))}
+
+              <NavLink className='sidebar-menu-item' to='/auth/sign_in' onClick={onClose}>
+                <Icon id='plus' />
+                <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.add_account)}</span>
+              </NavLink>
+            </div>}
+
+            <div className='sidebar-menu__section'>
               <div className='sidebar-menu-item theme-toggle'>
                 <ThemeToggle showLabel />
               </div>
diff --git a/app/styles/components/sidebar-menu.scss b/app/styles/components/sidebar-menu.scss
index 2207a2aed..dc4c897a7 100644
--- a/app/styles/components/sidebar-menu.scss
+++ b/app/styles/components/sidebar-menu.scss
@@ -98,14 +98,23 @@
   }
 
   &__name {
-    display: block;
+    display: flex;
     margin-top: 10px;
+    color: var(--primary-text-color);
+    text-decoration: none;
+    align-items: center;
 
     .display-name__account {
       display: block;
       margin-top: 2px;
       color: var(--primary-text-color--faint);
     }
+
+    i.fa-caret-up,
+    i.fa-caret-down {
+      margin-left: auto;
+      padding-left: 10px;
+    }
   }
 
   &__stats {
@@ -140,6 +149,10 @@
   }
 }
 
+.sidebar-account {
+  text-decoration: none;
+}
+
 .sidebar-menu-item {
   display: flex;
   padding: 16px 18px;

From 9bff74b575bb3bd66677d9d2b29a51ca15bd8bd6 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 22:42:10 -0500
Subject: [PATCH 44/46] Remove unused import

---
 app/soapbox/components/sidebar_menu.js | 1 -
 1 file changed, 1 deletion(-)

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index b4bda0099..6a497a967 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.js
@@ -12,7 +12,6 @@ import IconButton from './icon_button';
 import Icon from './icon';
 import DisplayName from './display_name';
 import { closeSidebar } from '../actions/sidebar';
-import { shortNumberFormat } from '../utils/numbers';
 import { isStaff } from '../utils/accounts';
 import { makeGetAccount } from '../selectors';
 import { logOut, switchAccount } from 'soapbox/actions/auth';

From 582649538ccea51a02ab3c14412e171575766773 Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Fri, 26 Mar 2021 22:57:22 -0500
Subject: [PATCH 45/46] Close account switcher when sidebar closes

---
 app/soapbox/components/sidebar_menu.js | 45 ++++++++++++++------------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/app/soapbox/components/sidebar_menu.js b/app/soapbox/components/sidebar_menu.js
index 6a497a967..61f184523 100644
--- a/app/soapbox/components/sidebar_menu.js
+++ b/app/soapbox/components/sidebar_menu.js
@@ -103,6 +103,11 @@ class SidebarMenu extends ImmutablePureComponent {
     switcher: false,
   }
 
+  handleClose = () => {
+    this.setState({ switcher: false });
+    this.props.onClose();
+  }
+
   handleSwitchAccount = account => {
     return e => {
       this.props.switchAccount(account);
@@ -143,7 +148,7 @@ class SidebarMenu extends ImmutablePureComponent {
   }
 
   render() {
-    const { sidebarOpen, onClose, intl, account, onClickLogOut, donateUrl, isStaff, otherAccounts } = this.props;
+    const { sidebarOpen, intl, account, onClickLogOut, donateUrl, isStaff, otherAccounts } = this.props;
     const { switcher } = this.state;
     if (!account) return null;
     const acct = account.get('acct');
@@ -154,19 +159,19 @@ class SidebarMenu extends ImmutablePureComponent {
 
     return (
       <div className={classes}>
-        <div className='sidebar-menu__wrapper' role='button' onClick={onClose} />
+        <div className='sidebar-menu__wrapper' role='button' onClick={this.handleClose} />
         <div className='sidebar-menu'>
 
           <div className='sidebar-menu-header'>
             <span className='sidebar-menu-header__title'>Account Info</span>
-            <IconButton title='close' onClick={onClose} icon='close' className='sidebar-menu-header__btn' />
+            <IconButton title='close' onClick={this.handleClose} icon='close' className='sidebar-menu-header__btn' />
           </div>
 
           <div className='sidebar-menu__content'>
 
             <div className='sidebar-menu-profile'>
               <div className='sidebar-menu-profile__avatar'>
-                <Link to={`/@${acct}`} title={acct} onClick={onClose}>
+                <Link to={`/@${acct}`} title={acct} onClick={this.handleClose}>
                   <Avatar account={account} />
                 </Link>
               </div>
@@ -179,7 +184,7 @@ class SidebarMenu extends ImmutablePureComponent {
             {switcher && <div className='sidebar-menu__section'>
               {otherAccounts.map(account => this.renderAccount(account))}
 
-              <NavLink className='sidebar-menu-item' to='/auth/sign_in' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/auth/sign_in' onClick={this.handleClose}>
                 <Icon id='plus' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.add_account)}</span>
               </NavLink>
@@ -192,71 +197,71 @@ class SidebarMenu extends ImmutablePureComponent {
             </div>
 
             <div className='sidebar-menu__section sidebar-menu__section'>
-              <NavLink className='sidebar-menu-item' to={`/@${acct}`} onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to={`/@${acct}`} onClick={this.handleClose}>
                 <Icon id='user' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.profile)}</span>
               </NavLink>
               {donateUrl ?
-                <a className='sidebar-menu-item' href={donateUrl} onClick={onClose}>
+                <a className='sidebar-menu-item' href={donateUrl} onClick={this.handleClose}>
                   <Icon id='dollar' />
                   <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.donate)}</span>
                 </a>
                 : ''}
-              <NavLink className='sidebar-menu-item' to='/lists' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/lists' onClick={this.handleClose}>
                 <Icon id='list' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.lists)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/bookmarks' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/bookmarks' onClick={this.handleClose}>
                 <Icon id='bookmark' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.bookmarks)}</span>
               </NavLink>
             </div>
 
             <div className='sidebar-menu__section'>
-              <NavLink className='sidebar-menu-item' to='/follow_requests' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/follow_requests' onClick={this.handleClose}>
                 <Icon id='user-plus' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.follow_requests)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/blocks' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/blocks' onClick={this.handleClose}>
                 <Icon id='ban' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.blocks)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/domain_blocks' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/domain_blocks' onClick={this.handleClose}>
                 <Icon id='ban' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.domain_blocks)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/mutes' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/mutes' onClick={this.handleClose}>
                 <Icon id='times-circle' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.mutes)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/filters' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/filters' onClick={this.handleClose}>
                 <Icon id='filter' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.filters)}</span>
               </NavLink>
-              { isStaff && <a className='sidebar-menu-item' href='/pleroma/admin' target='_blank' onClick={onClose}>
+              { isStaff && <a className='sidebar-menu-item' href='/pleroma/admin' target='_blank' onClick={this.handleClose}>
                 <Icon id='shield' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.admin_settings)}</span>
               </a> }
-              { isStaff && <NavLink className='sidebar-menu-item' to='/soapbox/config' onClick={onClose}>
+              { isStaff && <NavLink className='sidebar-menu-item' to='/soapbox/config' onClick={this.handleClose}>
                 <Icon id='cog' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.soapbox_config)}</span>
               </NavLink> }
-              <NavLink className='sidebar-menu-item' to='/settings/preferences' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/settings/preferences' onClick={this.handleClose}>
                 <Icon id='cog' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.preferences)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/settings/import' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/settings/import' onClick={this.handleClose}>
                 <Icon id='cloud-upload' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.import_data)}</span>
               </NavLink>
-              <NavLink className='sidebar-menu-item' to='/auth/edit' onClick={onClose}>
+              <NavLink className='sidebar-menu-item' to='/auth/edit' onClick={this.handleClose}>
                 <Icon id='lock' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.security)}</span>
               </NavLink>
             </div>
 
             <div className='sidebar-menu__section'>
-              <Link className='sidebar-menu-item' to='/info' onClick={onClose}>
+              <Link className='sidebar-menu-item' to='/info' onClick={this.handleClose}>
                 <Icon id='info' />
                 <span className='sidebar-menu-item__title'>{intl.formatMessage(messages.info)}</span>
               </Link>

From f728491ad00adf462bfe4d161102568a50dafb3c Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sat, 27 Mar 2021 10:50:21 -0500
Subject: [PATCH 46/46] Add follow request nav item when account is locked

---
 .../features/ui/components/features_panel.js  | 22 +++++++++++++++++--
 .../features/ui/components/link_footer.js     |  1 +
 app/soapbox/features/ui/index.js              |  7 +++++-
 3 files changed, 27 insertions(+), 3 deletions(-)

diff --git a/app/soapbox/features/ui/components/features_panel.js b/app/soapbox/features/ui/components/features_panel.js
index 5776e0169..f9d971331 100644
--- a/app/soapbox/features/ui/components/features_panel.js
+++ b/app/soapbox/features/ui/components/features_panel.js
@@ -1,8 +1,11 @@
 import React from 'react';
+import { connect } from 'react-redux';
 import PropTypes from 'prop-types';
 import Icon from 'soapbox/components/icon';
+import IconWithCounter from 'soapbox/components/icon_with_counter';
 import { NavLink } from 'react-router-dom';
 import { injectIntl, defineMessages } from 'react-intl';
+import { OrderedSet as ImmutableOrderedSet } from 'immutable';
 
 const messages = defineMessages({
   edit_profile: { id: 'account.edit_profile', defaultMessage: 'Edit Profile' },
@@ -10,18 +13,29 @@ const messages = defineMessages({
   security: { id: 'navigation_bar.security', defaultMessage: 'Security' },
   lists: { id: 'column.lists', defaultMessage: 'Lists' },
   bookmarks: { id: 'column.bookmarks', defaultMessage: 'Bookmarks' },
+  follow_requests: { id: 'navigation_bar.follow_requests', defaultMessage: 'Follow requests' },
 });
 
-export default
+const mapStateToProps = state => {
+  const me = state.get('me');
+  return {
+    isLocked: state.getIn(['accounts', me, 'locked']),
+    followRequestsCount: state.getIn(['user_lists', 'follow_requests', 'items'], ImmutableOrderedSet()).count(),
+  };
+};
+
+export default @connect(mapStateToProps)
 @injectIntl
 class FeaturesPanel extends React.PureComponent {
 
   static propTypes = {
     intl: PropTypes.object.isRequired,
+    isLocked: PropTypes.bool,
+    followRequestsCount: PropTypes.number,
   };
 
   render() {
-    const { intl } = this.props;
+    const { intl, isLocked, followRequestsCount } = this.props;
 
     return (
       <div className='wtf-panel promo-panel'>
@@ -32,6 +46,10 @@ class FeaturesPanel extends React.PureComponent {
             {intl.formatMessage(messages.edit_profile)}
           </NavLink>
 
+          {(isLocked || followRequestsCount > 0) && <NavLink className='promo-panel-item' to='/follow_requests'>
+            <IconWithCounter icon='user-plus' count={followRequestsCount} fixedWidth />
+            {intl.formatMessage(messages.follow_requests)}
+          </NavLink>}
 
           <NavLink className='promo-panel-item' to='/bookmarks'>
             <Icon id='bookmark' className='promo-panel-item__icon' fixedWidth />
diff --git a/app/soapbox/features/ui/components/link_footer.js b/app/soapbox/features/ui/components/link_footer.js
index dcdbf70a2..6e12f46d2 100644
--- a/app/soapbox/features/ui/components/link_footer.js
+++ b/app/soapbox/features/ui/components/link_footer.js
@@ -41,6 +41,7 @@ const LinkFooter = ({ onOpenHotkeys, account, onClickLogOut }) => (
         <li><Link to='/mutes'><FormattedMessage id='navigation_bar.mutes' defaultMessage='Muted users' /></Link></li>
         <li><Link to='/filters'><FormattedMessage id='navigation_bar.filters' defaultMessage='Muted words' /></Link></li>
         <li><Link to='/domain_blocks'><FormattedMessage id='navigation_bar.domain_blocks' defaultMessage='Hidden domains' /></Link></li>
+        <li><Link to='/follow_requests'><FormattedMessage id='navigation_bar.follow_requests' defaultMessage='Follow requests' /></Link></li>
         {isStaff(account) && <>
           <li><a href='/pleroma/admin'><FormattedMessage id='navigation_bar.admin_settings' defaultMessage='Admin settings' /></a></li>
           <li><Link to='/soapbox/config'><FormattedMessage id='navigation_bar.soapbox_config' defaultMessage='Soapbox config' /></Link></li>
diff --git a/app/soapbox/features/ui/index.js b/app/soapbox/features/ui/index.js
index 8b5c1318c..31131a757 100644
--- a/app/soapbox/features/ui/index.js
+++ b/app/soapbox/features/ui/index.js
@@ -21,6 +21,7 @@ import { fetchFilters } from '../../actions/filters';
 import { fetchChats } from 'soapbox/actions/chats';
 import { clearHeight } from '../../actions/height_cache';
 import { openModal } from '../../actions/modal';
+import { fetchFollowRequests } from '../../actions/accounts';
 import { WrappedRoute } from './util/react_router_helpers';
 import UploadArea from './components/upload_area';
 import TabsBar from './components/tabs_bar';
@@ -459,7 +460,7 @@ class UI extends React.PureComponent {
       this.props.dispatch(expandHomeTimeline());
       this.props.dispatch(expandNotifications());
       this.props.dispatch(fetchChats());
-      // this.props.dispatch(fetchGroups('member'));
+
       if (isStaff(account)) {
         this.props.dispatch(fetchReports({ state: 'open' }));
         this.props.dispatch(fetchUsers({ page: 1, filters: 'local,need_approval' }));
@@ -467,6 +468,10 @@ class UI extends React.PureComponent {
       }
 
       setTimeout(() => this.props.dispatch(fetchFilters()), 500);
+
+      if (account.get('locked')) {
+        setTimeout(() => this.props.dispatch(fetchFollowRequests()), 700);
+      }
     }
     this.connectStreaming();
   }