From 5d1def13db4ffe1b1b1c65ae8b91f5f237ddeee0 Mon Sep 17 00:00:00 2001
From: Jesse Brault <jbrault@mac.com>
Date: Thu, 22 Aug 2024 13:32:41 -0500
Subject: [PATCH] Refactored AuthProvider and RefreshProvider to be simpler.

---
 src/AuthProvider.tsx    | 42 +++++------------------------------------
 src/RefreshProvider.tsx |  6 +++---
 2 files changed, 8 insertions(+), 40 deletions(-)

diff --git a/src/AuthProvider.tsx b/src/AuthProvider.tsx
index a288d0a..6969cbe 100644
--- a/src/AuthProvider.tsx
+++ b/src/AuthProvider.tsx
@@ -1,4 +1,4 @@
-import { createContext, PropsWithChildren, useContext, useReducer } from 'react'
+import { createContext, PropsWithChildren, useContext, useState } from 'react'
 import AccessToken from './types/AccessToken'
 
 export interface AuthContextType {
@@ -6,49 +6,17 @@ export interface AuthContextType {
     putToken: (token: AccessToken | null) => void
 }
 
-interface AuthReducerState {
-    accessToken: AccessToken | null
-}
-
-const initialState: AuthReducerState = {
-    accessToken: null
-}
-
-type AuthReducerAction = PutTokenAction | ClearTokenAction
-
-interface PutTokenAction {
-    tag: 'putToken'
-    accessToken: AccessToken
-}
-
-interface ClearTokenAction {
-    tag: 'clearToken'
-}
-
-const authReducer = (_state: AuthReducerState, action: AuthReducerAction): AuthReducerState => {
-    switch (action.tag) {
-        case 'putToken':
-            return { accessToken: action.accessToken }
-        case 'clearToken':
-            return { accessToken: null }
-    }
-}
-
 const AuthContext = createContext<AuthContextType | null>(null)
 
 export const AuthProvider = ({ children }: PropsWithChildren) => {
-    const [state, dispatch] = useReducer(authReducer, initialState)
-
+    const [accessToken, setAccessToken] = useState<AccessToken | null>(null)
     return (
         <AuthContext.Provider
             value={{
-                accessToken: state.accessToken,
+                accessToken,
                 putToken: token => {
-                    if (token === null) {
-                        dispatch({ tag: 'clearToken' })
-                    } else {
-                        dispatch({ tag: 'putToken', accessToken: token })
-                    }
+                    console.log(`token: ${token !== null ? token.token : null}`)
+                    setAccessToken(token)
                 }
             }}
         >
diff --git a/src/RefreshProvider.tsx b/src/RefreshProvider.tsx
index ef9ebde..9594acc 100644
--- a/src/RefreshProvider.tsx
+++ b/src/RefreshProvider.tsx
@@ -1,5 +1,5 @@
 import { useRouter } from '@tanstack/react-router'
-import { createContext, useContext, PropsWithChildren, useRef, useCallback } from 'react'
+import { createContext, PropsWithChildren, useCallback, useContext, useRef } from 'react'
 import { ApiError } from './api/ApiError'
 import refresh, { RefreshTokenError } from './api/refresh'
 import { useAuth } from './AuthProvider'
@@ -25,7 +25,6 @@ const RefreshProvider = ({ children }: PropsWithChildren) => {
     const refreshing = useRef(false)
 
     const doRefresh: Refresh = useCallback(async () => {
-        putToken(null)
         if (!refreshing.current) {
             refreshing.current = true
             try {
@@ -53,11 +52,12 @@ const RefreshProvider = ({ children }: PropsWithChildren) => {
                 } else if (error instanceof ApiError) {
                     console.error(error)
                 }
+                putToken(null)
                 refreshing.current = false
             }
         }
         return null
-    }, [putToken, router])
+    }, [putToken])
 
     return (
         <RefreshContext.Provider