@squonk/account-server-client 4.7.0-trunk.2383504127 → 4.7.2

package/src/api/user/user.fetch.ts

@@ -1,11 +1,11 @@
 /**
- * Generated by orval v7.17.0 🍺
+ * Generated by orval v8.22.0 🍺
  * Do not edit manually.
  * Account Server API
  * The Informatics Matters Account Server API.
-
-A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
-
+ *
+ * A service that provides access to the Account Server, which gives *registered* users access to and management of **Organisations**, **Units**, **Products**, **Users**, and **Assets**.
+ *
  * OpenAPI spec version: 4.7
  */
 import { useMutation, useQuery, useSuspenseQuery } from "@tanstack/react-query";
@@ -27,18 +27,28 @@ import type {
   UseSuspenseQueryResult,
 } from "@tanstack/react-query";
 
-import type { AsError, UserAccountDetail, UsersGetResponse } from ".././api-schemas";
+import type { AsError, UserAccountDetail, UsersGetResponse } from "../api-schemas";
 
 import { customFetch } from "../../custom-fetch";
 import type { ErrorType } from "../../custom-fetch";
 
 type SecondParameter<T extends (...args: never) => unknown> = Parameters<T>[1];
 
-/**
- * Returns a summary of your account
+const withQueryKey = <T extends object, K>(query: T, queryKey: K): T & { queryKey: K } => {
+  const result = { queryKey } as T & { queryKey: K };
+  for (const key of Object.keys(query)) {
+    // The explicit queryKey always wins, matching the previous
+    // `{ ...query, queryKey }` spread where it was set last.
+    if (key === "queryKey") continue;
+    Object.defineProperty(result, key, {
+      enumerable: true,
+      configurable: true,
+      get: () => (query as Record<string, unknown>)[key],
+    });
+  }
+  return result;
+};
 
- * @summary Get information about your account
- */
 export type getUserAccountResponse200 = { data: UserAccountDetail; status: 200 };
 
 export type getUserAccountResponse401 = { data: void; status: 401 };
@@ -57,6 +67,10 @@ export const getGetUserAccountUrl = () => {
   return `/user/account`;
 };
 
+/**
+ * Returns a summary of your account
+ * @summary Get information about your account
+ */
 export const getUserAccount = async (options?: RequestInit): Promise<getUserAccountResponse> => {
   return customFetch<getUserAccountResponse>(getGetUserAccountUrl(), { ...options, method: "GET" });
 };
@@ -83,7 +97,7 @@ export const getGetUserAccountQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserAccountQueryResult = NonNullable<Awaited<ReturnType<typeof getUserAccount>>>;
@@ -106,7 +120,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccount<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
@@ -124,7 +138,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccount<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
@@ -134,7 +148,7 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about your account
  */
@@ -148,16 +162,14 @@ export function useGetUserAccount<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserAccountQueryOptions(options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -192,7 +204,7 @@ export const getGetUserAccountSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getUserAccount>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetUserAccountSuspenseQueryResult = NonNullable<
@@ -211,7 +223,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccountSuspense<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
@@ -223,7 +235,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetUserAccountSuspense<
   TData = Awaited<ReturnType<typeof getUserAccount>>,
   TError = ErrorType<void | AsError>,
@@ -235,7 +247,7 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Get information about your account
  */
@@ -251,28 +263,17 @@ export function useGetUserAccountSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetUserAccountSuspenseQueryOptions(options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Gets Users in an Organisation.
-
-You have to be a member of the Organisation or an admin user to use this endpoint
-
-**WARNING**: This endpoint is **DEPRECATED** and will be removed in a future release. Please use the `GET /organisation/{org_id}` endpoint instead.
-
- * @summary Gets users in an Organisation
- */
 export type getOrganisationUsersResponse200 = { data: UsersGetResponse; status: 200 };
 
 export type getOrganisationUsersResponse400 = { data: AsError; status: 400 };
@@ -298,6 +299,14 @@ export const getGetOrganisationUsersUrl = (orgId: string) => {
   return `/organisation/${orgId}/user`;
 };
 
+/**
+ * Gets Users in an Organisation.
+ *
+ * You have to be a member of the Organisation or an admin user to use this endpoint
+ *
+ * **WARNING**: This endpoint is **DEPRECATED** and will be removed in a future release. Please use the `GET /organisation/{org_id}` endpoint instead.
+ * @summary Gets users in an Organisation
+ */
 export const getOrganisationUsers = async (
   orgId: string,
   options?: RequestInit,
@@ -308,7 +317,7 @@ export const getOrganisationUsers = async (
   });
 };
 
-export const getGetOrganisationUsersQueryKey = (orgId?: string) => {
+export const getGetOrganisationUsersQueryKey = (orgId: string) => {
   return ["account-server", "organisation", orgId, "user"] as const;
 };
 
@@ -331,11 +340,14 @@ export const getGetOrganisationUsersQueryOptions = <
   const queryFn: QueryFunction<Awaited<ReturnType<typeof getOrganisationUsers>>> = ({ signal }) =>
     getOrganisationUsers(orgId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!orgId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisationUsers>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: orgId !== null && orgId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUsers>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetOrganisationUsersQueryResult = NonNullable<
@@ -363,7 +375,7 @@ export function useGetOrganisationUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUsers<
   TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
   TError = ErrorType<AsError | void>,
@@ -384,7 +396,7 @@ export function useGetOrganisationUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUsers<
   TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
   TError = ErrorType<AsError | void>,
@@ -397,7 +409,7 @@ export function useGetOrganisationUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets users in an Organisation
  */
@@ -414,16 +426,14 @@ export function useGetOrganisationUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUsersQueryOptions(orgId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -465,7 +475,7 @@ export const getGetOrganisationUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationUsersSuspenseQueryResult = NonNullable<
@@ -485,7 +495,7 @@ export function useGetOrganisationUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUsersSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
   TError = ErrorType<AsError | void>,
@@ -498,7 +508,7 @@ export function useGetOrganisationUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUsersSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUsers>>,
   TError = ErrorType<AsError | void>,
@@ -511,7 +521,7 @@ export function useGetOrganisationUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets users in an Organisation
  */
@@ -528,26 +538,17 @@ export function useGetOrganisationUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUsersSuspenseQueryOptions(orgId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
-
-  query.queryKey = queryOptions.queryKey;
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Adds a User to an **Organisation**.
-
-You have to be in the Organisation or an admin user to use this endpoint
-
- * @summary Adds a User to an Organisation
- */
 export type addOrganisationUserResponse201 = { data: void; status: 201 };
 
 export type addOrganisationUserResponse400 = { data: AsError; status: 400 };
@@ -573,6 +574,12 @@ export const getAddOrganisationUserUrl = (orgId: string, userId: string) => {
   return `/organisation/${orgId}/user/${userId}`;
 };
 
+/**
+ * Adds a User to an **Organisation**.
+ *
+ * You have to be in the Organisation or an admin user to use this endpoint
+ * @summary Adds a User to an Organisation
+ */
 export const addOrganisationUser = async (
   orgId: string,
   userId: string,
@@ -646,17 +653,8 @@ export const useAddOrganisationUser = <TError = ErrorType<AsError | void>, TCont
   { orgId: string; userId: string },
   TContext
 > => {
-  const mutationOptions = getAddOrganisationUserMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getAddOrganisationUserMutationOptions(options), queryClient);
 };
-/**
- * Removes a User from an **Organisation**.
-
-You have to be in the Organisation or an admin user to use this endpoint
-
- * @summary Deletes a User from an Organisation
- */
 export type deleteOrganisationUserResponse204 = { data: void; status: 204 };
 
 export type deleteOrganisationUserResponse400 = { data: AsError; status: 400 };
@@ -682,6 +680,12 @@ export const getDeleteOrganisationUserUrl = (orgId: string, userId: string) => {
   return `/organisation/${orgId}/user/${userId}`;
 };
 
+/**
+ * Removes a User from an **Organisation**.
+ *
+ * You have to be in the Organisation or an admin user to use this endpoint
+ * @summary Deletes a User from an Organisation
+ */
 export const deleteOrganisationUser = async (
   orgId: string,
   userId: string,
@@ -755,19 +759,8 @@ export const useDeleteOrganisationUser = <TError = ErrorType<AsError | void>, TC
   { orgId: string; userId: string },
   TContext
 > => {
-  const mutationOptions = getDeleteOrganisationUserMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteOrganisationUserMutationOptions(options), queryClient);
 };
-/**
- * Gets users in an Organisational Unit.
-
-You have to be in the Organisation or Unit or an Admin user to use this endpoint
-
-**WARNING**: This endpoint is **DEPRECATED** and will be removed in a future release. Please use the `GET /unit/{unit_id}` endpoint instead.
-
- * @summary Gets users in an Organisational Unit
- */
 export type getOrganisationUnitUsersResponse200 = { data: UsersGetResponse; status: 200 };
 
 export type getOrganisationUnitUsersResponse400 = { data: AsError; status: 400 };
@@ -793,6 +786,14 @@ export const getGetOrganisationUnitUsersUrl = (unitId: string) => {
   return `/unit/${unitId}/user`;
 };
 
+/**
+ * Gets users in an Organisational Unit.
+ *
+ * You have to be in the Organisation or Unit or an Admin user to use this endpoint
+ *
+ * **WARNING**: This endpoint is **DEPRECATED** and will be removed in a future release. Please use the `GET /unit/{unit_id}` endpoint instead.
+ * @summary Gets users in an Organisational Unit
+ */
 export const getOrganisationUnitUsers = async (
   unitId: string,
   options?: RequestInit,
@@ -803,7 +804,7 @@ export const getOrganisationUnitUsers = async (
   });
 };
 
-export const getGetOrganisationUnitUsersQueryKey = (unitId?: string) => {
+export const getGetOrganisationUnitUsersQueryKey = (unitId: string) => {
   return ["account-server", "unit", unitId, "user"] as const;
 };
 
@@ -827,11 +828,14 @@ export const getGetOrganisationUnitUsersQueryOptions = <
     signal,
   }) => getOrganisationUnitUsers(unitId, { signal, ...requestOptions });
 
-  return { queryKey, queryFn, enabled: !!unitId, ...queryOptions } as UseQueryOptions<
-    Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
-    TError,
-    TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  return {
+    queryKey,
+    queryFn,
+    enabled: unitId !== null && unitId !== undefined,
+    ...queryOptions,
+  } as UseQueryOptions<Awaited<ReturnType<typeof getOrganisationUnitUsers>>, TError, TData> & {
+    queryKey: DataTag<QueryKey, TData, TError>;
+  };
 };
 
 export type GetOrganisationUnitUsersQueryResult = NonNullable<
@@ -859,7 +863,7 @@ export function useGetOrganisationUnitUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): DefinedUseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitUsers<
   TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
   TError = ErrorType<AsError | void>,
@@ -880,7 +884,7 @@ export function useGetOrganisationUnitUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitUsers<
   TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
   TError = ErrorType<AsError | void>,
@@ -893,7 +897,7 @@ export function useGetOrganisationUnitUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets users in an Organisational Unit
  */
@@ -910,16 +914,14 @@ export function useGetOrganisationUnitUsers<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUnitUsersQueryOptions(unitId, options);
 
   const query = useQuery(queryOptions, queryClient) as UseQueryResult<TData, TError> & {
-    queryKey: DataTag<QueryKey, TData>;
+    queryKey: DataTag<QueryKey, TData, TError>;
   };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
 /**
@@ -962,7 +964,7 @@ export const getGetOrganisationUnitUsersSuspenseQueryOptions = <
     Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
     TError,
     TData
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 };
 
 export type GetOrganisationUnitUsersSuspenseQueryResult = NonNullable<
@@ -982,7 +984,7 @@ export function useGetOrganisationUnitUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitUsersSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
   TError = ErrorType<AsError | void>,
@@ -995,7 +997,7 @@ export function useGetOrganisationUnitUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 export function useGetOrganisationUnitUsersSuspense<
   TData = Awaited<ReturnType<typeof getOrganisationUnitUsers>>,
   TError = ErrorType<AsError | void>,
@@ -1008,7 +1010,7 @@ export function useGetOrganisationUnitUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> };
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> };
 /**
  * @summary Gets users in an Organisational Unit
  */
@@ -1025,28 +1027,17 @@ export function useGetOrganisationUnitUsersSuspense<
     request?: SecondParameter<typeof customFetch>;
   },
   queryClient?: QueryClient,
-): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData> } {
+): UseSuspenseQueryResult<TData, TError> & { queryKey: DataTag<QueryKey, TData, TError> } {
   const queryOptions = getGetOrganisationUnitUsersSuspenseQueryOptions(unitId, options);
 
   const query = useSuspenseQuery(queryOptions, queryClient) as UseSuspenseQueryResult<
     TData,
     TError
-  > & { queryKey: DataTag<QueryKey, TData> };
+  > & { queryKey: DataTag<QueryKey, TData, TError> };
 
-  query.queryKey = queryOptions.queryKey;
-
-  return query;
+  return withQueryKey(query, queryOptions.queryKey);
 }
 
-/**
- * Adds a user to an Organisational Unit.
-
-Users cannot be added to **Personal Units** (Units that are part of the ***Default** Organisation).
-
-You have to be in the Organisation or Unit or an Admin user to use this endpoint
-
- * @summary Adds a user to an Organisational Unit
- */
 export type addOrganisationUnitUserResponse201 = { data: void; status: 201 };
 
 export type addOrganisationUnitUserResponse400 = { data: AsError; status: 400 };
@@ -1072,6 +1063,14 @@ export const getAddOrganisationUnitUserUrl = (unitId: string, userId: string) =>
   return `/unit/${unitId}/user/${userId}`;
 };
 
+/**
+ * Adds a user to an Organisational Unit.
+ *
+ * Users cannot be added to **Personal Units** (Units that are part of the ***Default** Organisation).
+ *
+ * You have to be in the Organisation or Unit or an Admin user to use this endpoint
+ * @summary Adds a user to an Organisational Unit
+ */
 export const addOrganisationUnitUser = async (
   unitId: string,
   userId: string,
@@ -1145,19 +1144,8 @@ export const useAddOrganisationUnitUser = <TError = ErrorType<AsError | void>, T
   { unitId: string; userId: string },
   TContext
 > => {
-  const mutationOptions = getAddOrganisationUnitUserMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getAddOrganisationUnitUserMutationOptions(options), queryClient);
 };
-/**
- * Removes a User from an Organisational Unit.
-
-Users cannot be removed from **Personal Units** (Units that are part of the ***Default** Organisation).
-
-You have to be in the Organisation or Unit or an Admin user to use this endpoint
-
- * @summary Deletes a User from an Organisational Unit
- */
 export type deleteOrganisationUnitUserResponse204 = { data: void; status: 204 };
 
 export type deleteOrganisationUnitUserResponse400 = { data: AsError; status: 400 };
@@ -1183,6 +1171,14 @@ export const getDeleteOrganisationUnitUserUrl = (unitId: string, userId: string)
   return `/unit/${unitId}/user/${userId}`;
 };
 
+/**
+ * Removes a User from an Organisational Unit.
+ *
+ * Users cannot be removed from **Personal Units** (Units that are part of the ***Default** Organisation).
+ *
+ * You have to be in the Organisation or Unit or an Admin user to use this endpoint
+ * @summary Deletes a User from an Organisational Unit
+ */
 export const deleteOrganisationUnitUser = async (
   unitId: string,
   userId: string,
@@ -1259,7 +1255,5 @@ export const useDeleteOrganisationUnitUser = <
   { unitId: string; userId: string },
   TContext
 > => {
-  const mutationOptions = getDeleteOrganisationUnitUserMutationOptions(options);
-
-  return useMutation(mutationOptions, queryClient);
+  return useMutation(getDeleteOrganisationUnitUserMutationOptions(options), queryClient);
 };