add zod schemas

src/services/orgUploadToken/useRegenerateOrgUploadToken.test.tsx

@@ -8,10 +8,8 @@ import { MemoryRouter, Route } from 'react-router-dom'
 import { useRegenerateOrgUploadToken } from './useRegenerateOrgUploadToken'
 
 const data = {
-  data: {
-    regenerateOrgUploadToken: {
-      orgUploadToken: 'new token',
-    },
+  regenerateOrgUploadToken: {
+    orgUploadToken: 'new token',
   },
 }
 

src/services/orgUploadToken/useRegenerateOrgUploadToken.ts

@@ -1,24 +1,41 @@
 import { useMutation, useQueryClient } from '@tanstack/react-query'
 import { useParams } from 'react-router-dom'
+import { z } from 'zod'
 
 import Api from 'shared/api'
+import { NetworkErrorObject } from 'shared/api/helpers'
+
+const RequestSchema = z.object({
+  regenerateOrgUploadToken: z
+    .object({
+      orgUploadToken: z.string().nullish(),
+      error: z
+        .union([
+          z.object({
+            __typename: z.literal('UnauthorizedError'),
+            message: z.string(),
+          }),
+          z.object({
+            __typename: z.literal('ValidationError'),
+            message: z.string(),
+          }),
+          z.object({
+            __typename: z.literal('UnauthenticatedError'),
+            message: z.string(),
+          }),
+        ])
+        .nullish(),
+    })
+    .nullable(),
+})
 
 interface URLParams {
   provider: string
   owner: string
 }
 
-interface RegenerateOrgUploadTokenOutput {
-  regenerateOrgUploadToken?: {
-    orgUploadToken?: string
-    error?: {
-      __typename?: string
-    }
-  }
-}
-
 export function useRegenerateOrgUploadToken(
-  { onSuccess = (data: RegenerateOrgUploadTokenOutput) => {} } = {
+  { onSuccess = (data: z.infer<typeof RequestSchema>) => {} } = {
     onSuccess: () => {},
   }
 ) {
@@ -46,7 +63,16 @@ export function useRegenerateOrgUploadToken(
         mutationPath: 'regenerateOrgUploadToken',
       })
 
-      return data
+      const parsedRes = RequestSchema.safeParse(data.data)
+      if (!parsedRes.success) {
+        return Promise.reject({
+          status: 404,
+          data: {},
+          dev: 'useRegenerateOrgUploadToken - 404 schema parsing failed',
+        } satisfies NetworkErrorObject)
+      }
+
+      return parsedRes
     },
     useErrorBoundary: true,
     onSuccess: ({ data }) => {

src/services/pathContents/branch/file/usePrefetchBranchFileEntry.ts

@@ -16,12 +16,10 @@ export function usePrefetchBranchFileEntry({
   branch,
   path,
   flags = [],
-  options = {},
 }: {
   branch: string
   path: string
   flags?: string[]
-  options?: Record<string, unknown>
 }) {
   const { provider, owner, repo } = useParams<URLParams>()
   const queryClient = useQueryClient()

src/services/user/useOwner.ts

@@ -1,19 +1,21 @@
 import { useQuery } from '@tanstack/react-query'
 import { useParams } from 'react-router-dom'
+import { z } from 'zod'
 
 import Api from 'shared/api'
+import { NetworkErrorObject } from 'shared/api/helpers'
 
 interface URLParams {
   provider: string
 }
 
-export interface DetailOwnerSchema {
-  ownerid?: string
-  username?: string
-  avatarUrl?: string
-  isCurrentUserPartOfOrg?: boolean
-  isAdmin?: boolean
-}
+export const DetailOwnerSchema = z.object({
+  ownerid: z.string().nullish(),
+  username: z.string().nullish(),
+  avatarUrl: z.string().nullish(),
+  isCurrentUserPartOfOrg: z.boolean().nullish(),
+  isAdmin: z.boolean().nullish(),
+})
 
 export function useOwner({
   username,
@@ -45,6 +47,15 @@ export function useOwner({
     queryKey: ['owner', variables, provider, query],
     queryFn: ({ signal }) =>
       Api.graphql({ provider, query, variables, signal }).then((res) => {
+        const parsedData = DetailOwnerSchema.safeParse(res)
+        if (!parsedData.success) {
+          return Promise.reject({
+            status: 404,
+            data: {},
+            dev: 'useOwner - 404 failed to parse',
+          } satisfies NetworkErrorObject)
+        }
+
         return res?.data?.owner
       }),
     ...opts,