checkout

src/utils/axiosInstance.ts

@@ -2,15 +2,47 @@ import axios from 'axios';
 
 export const axiosInstance = axios.create();
 
+//getting new tokens
+const getNewTokens = async () => {
+  try {
+    const refreshToken = localStorage.getItem('refreshToken');
+    const { data } = await axiosInstance.get(
+      `${process.env.REACT_APP_API_URL}/token/refresh?refreshToken=${refreshToken}`,
+    );
+    localStorage.setItem('userToken', data.token);
+    localStorage.setItem('refreshToken', data.refreshToken);
+    return data.token;
+  } catch (e) {
+    console.log(e);
+  }
+};
+
 axiosInstance.interceptors.request.use(
-  (config) => {
+  (request) => {
     const token = localStorage.getItem('userToken');
 
-    config.headers['Content-Type'] = 'application/json';
-    config.headers['Authorization'] = token ? `Bearer ${token}` : '';
-    return config;
+    request.headers['Content-Type'] = 'application/json';
+    request.headers['Authorization'] = token ? `Bearer ${token}` : '';
+    return request;
   },
   (error) => {
     Promise.reject(error);
   },
 );
+
+// Response interceptor for API calls
+axiosInstance.interceptors.response.use(
+  (response) => {
+    return response;
+  },
+  async (error) => {
+    const originalRequest = error.config;
+    if (error.response.status === 403 && !originalRequest._retry) {
+      originalRequest._retry = true;
+      const access_token = await getNewTokens();
+      axios.defaults.headers.common['Authorization'] = `Bearer ${access_token}`;
+      return axiosInstance(originalRequest);
+    }
+    return Promise.reject(error);
+  },
+);

src/utils/index.ts

@@ -1,21 +1,12 @@
 import { courseStartTimeToEventRow } from '../constants/index';
 import { SchedulerEvent } from '../types';
 
-export const createClassTime = (startTime: string): [string, string] => {
-  const startTimeMapped = courseStartTimeToEventRow[startTime];
-  const endTime = Object.keys(courseStartTimeToEventRow).find(
-    (key) => courseStartTimeToEventRow[key] === startTimeMapped + 1,
-  )!;
-  return [startTime, endTime];
-};
+
 
 export const selectGroupsToShow = (schedulerEvents: Array<SchedulerEvent>, index: number) => {
-  return schedulerEvents.filter(({ time }: { time: [string, string] }) => courseStartTimeToEventRow[time[0]] === index);
+  return schedulerEvents.filter((schedulerEvent) => courseStartTimeToEventRow[schedulerEvent.time] === index);
 };
 
-
-
-
 //debounce declaration and implementation
 type Procedure = (...args: any[]) => any;