From 235bc9db288deeb1a167b8ef51d42700a97ef8b0 Mon Sep 17 00:00:00 2001
From: Marshall Polaris <marshall@pol.rs>
Date: Sat, 6 Aug 2022 14:52:01 -0700
Subject: [PATCH] Pass page props user to auth provider if present

---
 web/components/auth-context.tsx | 10 +++++-----
 web/pages/_app.tsx              |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/web/components/auth-context.tsx b/web/components/auth-context.tsx
index 24adde25..d7eb9bdf 100644
--- a/web/components/auth-context.tsx
+++ b/web/components/auth-context.tsx
@@ -1,4 +1,4 @@
-import { createContext, useEffect } from 'react'
+import { ReactNode, createContext, useEffect } from 'react'
 import { User } from 'common/user'
 import { onIdTokenChanged } from 'firebase/auth'
 import {
@@ -28,11 +28,11 @@ const ensureDeviceToken = () => {
   return deviceToken
 }
 
-export const AuthContext = createContext<AuthUser>(null)
-
-export function AuthProvider({ children }: any) {
-  const [authUser, setAuthUser] = useStateCheckEquality<AuthUser>(undefined)
+export const AuthContext = createContext<AuthUser>(undefined)
 
+export function AuthProvider(props: { children: ReactNode; user?: AuthUser }) {
+  const { children, user } = props
+  const [authUser, setAuthUser] = useStateCheckEquality<AuthUser>(user)
   useEffect(() => {
     const cachedUser = localStorage.getItem(CACHED_USER_KEY)
     setAuthUser(cachedUser && JSON.parse(cachedUser))
diff --git a/web/pages/_app.tsx b/web/pages/_app.tsx
index 14dd6cf0..9fdc7301 100644
--- a/web/pages/_app.tsx
+++ b/web/pages/_app.tsx
@@ -79,7 +79,7 @@ function MyApp({ Component, pageProps }: AppProps) {
           content="width=device-width, initial-scale=1, maximum-scale=1"
         />
       </Head>
-      <AuthProvider>
+      <AuthProvider user={pageProps.user}>
         <QueryClientProvider client={queryClient}>
           <Welcome {...pageProps} />
           <Component {...pageProps} />