using native fetch for caching and revalidation

avantifellows · Jan 4, 2024 · b038c05 · b038c05
1 parent e4b1a1b
commit b038c05
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 14 deletions.
diff --git a/api/afdb/library.ts b/api/afdb/library.ts
@@ -1,6 +1,5 @@
 "use server"
 
-import axios from 'axios';
 import { Curriculum, Subject, Grade, Chapter, Resource, Topic } from '../../app/types'
 import getFetchConfig from '../fetchConfig';
 

diff --git a/api/afdb/session.ts b/api/afdb/session.ts
@@ -1,6 +1,5 @@
 "use server"
 
-import axios from 'axios';
 import getFetchConfig from '../fetchConfig';
 
 const url = process.env.AF_DB_SERVICE_URL;

diff --git a/api/reporting/reports.ts b/api/reporting/reports.ts
@@ -1,20 +1,21 @@
 "use server"
 
 import { api } from "@/services/url";
-import axios from "axios";
+import getFetchConfig from "../fetchConfig";
 
 export async function getReports(userId: string) {
     const apiKey = process.env.AF_REPORTS_DB_API_KEY;
     const url = `${api.reports.baseUrl}${api.reports.student_reports}${userId}?format=json`;
 
     try {
-        const responseData = await axios.get(url, {
-            headers: {
-                accept: "application/json",
-                Authorization: `Bearer ${apiKey}`,
-            },
-        });
-        return responseData.data;
+        const response = await fetch(url, getFetchConfig(apiKey!));
+
+        if (!response.ok) {
+            throw new Error(`Error fetching reports: ${response.statusText}`);
+        }
+
+        const data = await response.json();
+        return data;
     } catch (error) {
         throw error;
     }

diff --git a/app/types.ts b/app/types.ts
@@ -91,9 +91,6 @@ export interface ReportsListProps {
   userId: string;
 
 }
-export interface AxiosAdditionalHeaders {
-  [key: string]: string;
-}
 
 export interface User {
   id: number;

diff --git a/services/AuthContext.tsx b/services/AuthContext.tsx
@@ -47,7 +47,7 @@ export function AuthProvider({ children }: { children: React.ReactNode }) {
         checkToken();
     }, []);
 
-    const userName = user ? `${user.first_name} ${user.last_name}` : '';
+    const userName = `${user?.first_name || ''} ${user?.last_name || ''}`.trim();
     const userDbId = user ? user.id : null;
 
     return (