fix: missing type & incorrect usage

Intevel · Apr 26, 2023 · bf04ac3 · bf04ac3
2 parents c38dba6 + e40e72e
commit bf04ac3
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 14 deletions.
diff --git a/src/runtime/composables/useDirectus.ts b/src/runtime/composables/useDirectus.ts
@@ -1,4 +1,4 @@
-import type { FetchOptions } from "ohmyfetch";
+import type { NitroFetchOptions } from 'nitropack';
 import { useRuntimeConfig, createError } from "#app";
 import { useDirectusUrl } from "./useDirectusUrl";
 import { useDirectusToken } from "./useDirectusToken";
@@ -10,7 +10,7 @@ export const useDirectus = () => {
 
   return async <T>(
     url: string,
-    fetchOptions: FetchOptions = {},
+    fetchOptions: NitroFetchOptions<string> = {},
     useStaticToken = true
   ): Promise<T> => {
     const headers: HeadersInit = {};

diff --git a/src/runtime/composables/useDirectusAuth.ts b/src/runtime/composables/useDirectusAuth.ts
@@ -59,7 +59,7 @@ export const useDirectusAuth = () => {
           }, useStaticToken)
           setUser(res.data)
         } else {
-          const res = await directus<{ data: DirectusUser }>('/users/me', useStaticToken)
+          const res = await directus<{ data: DirectusUser }>('/users/me', {}, useStaticToken)
           setUser(res.data)
         }
       } catch (e) {
@@ -90,9 +90,10 @@ export const useDirectusAuth = () => {
     const user = await fetchUser()
 
     return {
-      user,
+      user: user.value,
       access_token: response.data.access_token,
-      expires: response.data.expires
+      expires: response.data.expires,
+      refresh_token: response.data.refresh_token
     }
   }
 

diff --git a/src/runtime/composables/useDirectusFiles.ts b/src/runtime/composables/useDirectusFiles.ts
@@ -12,7 +12,7 @@ export const useDirectusFiles = () => {
   const config = useRuntimeConfig()
   const directusUrl = useDirectusUrl()
   const directus = useDirectus()
-  const token = useDirectusToken()
+  const { token } = useDirectusToken()
 
   const getFiles = async <T>(data: DirectusFileRequest): Promise<T[]> => {
     if (data.params?.filter) {

diff --git a/src/runtime/composables/useDirectusItems.ts b/src/runtime/composables/useDirectusItems.ts
@@ -2,27 +2,29 @@ import {
   DirectusItemRequest,
   DirectusItemCreation,
   DirectusItemDeletion,
-  DirectusItemUpdate
+  DirectusItemUpdate,
+  DirectusItems,
+  DirectusItem
 } from '../types'
 import { useDirectus } from './useDirectus'
 
 export const useDirectusItems = () => {
   const directus = useDirectus()
 
-  const getItems = async <T>(data: DirectusItemRequest): Promise<T> => {
+  const getItems = async <T>(data: DirectusItemRequest): Promise<DirectusItems<T> | T[]> => {
     if (data.params?.filter) {
       (data.params.filter as unknown) = JSON.stringify(data.params.filter)
     }
     if (data.params?.deep) {
       (data.params.deep as unknown) = JSON.stringify(data.params.deep)
     }
-    const items = await directus(`/items/${data.collection}`, {
+    const items = await directus<DirectusItems<T>>(`/items/${data.collection}`, {
       method: 'GET',
       params: data.params
     })
 
     if (items.meta) {
-      return { meta: items.meta, data: items.data }
+      return items;
     } else {
       return items.data
     }
@@ -49,7 +51,7 @@ export const useDirectusItems = () => {
     if (data.params?.deep) {
       (data.params.deep as unknown) = JSON.stringify(data.params.deep)
     }
-    const items = await directus<{ data: T[] }>(
+    const items = await directus<DirectusItem<T>>(
       `/items/${data.collection}/${data.id}`,
       {
         method: 'GET',

diff --git a/src/runtime/composables/useDirectusUsers.ts b/src/runtime/composables/useDirectusUsers.ts
@@ -2,21 +2,23 @@ import {
   DirectusUserRequest,
   DirectusUserCreation,
   DirectusUserUpdate,
-  DirectusUserDeletion
+  DirectusUserDeletion,
+  DirectusItems,
+  DirectusUser
 } from '../types'
 import { useDirectus } from './useDirectus'
 
 export const useDirectusUsers = () => {
   const directus = useDirectus()
 
-  const getUsers = async <T>(data?: DirectusUserRequest): Promise<T> => {
+  const getUsers = async <T extends DirectusUser>(data?: DirectusUserRequest): Promise<DirectusItems<T> | T[]> => {
     if (data?.params?.filter) {
       (data.params.filter as unknown) = JSON.stringify(data.params.filter)
     }
     if (data?.params?.deep) {
       (data.params.deep as unknown) = JSON.stringify(data.params.deep)
     }
-    const users = await directus('/users', {
+    const users = await directus<DirectusItems<T>>('/users', {
       method: 'GET',
       params: data?.params
     })

diff --git a/src/runtime/types/index.d.ts b/src/runtime/types/index.d.ts
@@ -214,3 +214,17 @@ export interface DirectusRevision {
   delta?: Object;
   parent?: any;
 }
+
+export interface DirectusItemMetadata {
+  total_count?: number;
+  filter_count?: number;
+};
+
+export interface DirectusItems<T> {
+  data: NonNullable<T[]>;
+  meta?: DirectusItemMetadata;
+};
+
+export interface DirectusItem<T> {
+  data: NonNullable<T>;
+};