m/umami
1
0
Fork 0
mirror of https://github.com/kremalicious/umami.git synced 2025-02-14 21:10:34 +01:00
Code Issues Packages Projects Releases Wiki Activity

Move auth token logic to useApi hook.

Browse Source
This commit is contained in:
Mike Cao 2022-02-27 00:25:24 -08:00
parent d552a01701
commit be98500e82
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
components/settings/WebsiteSettings.js
View File

@ -36,7 +36,7 @@ export default function WebsiteSettings() {
const [showUrl, setShowUrl] = useState(); const [showUrl, setShowUrl] = useState();
const [saved, setSaved] = useState(0); const [saved, setSaved] = useState(0);
const [message, setMessage] = useState(); 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 => ( const Buttons = row => (
<ButtonLayout align="right"> <ButtonLayout align="right">

12
hooks/useApi.js
View File

@ -3,7 +3,7 @@ import { useRouter } from 'next/router';
import { get, post, put, del, getItem } from 'lib/web'; import { get, post, put, del, getItem } from 'lib/web';
import { AUTH_TOKEN } from 'lib/constants'; import { AUTH_TOKEN } from 'lib/constants';
function includeAuthToken(headers) { function includeAuthToken(headers = {}) {
const authToken = getItem(AUTH_TOKEN); const authToken = getItem(AUTH_TOKEN);
if (authToken) { if (authToken) {
@ -18,29 +18,29 @@ export default function useApi() {
return { return {
get: useCallback( get: useCallback(
async (url, params, headers = {}) => { async (url, params, headers) => {
return get(`${basePath}/api/${url}`, params, includeAuthToken(headers)); return get(`${basePath}/api${url}`, params, includeAuthToken(headers));
}, },
[get], [get],
), ),
post: useCallback( post: useCallback(
async (url, params, headers) => { async (url, params, headers) => {
return post(`${basePath}/api/${url}`, params, includeAuthToken(headers)); return post(`${basePath}/api${url}`, params, includeAuthToken(headers));
}, },
[post], [post],
), ),
put: useCallback( put: useCallback(
async (url, params, headers) => { async (url, params, headers) => {
return put(`${basePath}/api/${url}`, params, includeAuthToken(headers)); return put(`${basePath}/api${url}`, params, includeAuthToken(headers));
}, },
[put], [put],
), ),
del: useCallback( del: useCallback(
async (url, params, headers) => { async (url, params, headers) => {
return del(`${basePath}/api/${url}`, params, includeAuthToken(headers)); return del(`${basePath}/api${url}`, params, includeAuthToken(headers));
}, },
[del], [del],
), ),