return data object from axios

Author: medyo

src/features/carbonAds/api/getAd.ts

@@ -3,17 +3,23 @@ import { ExtractFnReturnType, QueryConfig } from 'src/lib/react-query';
 import { Ad } from "../types";
 import { axios } from 'src/lib/axios';
 
-const getAd = async (): Promise<Ad> => {
+type Response = {
+  ads: Ad[]
+}
+
+const getAd = async (): Promise<Ad | null> => {
   const userAgent = new URLSearchParams(navigator.userAgent).toString()
 
-  return axios.get('/monetization/', {
+  return axios.get<Ad | null>('/monetization/', {
     params: {
       useragent: userAgent
     }
   }).then(response => {
-    if (response.data?.ads?.length) {
-      return response.data.ads[0];
-    }
+    const data = response as unknown as Response;
+    if (!!data.ads.length) {
+      return data.ads[0];
+    } 
+    return null;
   });
 }
 

src/features/changelog/api/getVersions.ts

@@ -7,7 +7,7 @@ const getAd = async (): Promise<Version[]> => {
 
   return axios.get<Version[]>('https://api.github.com/repos/medyo/hackertab.dev/releases')
   .then(response => {
-    const versions = response.data as unknown as Version[];
+    const versions = response as unknown as Version[];
     return versions
   })
 }

src/lib/axios.ts

@@ -1,6 +1,8 @@
 import Axios from 'axios';
 import { getBaseApi } from 'src/utils/DataUtils'
+import { ResponseInterceptor } from "./interceptors/ResponseInterceptor";
 
 export const axios = Axios.create({
   baseURL: getBaseApi(null)
-});
+});
+axios.interceptors.response.use(ResponseInterceptor);

src/lib/interceptors/ResponseInterceptor.ts

@@ -0,0 +1,7 @@
+import { AxiosResponse } from 'axios';
+
+export const ResponseInterceptor = (
+  response: AxiosResponse<any>
+): AxiosResponse<any> => {
+  return response.data;
+};