From c8187e52bb60e0f50c47f013bd30266aff248ca9 Mon Sep 17 00:00:00 2001 From: Ali BARIN Date: Tue, 7 Mar 2023 20:27:33 +0000 Subject: [PATCH] fix: stop redirecting to login on /login --- packages/web/src/graphql/link.ts | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/packages/web/src/graphql/link.ts b/packages/web/src/graphql/link.ts index 2f8a874a..73a04269 100644 --- a/packages/web/src/graphql/link.ts +++ b/packages/web/src/graphql/link.ts @@ -33,13 +33,16 @@ const createErrorLink = (callback: CreateLinkOptions['onError']): ApolloLink => callback?.(message); } - console.log( + console.error( `[GraphQL error]: Message: ${message}, Location: ${locations}, Path: ${path}` ); if (message === NOT_AUTHORISED) { setItem('token', ''); - window.location.href = URLS.LOGIN; + + if (window.location.pathname !== URLS.LOGIN) { + window.location.href = URLS.LOGIN; + } } }); @@ -47,12 +50,13 @@ const createErrorLink = (callback: CreateLinkOptions['onError']): ApolloLink => if (autoSnackbar) { callback?.(networkError.toString()); } - console.log(`[Network error]: ${networkError}`); + + console.error(`[Network error]: ${networkError}`); } }); // eslint-disable-next-line @typescript-eslint/no-empty-function -const noop = () => {}; +const noop = () => { }; const createLink = (options: CreateLinkOptions): ApolloLink => { const { uri, onError = noop, token } = options;