mirror of
https://github.com/umami-software/umami.git
synced 2026-02-08 14:47:14 +01:00
Updated share token logic. Closes #1113.
This commit is contained in:
parent
b5de6b997e
commit
e735a1c50d
12 changed files with 44 additions and 42 deletions
|
|
@ -1,13 +1,18 @@
|
|||
import { useCallback } from 'react';
|
||||
import { useRouter } from 'next/router';
|
||||
import { get, post, put, del, getItem } from 'lib/web';
|
||||
import { AUTH_TOKEN } from 'lib/constants';
|
||||
import { AUTH_TOKEN, SHARE_TOKEN_HEADER } from 'lib/constants';
|
||||
import useStore from 'store/app';
|
||||
|
||||
function includeAuthToken(headers = {}) {
|
||||
const authToken = getItem(AUTH_TOKEN);
|
||||
const selector = state => state.shareToken;
|
||||
|
||||
function parseHeaders(headers = {}, { authToken, shareToken }) {
|
||||
if (authToken) {
|
||||
headers.Authorization = `Bearer ${authToken}`;
|
||||
headers.authorization = `Bearer ${authToken}`;
|
||||
}
|
||||
|
||||
if (shareToken) {
|
||||
headers[SHARE_TOKEN_HEADER] = shareToken.token;
|
||||
}
|
||||
|
||||
return headers;
|
||||
|
|
@ -15,32 +20,50 @@ function includeAuthToken(headers = {}) {
|
|||
|
||||
export default function useApi() {
|
||||
const { basePath } = useRouter();
|
||||
const authToken = getItem(AUTH_TOKEN);
|
||||
const shareToken = useStore(selector);
|
||||
|
||||
return {
|
||||
get: useCallback(
|
||||
async (url, params, headers) => {
|
||||
return get(`${basePath}/api${url}`, params, includeAuthToken(headers));
|
||||
return get(
|
||||
`${basePath}/api${url}`,
|
||||
params,
|
||||
parseHeaders(headers, { authToken, shareToken }),
|
||||
);
|
||||
},
|
||||
[get],
|
||||
),
|
||||
|
||||
post: useCallback(
|
||||
async (url, params, headers) => {
|
||||
return post(`${basePath}/api${url}`, params, includeAuthToken(headers));
|
||||
return post(
|
||||
`${basePath}/api${url}`,
|
||||
params,
|
||||
parseHeaders(headers, { authToken, shareToken }),
|
||||
);
|
||||
},
|
||||
[post],
|
||||
),
|
||||
|
||||
put: useCallback(
|
||||
async (url, params, headers) => {
|
||||
return put(`${basePath}/api${url}`, params, includeAuthToken(headers));
|
||||
return put(
|
||||
`${basePath}/api${url}`,
|
||||
params,
|
||||
parseHeaders(headers, { authToken, shareToken }),
|
||||
);
|
||||
},
|
||||
[put],
|
||||
),
|
||||
|
||||
del: useCallback(
|
||||
async (url, params, headers) => {
|
||||
return del(`${basePath}/api${url}`, params, includeAuthToken(headers));
|
||||
return del(
|
||||
`${basePath}/api${url}`,
|
||||
params,
|
||||
parseHeaders(headers, { authToken, shareToken }),
|
||||
);
|
||||
},
|
||||
[del],
|
||||
),
|
||||
|
|
|
|||
|
|
@ -6,6 +6,7 @@ const selector = state => state.shareToken;
|
|||
|
||||
export default function useShareToken(shareId) {
|
||||
const shareToken = useStore(selector);
|
||||
console.log({ shareToken });
|
||||
const { get } = useApi();
|
||||
|
||||
async function loadToken(id) {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue