Revize 286a9547

re #9368 - refresh with fetch instead of axios

frontend/src/api/api.ts

@@ -1 +1 @@
 import axios from 'axios'
 import { Store } from 'redux'
+import conf from '../config/conf'
 import config from '../config/conf'
 import { AppStore } from '../features/redux/store'
 
@@ -15 +16 @@
 const createBaseInstance = () =>
     axios.create({
         baseURL: config.baseUrl,
+        headers: {}
     })
 
 const axiosInstance = createBaseInstance()
@@ -55 +57 @@
 
         // Try refreshing the JWT
         try {
-            const refreshInstance = createBaseInstance()
-            // @ts-ignore
-            refreshInstance.headers['Authorization'] = oldRefreshToken as string
-
-            // Set this to retry the request that failed
-            originalConfig.retry = true
-
+            // For some reason axios refuses to create instance here so just use fetch
             // Send the request
-            const { data } = await axiosInstance.get('/users/refreshToken')
-            const { accessToken, refreshToken } = data
+            const res = await fetch(`${conf.baseUrl}/users/token`, {
+                method: 'GET',
+                // credentials: 'include',
+                headers: {
+                    'Authorization': oldRefreshToken as string
+                }
+            })
+
+            const json = await res.json()
+            const [ accessToken, refreshToken ] = [json.access_token, json.refresh_token]
 
             // Set the new tokens
             store.dispatch({
@@ -72 +76 @@
                 payload: { accessToken, refreshToken },
             })
 
+            // Set this to retry the request that failed
+            originalConfig.retry = true
+
             // Return the failed instance so it can retry
             return axiosInstance(originalConfig)
         } catch (err: any) {