simplify things a bit more...

ohcnetwork · Dec 16, 2024 · 8c3eb5f · 8c3eb5f
1 parent 7161ede
commit 8c3eb5f
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 13 deletions.
diff --git a/src/Utils/request/utils.ts b/src/Utils/request/utils.ts
@@ -50,24 +50,30 @@ 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 = getJWTAccessToken();
-  if (jwtAccessToken && !noAuth) {
-    headers.append("Authorization", `Bearer ${jwtAccessToken}`);
+  const authorizationHeader = getAuthorizationHeader();
+  if (authorizationHeader && !noAuth) {
+    headers.append("Authorization", authorizationHeader);
   }
 
   return headers;
 }
 
+export function getAuthorizationHeader() {
+  const accessToken = localStorage.getItem(LocalStorageKeys.accessToken);
+
+  if (accessToken) {
+    return `Bearer ${accessToken}`;
+  }
+
+  return null;
+}
+
 export function mergeRequestOptions<TData>(
   options: RequestOptions<TData>,
   overrides: RequestOptions<TData>,

diff --git a/src/components/Facility/FacilityHome.tsx b/src/components/Facility/FacilityHome.tsx
@@ -38,7 +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 { getAuthorizationHeader } from "@/Utils/request/utils";
 import { sleep } from "@/Utils/utils";
 
 import { patientRegisterAuth } from "../Patient/PatientRegister";
@@ -118,7 +118,7 @@ export const FacilityHome = ({ facilityId }: Props) => {
       url,
       formData,
       "POST",
-      { Authorization: `Bearer ${getJWTAccessToken()}` },
+      { Authorization: getAuthorizationHeader() },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);

diff --git a/src/components/Users/UserAvatar.tsx b/src/components/Users/UserAvatar.tsx
@@ -15,7 +15,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 { getAuthorizationHeader } from "@/Utils/request/utils";
 import { formatDisplayName, sleep } from "@/Utils/utils";
 
 export default function UserAvatar({ username }: { username: string }) {
@@ -46,7 +46,7 @@ export default function UserAvatar({ username }: { username: string }) {
       url,
       formData,
       "POST",
-      { Authorization: `Bearer ${getJWTAccessToken()}` },
+      { Authorization: getAuthorizationHeader() },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);

diff --git a/src/components/Users/UserProfile.tsx b/src/components/Users/UserProfile.tsx
@@ -35,7 +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 { getAuthorizationHeader } from "@/Utils/request/utils";
 import {
   dateQueryString,
   formatDate,
@@ -508,7 +508,7 @@ export default function UserProfile() {
       url,
       formData,
       "POST",
-      { Authorization: `Bearer ${getJWTAccessToken()}` },
+      { Authorization: getAuthorizationHeader() },
       async (xhr: XMLHttpRequest) => {
         if (xhr.status === 200) {
           await sleep(1000);