From 71c62c05b8fe1e384912a9b807e391ec1475a592 Mon Sep 17 00:00:00 2001 From: Alex Gleason Date: Thu, 25 Mar 2021 12:25:45 -0500 Subject: [PATCH] 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']);