Revize 8370b6c1

login simple form impl + slice for user state

frontend/src/api/api.ts

@@ -3 +3 @@
 import config from '../config/conf'
 import { AppStore } from '../features/redux/store'
 
-let store: AppStore // this will get injected later
+let store: AppStore // this will get injected in index.tsx
 
 export const injectStore = (_store: Store) => {
     store = _store
@@ -23 +23 @@
     (config) => {
         const accessToken = store.getState().user.accessToken // get the access token from the store
         if (accessToken) {
-            // @ts-ignore
-            // this will always be defined, axios developers are just lazy to provide better Typescript types
+            // @ts-ignore (axios typescript types are a crime and this will always be defined)
             config.headers['Authorization'] = accessToken as string
         }
 
@@ -38 +37 @@
 axiosInstance.interceptors.response.use(
     (res) => res,
     async (err) => {
-
         const originalConfig = err.config
 
         // Original URL might be login in which case we don't want to refresh the access token
@@ -53 +51 @@
         // If there is no refresh token we simply log the user out
         if (!oldRefreshToken) {
             store.dispatch({ type: 'user/logout' })
-            return Promise.reject(err)
         }
 
-        // Set this to retry the request that failed
-        originalConfig.retry = true
-
         // Try refreshing the JWT
         try {
-            const refreshConfig = createBaseInstance()
+            const refreshInstance = createBaseInstance()
             // @ts-ignore
-            refreshConfig.headers['Authorization'] = oldRefreshToken as string
+            refreshInstance.headers['Authorization'] = oldRefreshToken as string
 
-            // Send the request
-            const { data } = await axiosInstance.get('/refreshToken')
+            // Set this to retry the request that failed
+            originalConfig.retry = true
 
+            // Send the request
+            const { data } = await axiosInstance.get('/users/refreshToken')
             const { accessToken, refreshToken } = data
 
             // Set the new tokens
@@ -76 +72 @@
                 payload: { accessToken, refreshToken },
             })
 
+            // Return the failed instance so it can retry
             return axiosInstance(originalConfig)
         } catch (err: any) {
             // If the refresh token fails we log the user out
             store.dispatch({ type: 'user/logout' })
-            return Promise.reject(err)
+            originalConfig.retry = false // do not retry we are logged out
+            return originalConfig
         }
     }
 )