diff --git a/apps/web/apollo/link.js b/apps/web/apollo/link.js index 1d94c11..1f90e0b 100644 --- a/apps/web/apollo/link.js +++ b/apps/web/apollo/link.js @@ -2,7 +2,6 @@ import { message } from '@/Components/Common/Notification'; import { publicRuntimeConfigSchema } from '@/config/schema/runtime-config'; import getUrls from '@/config/urls'; -import { getToken } from '@/utils/auth'; import { ApolloLink, from, HttpLink } from '@apollo/client'; import { setContext } from '@apollo/client/link/context'; import { onError } from '@apollo/client/link/error'; @@ -81,12 +80,10 @@ export function createLink(headers) { } if (isServer()) { - const token = getToken({ headers }); - return { headers: { ...existingHeaders, - authorization: `Bearer ${token}`, + authorization: headers.authorization, }, }; } diff --git a/apps/web/pages/admin/cache.jsx b/apps/web/pages/admin/cache.jsx index 8f09c3e..5abbe7f 100644 --- a/apps/web/pages/admin/cache.jsx +++ b/apps/web/pages/admin/cache.jsx @@ -29,7 +29,7 @@ export async function getServerSideProps({ req }) { const { cookie = '' } = req.headers; const queryClient = new QueryClient(); - const apolloClient = initializeApollo(null, { cookie }); + const apolloClient = initializeApollo(null, req.headers); const getUserType = makeGetUserType({ apolloClient, queryClient }); try { diff --git a/apps/web/pages/index.jsx b/apps/web/pages/index.jsx index 6e23220..a070b48 100644 --- a/apps/web/pages/index.jsx +++ b/apps/web/pages/index.jsx @@ -36,7 +36,7 @@ export async function getServerSideProps({ req }) { const { cookie = '' } = req.headers; const queryClient = new QueryClient(); - const apolloClient = initializeApollo(null, { cookie }); + const apolloClient = initializeApollo(null, req.headers); const getUserType = makeGetUserType({ apolloClient, queryClient }); try { diff --git a/apps/web/pages/unlimited.jsx b/apps/web/pages/unlimited.jsx index 8ae0416..26d0ff1 100644 --- a/apps/web/pages/unlimited.jsx +++ b/apps/web/pages/unlimited.jsx @@ -37,7 +37,7 @@ export async function getServerSideProps({ req }) { const { cookie = '' } = req.headers; const queryClient = new QueryClient(); - const apolloClient = initializeApollo(null, { cookie }); + const apolloClient = initializeApollo(null, req.headers); const getUserType = makeGetUserType({ apolloClient, queryClient }); try { diff --git a/apps/web/utils/auth.ts b/apps/web/utils/auth.ts deleted file mode 100644 index fffa1b5..0000000 --- a/apps/web/utils/auth.ts +++ /dev/null @@ -1,12 +0,0 @@ -import type { IncomingHttpHeaders } from 'http'; - -type Request = { - headers: IncomingHttpHeaders; -}; - -export function getToken({ headers }: Request) { - return headers.cookie - ?.split(';') - .find((c) => c.trim().startsWith('token=')) - ?.split('=')[1]; -}