Cutlery/Kyoo
1
0
Fork 0
mirror of https://github.com/zoriya/Kyoo.git synced 2025-05-30 19:54:16 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix seconds server-url logins

Browse Source
This commit is contained in:
Zoe Roux 2024-03-06 22:11:57 +01:00
parent 7c5de3c131
commit 93f93f0186
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
front/packages/models/src/query.tsx
View File

@ -34,7 +34,7 @@ import { getCurrentApiUrl } from ".";
export const queryFn = async <Parser extends z.ZodTypeAny>( export const queryFn = async <Parser extends z.ZodTypeAny>(
context: { context: {
apiUrl?: string; apiUrl?: string | null;
authenticated?: boolean; authenticated?: boolean;
method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE"; method?: "GET" | "POST" | "PUT" | "PATCH" | "DELETE";
} & ( } & (
@ -49,7 +49,7 @@ export const queryFn = async <Parser extends z.ZodTypeAny>(
type?: Parser, type?: Parser,
token?: string | null, token?: string | null,
): Promise<z.infer<Parser>> => { ): Promise<z.infer<Parser>> => {
const url = context.apiUrl ?? getCurrentApiUrl(); const url = context.apiUrl === undefined ? getCurrentApiUrl() : context.apiUrl;
if (token === undefined && context.authenticated !== false) token = await getToken(); if (token === undefined && context.authenticated !== false) token = await getToken();
const path = [url] const path = [url]
.concat( .concat(
@ -202,7 +202,8 @@ export const toQueryKey = (query: {
export const useFetch = <Data,>(query: QueryIdentifier<Data>) => { export const useFetch = <Data,>(query: QueryIdentifier<Data>) => {
return useQuery<Data, KyooErrors>({ return useQuery<Data, KyooErrors>({
queryKey: toQueryKey(query), queryKey: toQueryKey(query),
queryFn: (ctx) => queryFn({ ...ctx, ...query.options }, query.parser), queryFn: (ctx) =>
queryFn({ ...ctx, apiUrl: query.apiUrl ? null : undefined, ...query.options }, query.parser),
placeholderData: query.placeholderData as any, placeholderData: query.placeholderData as any,
enabled: query.enabled, enabled: query.enabled,
}); });
@ -211,7 +212,11 @@ export const useFetch = <Data,>(query: QueryIdentifier<Data>) => {
export const useInfiniteFetch = <Data, Ret>(query: QueryIdentifier<Data, Ret>) => { export const useInfiniteFetch = <Data, Ret>(query: QueryIdentifier<Data, Ret>) => {
const ret = useInfiniteQuery<Page<Data>, KyooErrors>({ const ret = useInfiniteQuery<Page<Data>, KyooErrors>({
queryKey: toQueryKey(query), queryKey: toQueryKey(query),
queryFn: (ctx) => queryFn({ ...ctx, ...query.options }, Paged(query.parser)), queryFn: (ctx) =>
queryFn(
{ ...ctx, apiUrl: query.apiUrl ? null : undefined, ...query.options },
Paged(query.parser),
),
getNextPageParam: (page: Page<Data>) => page?.next || undefined, getNextPageParam: (page: Page<Data>) => page?.next || undefined,
initialPageParam: undefined, initialPageParam: undefined,
placeholderData: query.placeholderData as any, placeholderData: query.placeholderData as any,