From 7161edec3e612170a42cf7dbe74446b2c1a90c37 Mon Sep 17 00:00:00 2001
From: rithviknishad <mail@rithviknishad.dev>
Date: Mon, 16 Dec 2024 21:59:32 +0530
Subject: [PATCH] code rabbit suggestions

---
 src/Utils/request/utils.ts               |  6 +++++-
 src/components/Facility/FacilityHome.tsx | 12 +++---------
 src/components/Users/UserAvatar.tsx      |  8 ++------
 src/components/Users/UserProfile.tsx     |  8 +++-----
 4 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
index a355e73bd4e..f0975ae79c2 100644
--- a/src/Utils/request/utils.ts
+++ b/src/Utils/request/utils.ts
@@ -50,13 +50,17 @@ const ensurePathNotMissingReplacements = (path: string) => {
   }
 };
 
+export function getJWTAccessToken() {
+  return localStorage.getItem(LocalStorageKeys.accessToken);
+}
+
 export function makeHeaders(noAuth: boolean, additionalHeaders?: HeadersInit) {
   const headers = new Headers(additionalHeaders);
 
   headers.set("Content-Type", "application/json");
   headers.append("Accept", "application/json");
 
-  const jwtAccessToken = localStorage.getItem(LocalStorageKeys.accessToken);
+  const jwtAccessToken = getJWTAccessToken();
   if (jwtAccessToken && !noAuth) {
     headers.append("Authorization", `Bearer ${jwtAccessToken}`);
   }
diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
index 1808a1087ee..5663a30c1ab 100644
--- a/src/components/Facility/FacilityHome.tsx
+++ b/src/components/Facility/FacilityHome.tsx
@@ -28,11 +28,7 @@ import { FieldLabel } from "@/components/Form/FormFields/FormField";
 import useAuthUser from "@/hooks/useAuthUser";
 import useSlug from "@/hooks/useSlug";
 
-import {
-  FACILITY_FEATURE_TYPES,
-  LocalStorageKeys,
-  USER_TYPES,
-} from "@/common/constants";
+import { FACILITY_FEATURE_TYPES, USER_TYPES } from "@/common/constants";
 
 import { PLUGIN_Component } from "@/PluginEngine";
 import { NonReadOnlyUsers } from "@/Utils/AuthorizeFor";
@@ -42,6 +38,7 @@ import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import { getJWTAccessToken } from "@/Utils/request/utils";
 import { sleep } from "@/Utils/utils";
 
 import { patientRegisterAuth } from "../Patient/PatientRegister";
@@ -121,10 +118,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
       url,
       formData,
       "POST",
-      {
-        Authorization:
-          "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken),
-      },
+      { Authorization: `Bearer ${getJWTAccessToken()}` },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);
diff --git a/src/components/Users/UserAvatar.tsx b/src/components/Users/UserAvatar.tsx
index db3620b34aa..47b89f703e4 100644
--- a/src/components/Users/UserAvatar.tsx
+++ b/src/components/Users/UserAvatar.tsx
@@ -9,14 +9,13 @@ import Loading from "@/components/Common/Loading";
 
 import useAuthUser from "@/hooks/useAuthUser";
 
-import { LocalStorageKeys } from "@/common/constants";
-
 import * as Notification from "@/Utils/Notifications";
 import { showAvatarEdit } from "@/Utils/permissions";
 import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import { getJWTAccessToken } from "@/Utils/request/utils";
 import { formatDisplayName, sleep } from "@/Utils/utils";
 
 export default function UserAvatar({ username }: { username: string }) {
@@ -47,10 +46,7 @@ export default function UserAvatar({ username }: { username: string }) {
       url,
       formData,
       "POST",
-      {
-        Authorization:
-          "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken),
-      },
+      { Authorization: `Bearer ${getJWTAccessToken()}` },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);
diff --git a/src/components/Users/UserProfile.tsx b/src/components/Users/UserProfile.tsx
index 4dd98635510..9d84729b68e 100644
--- a/src/components/Users/UserProfile.tsx
+++ b/src/components/Users/UserProfile.tsx
@@ -26,7 +26,7 @@ import {
 
 import useAuthUser, { useAuthContext } from "@/hooks/useAuthUser";
 
-import { GENDER_TYPES, LocalStorageKeys } from "@/common/constants";
+import { GENDER_TYPES } from "@/common/constants";
 import { validateEmailAddress } from "@/common/validation";
 
 import * as Notification from "@/Utils/Notifications";
@@ -35,6 +35,7 @@ import routes from "@/Utils/request/api";
 import request from "@/Utils/request/request";
 import uploadFile from "@/Utils/request/uploadFile";
 import useTanStackQueryInstead from "@/Utils/request/useQuery";
+import { getJWTAccessToken } from "@/Utils/request/utils";
 import {
   dateQueryString,
   formatDate,
@@ -507,10 +508,7 @@ export default function UserProfile() {
       url,
       formData,
       "POST",
-      {
-        Authorization:
-          "Bearer " + localStorage.getItem(LocalStorageKeys.accessToken),
-      },
+      { Authorization: `Bearer ${getJWTAccessToken()}` },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);