From be98500e82ff7d1b84d4fe5d27e510bf3f0dc426 Mon Sep 17 00:00:00 2001
From: Mike Cao <mike@mikecao.com>
Date: Sun, 27 Feb 2022 00:25:24 -0800
Subject: [PATCH] Move auth token logic to useApi hook.

---
 components/settings/WebsiteSettings.js |  2 +-
 hooks/useApi.js                        | 12 ++++++------
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/components/settings/WebsiteSettings.js b/components/settings/WebsiteSettings.js
index c99ec76c..77f923ba 100644
--- a/components/settings/WebsiteSettings.js
+++ b/components/settings/WebsiteSettings.js
@@ -36,7 +36,7 @@ export default function WebsiteSettings() {
   const [showUrl, setShowUrl] = useState();
   const [saved, setSaved] = useState(0);
   const [message, setMessage] = useState();
-  const { data } = useFetch(`/websites` + (user?.is_admin ? '?include_all=true' : ''), {}, [saved]);
+  const { data } = useFetch('/websites', { params: { include_all: !!user?.is_admin } }, [saved]);
 
   const Buttons = row => (
     <ButtonLayout align="right">
diff --git a/hooks/useApi.js b/hooks/useApi.js
index fd17cde0..35904d7e 100644
--- a/hooks/useApi.js
+++ b/hooks/useApi.js
@@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
 import { get, post, put, del, getItem } from 'lib/web';
 import { AUTH_TOKEN } from 'lib/constants';
 
-function includeAuthToken(headers) {
+function includeAuthToken(headers = {}) {
   const authToken = getItem(AUTH_TOKEN);
 
   if (authToken) {
@@ -18,29 +18,29 @@ export default function useApi() {
 
   return {
     get: useCallback(
-      async (url, params, headers = {}) => {
-        return get(`${basePath}/api/${url}`, params, includeAuthToken(headers));
+      async (url, params, headers) => {
+        return get(`${basePath}/api${url}`, params, includeAuthToken(headers));
       },
       [get],
     ),
 
     post: useCallback(
       async (url, params, headers) => {
-        return post(`${basePath}/api/${url}`, params, includeAuthToken(headers));
+        return post(`${basePath}/api${url}`, params, includeAuthToken(headers));
       },
       [post],
     ),
 
     put: useCallback(
       async (url, params, headers) => {
-        return put(`${basePath}/api/${url}`, params, includeAuthToken(headers));
+        return put(`${basePath}/api${url}`, params, includeAuthToken(headers));
       },
       [put],
     ),
 
     del: useCallback(
       async (url, params, headers) => {
-        return del(`${basePath}/api/${url}`, params, includeAuthToken(headers));
+        return del(`${basePath}/api${url}`, params, includeAuthToken(headers));
       },
       [del],
     ),