fix schema issues

Author: jjnp

services/src/auth/api-access-service.test.ts

@@ -1,24 +1,25 @@
+import type { ProjectId } from '../project/project'
+import { apiAccessSchema, type ApiAccess, type ApiAccessId, type ApiKey } from './api-access'
 import {
   createApiAccess,
   getApiAccessForProject,
   projectHasKey,
   setApiAccessName
 } from './api-access.repository'
 
-export const checkApiKeyAccess = async (apiKey: string, projectId: number): Promise<boolean> => {
-  return await projectHasKey(projectId, apiKey)
-}
+export const checkApiKeyAccess = async (apiKey: ApiKey, projectId: ProjectId): Promise<boolean> =>
+  projectHasKey(projectId, apiKey)
 
-export const addApiKey = async (projectId: number): Promise<string> => {
+export const addApiAccess = async (projectId: ProjectId): Promise<ApiAccess> => {
   const key = await createApiAccess(projectId)
-  return key.apikey
+  return apiAccessSchema.parse(key)
 }
 
-export const changeApiKeyName = async (apiAccessId: number, name: string) => {
+export const changeApiAccessName = async (apiAccessId: ApiAccessId, name: string) => {
   await setApiAccessName(apiAccessId, name)
 }
 
-export const listApiKeys = async (projectId: number): Promise<string[]> => {
-  const result = await getApiAccessForProject(projectId)
-  return result.map((it) => it.apikey)
+export const listApiAccessForProject = async (projectId: ProjectId): Promise<ApiAccess[]> => {
+  const queryResult = await getApiAccessForProject(projectId)
+  return apiAccessSchema.array().parse(queryResult)
 }

services/src/auth/api-access.service.ts

@@ -5,14 +5,14 @@ import { z } from 'zod'
 export type ApiKeyCreationParams = Insertable<Omit<Apiaccess, 'id' | 'created_at'>>
 export type SelectableApiKey = Selectable<Apiaccess>
 
-const apiKeyIdSchema = z.number().brand('api-access')
-export type ApiKeyId = z.infer<typeof apiKeyIdSchema>
+const apiAccessIdSchema = z.number().brand('api-access')
+export type ApiAccessId = z.infer<typeof apiAccessIdSchema>
 
 const apiKeyKeySchema = z.string().uuid().brand('api-key')
 export type ApiKey = z.infer<typeof apiKeyKeySchema>
 
-const apiAccessSchema = z.object({
-  id: apiKeyIdSchema,
+export const apiAccessSchema = z.object({
+  id: apiAccessIdSchema,
   apikey: apiKeyKeySchema,
   name: z.string(),
   project_id: z.number(),