[bug]: failed to fetch acces token from checkConnection

valmi-io · Dec 5, 2023 · f2bd63f · f2bd63f
1 parent 990cdab
commit f2bd63f
Show file tree

Hide file tree

Showing 4 changed files with 16 additions and 17 deletions.
diff --git a/pages/api/access.tsx b/pages/api/access.tsx
@@ -1,6 +1,6 @@
 import { NextApiRequest, NextApiResponse } from 'next/types';
 
-import cookie from 'cookie';
+import { getAccessTokenCookie } from './utils';
 
 type ResponseData = {
   accessToken: string;
@@ -10,10 +10,7 @@ export default function accessTokenHandler(
   req: NextApiRequest,
   res: NextApiResponse<ResponseData>
 ) {
-  const cookies = cookie.parse(req.headers?.cookie ?? '');
-  const appCookie = cookies?.['AUTH'] ?? '';
-  const parsedCookies = appCookie ? JSON.parse(appCookie) : {};
-  const accessToken = parsedCookies?.accessToken ?? null;
+  const accessToken = getAccessTokenCookie(req) || '';
 
   res.status(200).json({ accessToken: accessToken });
 }
diff --git a/pages/api/checkConnection.tsx b/pages/api/checkConnection.tsx
@@ -8,7 +8,7 @@ import { NextApiRequest, NextApiResponse } from 'next/types';
 
 import axios from 'axios';
 
-import { getAccessToken, getBaseUrl } from 'pages/api/utils';
+import { getAccessTokenCookie, getBaseUrl } from 'pages/api/utils';
 
 import { sendErrorToBugsnag } from '@lib/bugsnag';
 
@@ -19,11 +19,7 @@ const checkConnection = async (req: NextApiRequest, res: NextApiResponse) => {
   // query
   url = `${getBaseUrl()}${url}`;
 
-  const response = await getAccessToken();
-
-  const jsonData = await response.json();
-
-  const bearerToken = jsonData.accessToken || '';
+  const bearerToken = getAccessTokenCookie(req) || '';
 
   try {
     const response = await axios.post(url, payload, {

diff --git a/pages/api/connectionNetworkHandler.tsx b/pages/api/connectionNetworkHandler.tsx
@@ -8,7 +8,7 @@ import { NextApiRequest, NextApiResponse } from 'next/types';
 
 import axios from 'axios';
 
-import { getAccessToken, getBaseUrl } from 'pages/api/utils';
+import { getAccessTokenCookie, getBaseUrl } from 'pages/api/utils';
 
 import { sendErrorToBugsnag } from '@lib/bugsnag';
 
@@ -21,11 +21,7 @@ const connectionNetworkHandler = async (
   // query
   connectionUrl = `${getBaseUrl()}${connectionUrl}`;
 
-  const response = await getAccessToken();
-
-  const jsonData = await response.json();
-
-  const bearerToken = jsonData.accessToken || '';
+  const bearerToken = getAccessTokenCookie(req) || '';
 
   try {
     const response = await axios.post(connectionUrl, payload, {

diff --git a/pages/api/utils.tsx b/pages/api/utils.tsx
@@ -4,6 +4,8 @@
  * Author: Nagendra S @ valmi.io
  */
 
+import cookie from 'cookie';
+
 export const configureCredentials = (data: any) => {
   let config = data?.config
     ? data.config.credentials
@@ -55,3 +57,11 @@ export const logoutUser = () => {
     }
   });
 };
+
+export const getAccessTokenCookie = (req: any) => {
+  const cookies = cookie.parse(req.headers?.cookie ?? '');
+  const appCookie = cookies?.['AUTH'] ?? '';
+  const parsedCookies = appCookie ? JSON.parse(appCookie) : {};
+  const accessToken = parsedCookies?.accessToken ?? null;
+  return accessToken;
+};