diff --git a/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx b/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx index b89081773..87d26904b 100644 --- a/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx +++ b/front/src/hooks/auth/__tests__/useRefreshToken.test.tsx @@ -37,7 +37,7 @@ jest.mock('@apollo/client', () => { }, }, isLoading: false, - error: {}, + error: null, }), }; }); diff --git a/front/src/hooks/auth/useHasAccessToken.tsx b/front/src/hooks/auth/useHasAccessToken.tsx deleted file mode 100644 index 91ee21b71..000000000 --- a/front/src/hooks/auth/useHasAccessToken.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export const useHasAccessToken = () => { - return false; -}; diff --git a/front/src/hooks/auth/useRedirectToSignIn.tsx b/front/src/hooks/auth/useRedirectToSignIn.tsx deleted file mode 100644 index 5aa69d04a..000000000 --- a/front/src/hooks/auth/useRedirectToSignIn.tsx +++ /dev/null @@ -1,3 +0,0 @@ -export const redirectToSignIn = () => { - return false; -}; diff --git a/front/src/hooks/auth/useRefreshToken.tsx b/front/src/hooks/auth/useRefreshToken.tsx index c4a0b3d60..4ab8d3102 100644 --- a/front/src/hooks/auth/useRefreshToken.tsx +++ b/front/src/hooks/auth/useRefreshToken.tsx @@ -15,18 +15,18 @@ export const GET_TOKEN = gql` export const useRefreshToken = () => { const refreshToken = localStorage.getItem('refreshToken'); - const { data, loading } = useQuery(GET_TOKEN, { + const { data, loading, error } = useQuery(GET_TOKEN, { client: authClient, variables: { input: { refreshToken } }, }); useEffect(() => { - if (!loading) { + if (!loading && !error) { const accessToken = data.token.accessToken; - if (refreshToken && accessToken) { + if (accessToken) { localStorage.setItem('accessToken', accessToken || ''); } } - }, [data, refreshToken, loading]); + }, [data, refreshToken, loading, error]); - return { loading }; + return { loading, error }; }; diff --git a/front/src/pages/people/People.tsx b/front/src/pages/people/People.tsx index 9de38894a..73b4c99b4 100644 --- a/front/src/pages/people/People.tsx +++ b/front/src/pages/people/People.tsx @@ -14,8 +14,8 @@ const StyledPeopleContainer = styled.div` `; export const GET_PEOPLE = gql` - query GetPeople($orderBy: [persons_order_by!]) { - persons(order_by: $orderBy) { + query GetPeople($orderBy: [people_order_by!]) { + people(order_by: $orderBy) { id phone email @@ -57,7 +57,7 @@ function People() { setOrderBy(sorts.length ? reduceSortsToOrderBy(sorts) : defaultOrderBy); }; - const { data } = useQuery<{ persons: GraphqlPerson[] }>(GET_PEOPLE, { + const { data } = useQuery<{ people: GraphqlPerson[] }>(GET_PEOPLE, { variables: { orderBy: orderBy }, }); @@ -66,7 +66,7 @@ function People() { {