From b78e923f83afa2f73baff6a6e1581489450f0d7d Mon Sep 17 00:00:00 2001
From: Alex Gleason <alex@alexgleason.me>
Date: Sun, 17 May 2020 16:31:54 -0500
Subject: [PATCH] Refreshing the user token: just... don't even. Fixes #56, #73

---
 app/gabsocial/actions/me.js | 13 ++++++-------
 1 file changed, 6 insertions(+), 7 deletions(-)

diff --git a/app/gabsocial/actions/me.js b/app/gabsocial/actions/me.js
index 7586aab90..02b4cd664 100644
--- a/app/gabsocial/actions/me.js
+++ b/app/gabsocial/actions/me.js
@@ -1,6 +1,5 @@
 import api from '../api';
 import { importFetchedAccount } from './importer';
-import { refreshUserToken } from './auth';
 
 export const ME_FETCH_REQUEST = 'ME_FETCH_REQUEST';
 export const ME_FETCH_SUCCESS = 'ME_FETCH_SUCCESS';
@@ -11,19 +10,19 @@ export const ME_PATCH_REQUEST = 'ME_PATCH_REQUEST';
 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) => {
 
     if (!hasToken(getState)) {
-      dispatch({ type: ME_FETCH_SKIP }); return;
+      dispatch({ type: ME_FETCH_SKIP }); return noOp();
     };
 
-    dispatch(refreshUserToken()).then(() => {
-      dispatch(fetchMeRequest());
-      return api(getState).get('/api/v1/accounts/verify_credentials').then(response => {
-        dispatch(fetchMeSuccess(response.data));
-      });
+    dispatch(fetchMeRequest());
+
+    return api(getState).get('/api/v1/accounts/verify_credentials').then(response => {
+      dispatch(fetchMeSuccess(response.data));
     }).catch(error => {
       dispatch(fetchMeFail(error));
     });