Umami is a privacy-first web and product analytics platform. Traffic, campaigns, behavior, conversions, and revenue in one place. No cookies, no surveillance, self-hosted or in the cloud.
TypeScript analyticsaudience-segmentationchartscohort-analysisgoogle-analyticsproduct-analyticsstatisticsuser-journeyweb-analytics
Move auth token logic to useApi hook.
Mike Caobe98500e82ff
diff --git a/components/settings/WebsiteSettings.js b/components/settings/WebsiteSettings.jsindex c99ec76c2..77f923ba1 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.jsindex fd17cde0b..35904d7e7 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],),