Merge pull request #1689 from automatisch/fix-auth-in-rq

fix: initialize auth in RQ client

packages/web/src/components/ApolloProvider/index.jsx

@@ -1,5 +1,6 @@
 import { ApolloProvider as BaseApolloProvider } from '@apollo/client';
 import * as React from 'react';
+
 import { mutateAndGetClient } from 'graphql/client';
 import useAuthentication from 'hooks/useAuthentication';
 import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
@@ -7,6 +8,7 @@ import useEnqueueSnackbar from 'hooks/useEnqueueSnackbar';
 const ApolloProvider = (props) => {
   const enqueueSnackbar = useEnqueueSnackbar();
   const authentication = useAuthentication();
+
   const onError = React.useCallback(
     (message) => {
       enqueueSnackbar(message, {
@@ -18,12 +20,14 @@ const ApolloProvider = (props) => {
     },
     [enqueueSnackbar],
   );
+
   const client = React.useMemo(() => {
     return mutateAndGetClient({
       onError,
       token: authentication.token,
     });
   }, [onError, authentication]);
+
   return <BaseApolloProvider client={client} {...props} />;
 };
 

packages/web/src/components/QueryClientProvider/index.jsx

@@ -33,11 +33,11 @@ export default function AutomatischQueryClientProvider({ children }) {
 
       if (token) {
         api.defaults.headers.Authorization = token;
-
-        initialize();
       } else {
         delete api.defaults.headers.Authorization;
       }
+
+      initialize();
     },
     [initialize, token],
   );