Skip to content

Commit

Permalink
reduce unnecessary log outs
Browse files Browse the repository at this point in the history
  • Loading branch information
jsladerman committed Sep 17, 2024
1 parent e412860 commit f227e59
Showing 1 changed file with 24 additions and 11 deletions.
35 changes: 24 additions & 11 deletions assets/src/components/login/Login.tsx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
import { useMutation, useQuery } from '@apollo/client'
import { ApolloError, useMutation, useQuery } from '@apollo/client'
import { Button, LoopingLogo } from '@pluralsh/design-system'
import { WelcomeHeader } from 'components/utils/WelcomeHeader'
import { useMeQuery } from 'generated/graphql'
import { User, useMeQuery } from 'generated/graphql'
import gql from 'graphql-tag'
import { Div, Flex, Form, P } from 'honorable'
import { RefObject, useEffect, useRef, useState } from 'react'
Expand Down Expand Up @@ -41,16 +41,24 @@ const setInputFocus = (ref: RefObject<any>) => {
})
}

function LoginError({ error }) {
function LoginError({
me,
error,
}: {
me: Nullable<User>
error: ApolloError | undefined
}) {
useEffect(() => {
const to = setTimeout(() => {
wipeToken()
wipeRefreshToken()
window.location = '/login' as any as Location
}, 2000)
if (!error?.networkError && !me) {
const to = setTimeout(() => {
wipeToken()
wipeRefreshToken()
window.location = '/login' as any as Location
}, 2000)

return () => clearTimeout(to)
}, [])
return () => clearTimeout(to)
}
}, [error?.networkError, me])

console.error('Login error:', error)

Expand Down Expand Up @@ -109,7 +117,12 @@ export function EnsureLogin({ children }) {
const loginContextValue = data

if (error || (!loading && !data?.clusterInfo)) {
return <LoginError error={error} />
return (
<LoginError
me={data?.me}
error={error}
/>
)
}

if (!data?.clusterInfo) return null
Expand Down

0 comments on commit f227e59

Please sign in to comment.