fix broken tests

Author: Blaumaus

assets/icon.png

@@ -2,6 +2,9 @@ import axios from 'axios'
 import _isEmpty from 'lodash/isEmpty'
 import _map from 'lodash/map'
 import createAuthRefreshInterceptor from 'axios-auth-refresh'
+
+import { authActions } from './redux/actions/auth'
+import { store } from './redux/store'
 import { getAccessToken, setAccessToken, getRefreshToken } from './utils'
 
 const baseURL = 'https://api.swetrix.com'
@@ -20,13 +23,13 @@ const refreshAuthLogic = async (failedRequest) =>
     .then((tokenRefreshResponse) => {
       const { accessToken } = tokenRefreshResponse.data
       setAccessToken(accessToken)
-      // eslint-disable-next-line
       failedRequest.response.config.headers.Authorization = `Bearer ${accessToken}`
+      // eslint-disable-next-line
       return Promise.resolve()
     })
     .catch((error) => {
       store.dispatch(authActions.logout())
-      return Promise.reject(error)
+      throw error
     })
 
 // Instantiate the interceptor
@@ -62,7 +65,7 @@ export const logoutApi = (refreshToken) =>
     })
     .then((response) => response.data)
     .catch((error) => {
-      debug('%s', error)
+      console.error('[API RESPONSE CATCH][logoutApi]', error)
       throw _isEmpty(error.response.data?.message)
         ? error.response.data
         : error.response.data.message

src/api.js

@@ -1,6 +1,6 @@
-import { types } from './types'
 import { getRefreshToken, removeAccessToken, removeRefreshToken } from '../../../utils'
 import { logoutApi } from '../../../api'
+import { types } from './types'
 
 export const authActions = {
   // Synchronous

src/redux/actions/auth/index.js

@@ -9,7 +9,7 @@ import { login } from '../../../../api'
 
 export default function* singinWorker({ payload: { credentials, callback } }) {
   try {
-    const { accessToken, refreshToken, user } = yield call(login, credentials) // eslint-disable-line
+    const { accessToken, refreshToken, user } = yield call(login, credentials)
 
     yield put(authActions.loginSuccess(user))
     yield call(setAccessToken, accessToken)

src/redux/sagas/auth/workers/signin.js

@@ -1,6 +1,8 @@
 import { put, call } from 'redux-saga/effects'
 
-import { getAccessToken } from '../../../utils'
+import {
+  getAccessToken, getRefreshToken,
+} from '../../../utils'
 import UIActions from '../../actions/ui'
 
 export default function* initialise() {

src/redux/sagas/ui/initialise.js

@@ -1,5 +1,4 @@
 import browser from 'webextension-polyfill'
-import _isEmpty from 'lodash/isEmpty'
 
 const TOKEN = 'access_token'
 const REFRESH_TOKEN = 'refresh_token'
@@ -35,7 +34,7 @@ export const removeAccessToken = async () => {
 const STORE_REFRESH_TOKEN_FOR = 8467200
 
 export const getRefreshToken = async () => {
-  await browser.cookies.get({
+  const result = await browser.cookies.get({
     name: REFRESH_TOKEN,
     url: 'https://swetrix.com',
   })
@@ -59,4 +58,4 @@ export const removeRefreshToken = async () => {
     name: REFRESH_TOKEN,
     url: 'https://swetrix.com',
   })
-}
+}