@squonk/account-server-client 0.1.27-rc.1 → 0.1.28-rc.1

package/service/service.js

@@ -1,46 +1,44 @@
 import {
-  __spreadValues
-} from "../chunk-GWBPVOL2.js";
+  __spreadValues,
+  customInstance
+} from "../chunk-6EEIAH4R.js";
 
 // src/service/service.ts
-import axios from "axios";
 import {
   useQuery
 } from "react-query";
-var appApiServiceGet = (options) => {
-  return axios.get(`/service`, options);
+var getServices = (options) => {
+  return customInstance({ url: `/service`, method: "get" }, options);
 };
-var getAppApiServiceGetQueryKey = () => [`/service`];
-var useAppApiServiceGet = (options) => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
-  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getAppApiServiceGetQueryKey();
-  const queryFn = () => appApiServiceGet(axiosOptions);
+var getGetServicesQueryKey = () => [`/service`];
+var useGetServices = (options) => {
+  const { query: queryOptions, request: requestOptions } = options || {};
+  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetServicesQueryKey();
+  const queryFn = () => getServices(requestOptions);
   const query = useQuery(queryKey, queryFn, queryOptions);
   return __spreadValues({
     queryKey
   }, query);
 };
-var appApiServiceGetId = (svcId, options) => {
-  return axios.get(`/service/${svcId}`, options);
+var getService = (svcId, options) => {
+  return customInstance({ url: `/service/${svcId}`, method: "get" }, options);
 };
-var getAppApiServiceGetIdQueryKey = (svcId) => [
-  `/service/${svcId}`
-];
-var useAppApiServiceGetId = (svcId, options) => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
-  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getAppApiServiceGetIdQueryKey(svcId);
-  const queryFn = () => appApiServiceGetId(svcId, axiosOptions);
+var getGetServiceQueryKey = (svcId) => [`/service/${svcId}`];
+var useGetService = (svcId, options) => {
+  const { query: queryOptions, request: requestOptions } = options || {};
+  const queryKey = (queryOptions == null ? void 0 : queryOptions.queryKey) ?? getGetServiceQueryKey(svcId);
+  const queryFn = () => getService(svcId, requestOptions);
   const query = useQuery(queryKey, queryFn, __spreadValues({ enabled: !!svcId }, queryOptions));
   return __spreadValues({
     queryKey
   }, query);
 };
 export {
-  appApiServiceGet,
-  appApiServiceGetId,
-  getAppApiServiceGetIdQueryKey,
-  getAppApiServiceGetQueryKey,
-  useAppApiServiceGet,
-  useAppApiServiceGetId
+  getGetServiceQueryKey,
+  getGetServicesQueryKey,
+  getService,
+  getServices,
+  useGetService,
+  useGetServices
 };
 //# sourceMappingURL=service.js.map

package/service/service.js.map

@@ -1 +1 @@
-{"version":3,"sources":["../../src/service/service.ts"],"sourcesContent":["/**\n * Generated by orval v6.7.1 🍺\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from \"axios\";\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const appApiServiceGet = (\n  options?: AxiosRequestConfig\n): Promise<AxiosResponse<ServicesGetResponse>> => {\n  return axios.get(`/service`, options);\n};\n\nexport const getAppApiServiceGetQueryKey = () => [`/service`];\n\nexport type AppApiServiceGetQueryResult = NonNullable<\n  AsyncReturnType<typeof appApiServiceGet>\n>;\nexport type AppApiServiceGetQueryError = AxiosError<AsError | void>;\n\nexport const useAppApiServiceGet = <\n  TData = AsyncReturnType<typeof appApiServiceGet>,\n  TError = AxiosError<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<\n    AsyncReturnType<typeof appApiServiceGet>,\n    TError,\n    TData\n  >;\n  axios?: AxiosRequestConfig;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, axios: axiosOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getAppApiServiceGetQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof appApiServiceGet>> = () =>\n    appApiServiceGet(axiosOptions);\n\n  const query = useQuery<\n    AsyncReturnType<typeof appApiServiceGet>,\n    TError,\n    TData\n  >(queryKey, queryFn, queryOptions);\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const appApiServiceGetId = (\n  svcId: number,\n  options?: AxiosRequestConfig\n): Promise<AxiosResponse<ServiceGetResponse>> => {\n  return axios.get(`/service/${svcId}`, options);\n};\n\nexport const getAppApiServiceGetIdQueryKey = (svcId: number) => [\n  `/service/${svcId}`,\n];\n\nexport type AppApiServiceGetIdQueryResult = NonNullable<\n  AsyncReturnType<typeof appApiServiceGetId>\n>;\nexport type AppApiServiceGetIdQueryError = AxiosError<AsError | void>;\n\nexport const useAppApiServiceGetId = <\n  TData = AsyncReturnType<typeof appApiServiceGetId>,\n  TError = AxiosError<AsError | void>\n>(\n  svcId: number,\n  options?: {\n    query?: UseQueryOptions<\n      AsyncReturnType<typeof appApiServiceGetId>,\n      TError,\n      TData\n    >;\n    axios?: AxiosRequestConfig;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, axios: axiosOptions } = options || {};\n\n  const queryKey =\n    queryOptions?.queryKey ?? getAppApiServiceGetIdQueryKey(svcId);\n\n  const queryFn: QueryFunction<\n    AsyncReturnType<typeof appApiServiceGetId>\n  > = () => appApiServiceGetId(svcId, axiosOptions);\n\n  const query = useQuery<\n    AsyncReturnType<typeof appApiServiceGetId>,\n    TError,\n    TData\n  >(queryKey, queryFn, { enabled: !!svcId, ...queryOptions });\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n"],"mappings":";;;;;AAUA;AACA;AAAA;AAAA;AAyBO,IAAM,mBAAmB,CAC9B,YACgD;AAChD,SAAO,MAAM,IAAI,YAAY,OAAO;AACtC;AAEO,IAAM,8BAA8B,MAAM,CAAC,UAAU;AAOrD,IAAM,sBAAsB,CAGjC,YAO4D;AAC5D,QAAM,EAAE,OAAO,cAAc,OAAO,iBAAiB,WAAW,CAAC;AAEjE,QAAM,WAAW,8CAAc,aAAY,4BAA4B;AAEvE,QAAM,UAAmE,MACvE,iBAAiB,YAAY;AAE/B,QAAM,QAAQ,SAIZ,UAAU,SAAS,YAAY;AAEjC,SAAO;AAAA,IACL;AAAA,KACG;AAEP;AAOO,IAAM,qBAAqB,CAChC,OACA,YAC+C;AAC/C,SAAO,MAAM,IAAI,YAAY,SAAS,OAAO;AAC/C;AAEO,IAAM,gCAAgC,CAAC,UAAkB;AAAA,EAC9D,YAAY;AACd;AAOO,IAAM,wBAAwB,CAInC,OACA,YAQ2D;AAC3D,QAAM,EAAE,OAAO,cAAc,OAAO,iBAAiB,WAAW,CAAC;AAEjE,QAAM,WACJ,8CAAc,aAAY,8BAA8B,KAAK;AAE/D,QAAM,UAEF,MAAM,mBAAmB,OAAO,YAAY;AAEhD,QAAM,QAAQ,SAIZ,UAAU,SAAS,iBAAE,SAAS,CAAC,CAAC,SAAU,aAAc;AAE1D,SAAO;AAAA,IACL;AAAA,KACG;AAEP;","names":[]}
+{"version":3,"sources":["../../src/service/service.ts"],"sourcesContent":["/**\n * Generated by orval v6.7.1 🍺\n * Do not edit manually.\n * Account Server API\n * The Informatics Matters Account Server API.\n\nA service that provides access to the Account Server, which gives *registered* users access to and management of **Products**, **Organisations**, **Units** and **Users**.\n\n * OpenAPI spec version: 0.1\n */\nimport {\n  useQuery,\n  UseQueryOptions,\n  QueryFunction,\n  UseQueryResult,\n  QueryKey,\n} from \"react-query\";\nimport type {\n  ServicesGetResponse,\n  AsError,\n  ServiceGetResponse,\n} from \"../account-server-api.schemas\";\nimport { customInstance, ErrorType } from \".././custom-instance\";\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (\n  ...args: any\n) => Promise<infer R>\n  ? R\n  : any;\n\n// eslint-disable-next-line @typescript-eslint/no-explicit-any\ntype SecondParameter<T extends (...args: any) => any> = T extends (\n  config: any,\n  args: infer P\n) => any\n  ? P\n  : never;\n\n/**\n * Gets services known to the Account Server\n\n * @summary Gets all Services\n */\nexport const getServices = (\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServicesGetResponse>(\n    { url: `/service`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServicesQueryKey = () => [`/service`];\n\nexport type GetServicesQueryResult = NonNullable<\n  AsyncReturnType<typeof getServices>\n>;\nexport type GetServicesQueryError = ErrorType<AsError | void>;\n\nexport const useGetServices = <\n  TData = AsyncReturnType<typeof getServices>,\n  TError = ErrorType<AsError | void>\n>(options?: {\n  query?: UseQueryOptions<AsyncReturnType<typeof getServices>, TError, TData>;\n  request?: SecondParameter<typeof customInstance>;\n}): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServicesQueryKey();\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getServices>> = () =>\n    getServices(requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getServices>, TError, TData>(\n    queryKey,\n    queryFn,\n    queryOptions\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n\n/**\n * Gets a known service\n\n * @summary Gets a specific Service\n */\nexport const getService = (\n  svcId: number,\n  options?: SecondParameter<typeof customInstance>\n) => {\n  return customInstance<ServiceGetResponse>(\n    { url: `/service/${svcId}`, method: \"get\" },\n    options\n  );\n};\n\nexport const getGetServiceQueryKey = (svcId: number) => [`/service/${svcId}`];\n\nexport type GetServiceQueryResult = NonNullable<\n  AsyncReturnType<typeof getService>\n>;\nexport type GetServiceQueryError = ErrorType<AsError | void>;\n\nexport const useGetService = <\n  TData = AsyncReturnType<typeof getService>,\n  TError = ErrorType<AsError | void>\n>(\n  svcId: number,\n  options?: {\n    query?: UseQueryOptions<AsyncReturnType<typeof getService>, TError, TData>;\n    request?: SecondParameter<typeof customInstance>;\n  }\n): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {\n  const { query: queryOptions, request: requestOptions } = options || {};\n\n  const queryKey = queryOptions?.queryKey ?? getGetServiceQueryKey(svcId);\n\n  const queryFn: QueryFunction<AsyncReturnType<typeof getService>> = () =>\n    getService(svcId, requestOptions);\n\n  const query = useQuery<AsyncReturnType<typeof getService>, TError, TData>(\n    queryKey,\n    queryFn,\n    { enabled: !!svcId, ...queryOptions }\n  );\n\n  return {\n    queryKey,\n    ...query,\n  };\n};\n"],"mappings":";;;;;;AAUA;AAAA;AAAA;AAkCO,IAAM,cAAc,CACzB,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,QAAQ,MAAM,GACjC,OACF;AACF;AAEO,IAAM,yBAAyB,MAAM,CAAC,UAAU;AAOhD,IAAM,iBAAiB,CAG5B,YAG4D;AAC5D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW,CAAC;AAErE,QAAM,WAAW,8CAAc,aAAY,uBAAuB;AAElE,QAAM,UAA8D,MAClE,YAAY,cAAc;AAE5B,QAAM,QAAQ,SACZ,UACA,SACA,YACF;AAEA,SAAO;AAAA,IACL;AAAA,KACG;AAEP;AAOO,IAAM,aAAa,CACxB,OACA,YACG;AACH,SAAO,eACL,EAAE,KAAK,YAAY,SAAS,QAAQ,MAAM,GAC1C,OACF;AACF;AAEO,IAAM,wBAAwB,CAAC,UAAkB,CAAC,YAAY,OAAO;AAOrE,IAAM,gBAAgB,CAI3B,OACA,YAI2D;AAC3D,QAAM,EAAE,OAAO,cAAc,SAAS,mBAAmB,WAAW,CAAC;AAErE,QAAM,WAAW,8CAAc,aAAY,sBAAsB,KAAK;AAEtE,QAAM,UAA6D,MACjE,WAAW,OAAO,cAAc;AAElC,QAAM,QAAQ,SACZ,UACA,SACA,iBAAE,SAAS,CAAC,CAAC,SAAU,aACzB;AAEA,SAAO;AAAA,IACL;AAAA,KACG;AAEP;","names":[]}

package/src/organisation/organisation.ts

@@ -8,7 +8,6 @@ A service that provides access to the Account Server, which gives *registered* u
 
  * OpenAPI spec version: 0.1
  */
-import axios, { AxiosRequestConfig, AxiosResponse, AxiosError } from "axios";
 import {
   useQuery,
   useMutation,
@@ -26,6 +25,7 @@ import type {
   OrganisationPostBodyBody,
   OrganisationGetDefaultResponse,
 } from "../account-server-api.schemas";
+import { customInstance, ErrorType } from ".././custom-instance";
 
 // eslint-disable-next-line @typescript-eslint/no-explicit-any
 type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
@@ -34,45 +34,55 @@ type AsyncReturnType<T extends (...args: any) => Promise<any>> = T extends (
   ? R
   : any;
 
+// eslint-disable-next-line @typescript-eslint/no-explicit-any
+type SecondParameter<T extends (...args: any) => any> = T extends (
+  config: any,
+  args: infer P
+) => any
+  ? P
+  : never;
+
 /**
  * Gets all the Organisations that you are a member of or are public. Admin users are members of all organisation and can see all Organisations
 
  * @summary Gets Organisations
  */
-export const appApiOrganisationGet = (
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<OrganisationsGetResponse>> => {
-  return axios.get(`/organisation`, options);
+export const getOrganisations = (
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<OrganisationsGetResponse>(
+    { url: `/organisation`, method: "get" },
+    options
+  );
 };
 
-export const getAppApiOrganisationGetQueryKey = () => [`/organisation`];
+export const getGetOrganisationsQueryKey = () => [`/organisation`];
 
-export type AppApiOrganisationGetQueryResult = NonNullable<
-  AsyncReturnType<typeof appApiOrganisationGet>
+export type GetOrganisationsQueryResult = NonNullable<
+  AsyncReturnType<typeof getOrganisations>
 >;
-export type AppApiOrganisationGetQueryError = AxiosError<void | AsError>;
+export type GetOrganisationsQueryError = ErrorType<void | AsError>;
 
-export const useAppApiOrganisationGet = <
-  TData = AsyncReturnType<typeof appApiOrganisationGet>,
-  TError = AxiosError<void | AsError>
+export const useGetOrganisations = <
+  TData = AsyncReturnType<typeof getOrganisations>,
+  TError = ErrorType<void | AsError>
 >(options?: {
   query?: UseQueryOptions<
-    AsyncReturnType<typeof appApiOrganisationGet>,
+    AsyncReturnType<typeof getOrganisations>,
     TError,
     TData
   >;
-  axios?: AxiosRequestConfig;
+  request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options || {};
 
-  const queryKey = queryOptions?.queryKey ?? getAppApiOrganisationGetQueryKey();
+  const queryKey = queryOptions?.queryKey ?? getGetOrganisationsQueryKey();
 
-  const queryFn: QueryFunction<
-    AsyncReturnType<typeof appApiOrganisationGet>
-  > = () => appApiOrganisationGet(axiosOptions);
+  const queryFn: QueryFunction<AsyncReturnType<typeof getOrganisations>> = () =>
+    getOrganisations(requestOptions);
 
   const query = useQuery<
-    AsyncReturnType<typeof appApiOrganisationGet>,
+    AsyncReturnType<typeof getOrganisations>,
     TError,
     TData
   >(queryKey, queryFn, queryOptions);
@@ -90,44 +100,52 @@ You need **admin** rights to use this method
 
  * @summary Create a new organisation
  */
-export const appApiOrganisationPost = (
+export const createOrganisation = (
   organisationPostBodyBody: OrganisationPostBodyBody,
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<OrganisationPostResponse>> => {
-  return axios.post(`/organisation`, organisationPostBodyBody, options);
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<OrganisationPostResponse>(
+    {
+      url: `/organisation`,
+      method: "post",
+      headers: { "Content-Type": "application/json" },
+      data: organisationPostBodyBody,
+    },
+    options
+  );
 };
 
-export type AppApiOrganisationPostMutationResult = NonNullable<
-  AsyncReturnType<typeof appApiOrganisationPost>
+export type CreateOrganisationMutationResult = NonNullable<
+  AsyncReturnType<typeof createOrganisation>
 >;
-export type AppApiOrganisationPostMutationBody = OrganisationPostBodyBody;
-export type AppApiOrganisationPostMutationError = AxiosError<AsError | void>;
+export type CreateOrganisationMutationBody = OrganisationPostBodyBody;
+export type CreateOrganisationMutationError = ErrorType<AsError | void>;
 
-export const useAppApiOrganisationPost = <
-  TError = AxiosError<AsError | void>,
+export const useCreateOrganisation = <
+  TError = ErrorType<AsError | void>,
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof appApiOrganisationPost>,
+    AsyncReturnType<typeof createOrganisation>,
     TError,
     { data: OrganisationPostBodyBody },
     TContext
   >;
-  axios?: AxiosRequestConfig;
+  request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, axios: axiosOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options || {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof appApiOrganisationPost>,
+    AsyncReturnType<typeof createOrganisation>,
     { data: OrganisationPostBodyBody }
   > = (props) => {
     const { data } = props || {};
 
-    return appApiOrganisationPost(data, axiosOptions);
+    return createOrganisation(data, requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof appApiOrganisationPost>,
+    AsyncReturnType<typeof createOrganisation>,
     TError,
     { data: OrganisationPostBodyBody },
     TContext
@@ -140,44 +158,47 @@ You need **admin** rights to use this method
 
  * @summary Deletes an Organisation
  */
-export const appApiOrganisationDelete = (
+export const deleteOrganisation = (
   orgId: string,
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<void>> => {
-  return axios.delete(`/organisation/${orgId}`, options);
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<void>(
+    { url: `/organisation/${orgId}`, method: "delete" },
+    options
+  );
 };
 
-export type AppApiOrganisationDeleteMutationResult = NonNullable<
-  AsyncReturnType<typeof appApiOrganisationDelete>
+export type DeleteOrganisationMutationResult = NonNullable<
+  AsyncReturnType<typeof deleteOrganisation>
 >;
 
-export type AppApiOrganisationDeleteMutationError = AxiosError<AsError>;
+export type DeleteOrganisationMutationError = ErrorType<AsError>;
 
-export const useAppApiOrganisationDelete = <
-  TError = AxiosError<AsError>,
+export const useDeleteOrganisation = <
+  TError = ErrorType<AsError>,
   TContext = unknown
 >(options?: {
   mutation?: UseMutationOptions<
-    AsyncReturnType<typeof appApiOrganisationDelete>,
+    AsyncReturnType<typeof deleteOrganisation>,
     TError,
     { orgId: string },
     TContext
   >;
-  axios?: AxiosRequestConfig;
+  request?: SecondParameter<typeof customInstance>;
 }) => {
-  const { mutation: mutationOptions, axios: axiosOptions } = options || {};
+  const { mutation: mutationOptions, request: requestOptions } = options || {};
 
   const mutationFn: MutationFunction<
-    AsyncReturnType<typeof appApiOrganisationDelete>,
+    AsyncReturnType<typeof deleteOrganisation>,
     { orgId: string }
   > = (props) => {
     const { orgId } = props || {};
 
-    return appApiOrganisationDelete(orgId, axiosOptions);
+    return deleteOrganisation(orgId, requestOptions);
   };
 
   return useMutation<
-    AsyncReturnType<typeof appApiOrganisationDelete>,
+    AsyncReturnType<typeof deleteOrganisation>,
     TError,
     { orgId: string },
     TContext
@@ -188,43 +209,46 @@ export const useAppApiOrganisationDelete = <
 
  * @summary Gets the (built-in) Default Organisation
  */
-export const appApiOrganisationGetDefault = (
-  options?: AxiosRequestConfig
-): Promise<AxiosResponse<OrganisationGetDefaultResponse>> => {
-  return axios.get(`/organisation/default`, options);
+export const getDefaultOrganisation = (
+  options?: SecondParameter<typeof customInstance>
+) => {
+  return customInstance<OrganisationGetDefaultResponse>(
+    { url: `/organisation/default`, method: "get" },
+    options
+  );
 };
 
-export const getAppApiOrganisationGetDefaultQueryKey = () => [
+export const getGetDefaultOrganisationQueryKey = () => [
   `/organisation/default`,
 ];
 
-export type AppApiOrganisationGetDefaultQueryResult = NonNullable<
-  AsyncReturnType<typeof appApiOrganisationGetDefault>
+export type GetDefaultOrganisationQueryResult = NonNullable<
+  AsyncReturnType<typeof getDefaultOrganisation>
 >;
-export type AppApiOrganisationGetDefaultQueryError = AxiosError<void | AsError>;
+export type GetDefaultOrganisationQueryError = ErrorType<void | AsError>;
 
-export const useAppApiOrganisationGetDefault = <
-  TData = AsyncReturnType<typeof appApiOrganisationGetDefault>,
-  TError = AxiosError<void | AsError>
+export const useGetDefaultOrganisation = <
+  TData = AsyncReturnType<typeof getDefaultOrganisation>,
+  TError = ErrorType<void | AsError>
 >(options?: {
   query?: UseQueryOptions<
-    AsyncReturnType<typeof appApiOrganisationGetDefault>,
+    AsyncReturnType<typeof getDefaultOrganisation>,
     TError,
     TData
   >;
-  axios?: AxiosRequestConfig;
+  request?: SecondParameter<typeof customInstance>;
 }): UseQueryResult<TData, TError> & { queryKey: QueryKey } => {
-  const { query: queryOptions, axios: axiosOptions } = options || {};
+  const { query: queryOptions, request: requestOptions } = options || {};
 
   const queryKey =
-    queryOptions?.queryKey ?? getAppApiOrganisationGetDefaultQueryKey();
+    queryOptions?.queryKey ?? getGetDefaultOrganisationQueryKey();
 
   const queryFn: QueryFunction<
-    AsyncReturnType<typeof appApiOrganisationGetDefault>
-  > = () => appApiOrganisationGetDefault(axiosOptions);
+    AsyncReturnType<typeof getDefaultOrganisation>
+  > = () => getDefaultOrganisation(requestOptions);
 
   const query = useQuery<
-    AsyncReturnType<typeof appApiOrganisationGetDefault>,
+    AsyncReturnType<typeof getDefaultOrganisation>,
     TError,
     TData
   >(queryKey, queryFn, queryOptions);