Fix login

This commit is contained in:
Charles Bochet
2023-07-26 02:44:43 -07:00
parent 66585fce9a
commit f6faff407a
3 changed files with 16 additions and 7 deletions

View File

@ -26,18 +26,18 @@ root.render(
<RecoilRoot>
<BrowserRouter>
<ApolloProvider>
<UserProvider>
<ClientConfigProvider>
<ClientConfigProvider>
<UserProvider>
<AuthAutoRouter />
<AppThemeProvider>
<SnackBarProvider>
<AuthAutoRouter />
<StrictMode>
<App />
</StrictMode>
</SnackBarProvider>
</AppThemeProvider>
</ClientConfigProvider>
</UserProvider>
</UserProvider>
</ClientConfigProvider>
</ApolloProvider>
</BrowserRouter>
</RecoilRoot>,

View File

@ -154,7 +154,7 @@ export function TimelineActivity({ commentThread }: OwnProps) {
</StyledIconContainer>
<StyledItemTitleContainer>
<span>{commentThread.author.displayName}</span>
created a note
created a {commentThread.type.toLowerCase()}
</StyledItemTitleContainer>
<StyledItemTitleDate id={`id-${commentThread.id}`}>
{beautifiedCreatedAt} ago

View File

@ -7,6 +7,7 @@ import { tokenPairState } from '@/auth/states/tokenPairState';
import { isDebugModeState } from '@/client-config/states/isDebugModeState';
import { AppPath } from '@/types/AppPath';
import { CommentThreadTarget } from '~/generated/graphql';
import { useIsMatchingLocation } from '~/hooks/useIsMatchingLocation';
import { useUpdateEffect } from '~/hooks/useUpdateEffect';
import { ApolloFactory } from '../services/apollo.factory';
@ -16,6 +17,7 @@ export function useApolloFactory() {
const [isDebugMode] = useRecoilState(isDebugModeState);
const navigate = useNavigate();
const isMatchingLocation = useIsMatchingLocation();
const [tokenPair, setTokenPair] = useRecoilState(tokenPairState);
const apolloClient = useMemo(() => {
@ -49,7 +51,14 @@ export function useApolloFactory() {
},
onUnauthenticatedError() {
setTokenPair(null);
navigate(AppPath.SignIn);
if (
!isMatchingLocation(AppPath.Verify) &&
!isMatchingLocation(AppPath.SignIn) &&
!isMatchingLocation(AppPath.SignUp) &&
!isMatchingLocation(AppPath.Invite)
) {
navigate(AppPath.SignIn);
}
},
extraLinks: [],
isDebugMode,