improvements to login screen to support redirect

src/lib/auth/hooks/user.ts

@@ -30,20 +30,24 @@ export function useUser(options?: UseUserOptions) {
 
   const { redirectTo, redirectIfFound } = { ...defaults, ...options }
 
+  console.log({ redirectTo })
+
   const { data, error } = useSWR('/api/user', userFetcher)
 
   const user = data?.user
   const finished = Boolean(data)
   const hasUser = Boolean(user)
 
   useEffect(() => {
+    console.log({ redirectTo, redirectIfFound, finished, hasUser })
     if (!redirectTo || !finished) return
     if (
       // If redirectTo is set, redirect if the user was not found.
       (redirectTo && !redirectIfFound && !hasUser) ||
       // If redirectIfFound is also set, redirect if the user was found
       (redirectIfFound && hasUser)
     ) {
+      console.warn('LOGGED IN, REDIRECTING TO ' + redirectTo)
       Router.push(redirectTo)
     }
   }, [redirectTo, redirectIfFound, finished, hasUser])

src/pages/api/causality-graphql.ts

@@ -66,8 +66,7 @@ export default async function causalityGraphql(
         },
         body: JSON.stringify({
           query,
-          // hack: shove userId in from session
-          variables: { ...variables, userId: session.userId },
+          variables,
         }),
       }
     )

src/pages/auctions/[id].tsx

@@ -53,9 +53,16 @@ import {
 const lotIdx = 1
 
 import { Sale } from 'components/Types'
+import { useUser } from 'lib/auth/hooks'
 
 const Auction: React.FC<{ sale: Sale }> = ({ sale }) => {
   const router = useRouter()
+  const user =
+    useUser({
+      redirectTo: `/login?redirectTo=${encodeURIComponent(router.asPath)}`,
+    }) || {}
+
+  const { userId } = user
 
   const lots =
     sale?.saleArtworksConnection?.edges?.map(({ node }) => node) || []
@@ -72,7 +79,7 @@ const Auction: React.FC<{ sale: Sale }> = ({ sale }) => {
     auctionDataQuery,
     {
       saleId: sale?.internalID,
-      userId: 'throwaway value',
+      userId,
     }
   )
 

src/pages/login.tsx

@@ -1,10 +1,17 @@
+import { useRouter } from 'next/router'
 import { useState, FormEvent } from 'react'
 import { useUser } from '../lib/auth/hooks'
 
 const TWO_FACTOR_MISSING_RESPONSE = 'missing two-factor'
 
 const Login = () => {
-  const user = useUser({ redirectIfFound: true, redirectTo: '/' })
+  const {
+    query: { redirectTo = '/' },
+  } = useRouter()
+  const user = useUser({
+    redirectIfFound: true,
+    redirectTo: '/',
+  })
 
   const [errorMsg, setErrorMsg] = useState('')
   const [isTwoFactorEnabled, setTwoFactorEnabled] = useState(false)
@@ -28,7 +35,7 @@ const Login = () => {
         body: JSON.stringify(body),
       })
       if (res.status === 200) {
-        window.location.href = '/'
+        window.location.href = redirectTo as string
       } else {
         throw new Error(await res.text())
       }