OpenAPI Generierung verbessert

src/pages/api/aufnahme/[uid].ts

@@ -1,4 +1,4 @@
-import { AufnahmeClient, OptionalNullable, ZodOverlap } from "#components/Ausweis/types.js";
+import { AufnahmeClient, OptionalNullable, UUidWithPrefix, ZodOverlap } from "#components/Ausweis/types.js";
 import { exclude } from "#lib/exclude.js";
 import { authorizationMiddleware } from "#lib/middleware/authorization.js";
 import { AufnahmeSchema, prisma } from "@ibcornelsen/database/server";
@@ -62,7 +62,7 @@ export const GET = defineApiRoute({
 		objekt_id: true,
 		benutzer_id: true
 	}).merge(z.object({
-		uid_objekt: z.string().uuid()
+		uid_objekt: UUidWithPrefix
 	}))),
 	middleware: authorizationMiddleware,
 	async fetch(input, context, user) {

src/pages/api/aufnahme/index.ts

@@ -1,3 +1,4 @@
+import { UUidWithPrefix } from "#components/Ausweis/types.js"
 import { authorizationMiddleware } from "#lib/middleware/authorization.js"
 import { AufnahmeSchema, ObjektSchema, prisma } from "@ibcornelsen/database/server"
 import { APIError, defineApiRoute } from "astro-typesafe-api/server"
@@ -11,12 +12,12 @@ export const PUT = defineApiRoute({
 			benutzer_id: true,
 			objekt_id: true,
 		}).merge(z.object({
-			baujahr_klima: z.array(z.number().int().positive()).nullish()
+			baujahr_klima: z.array(z.number().int().positive()).optional()
 		})),
-		uid_objekt: z.string().uuid()
+		uid_objekt: UUidWithPrefix
 	}),
 	output: z.object({
-		uid: z.string().uuid()
+		uid: UUidWithPrefix
 	}),
 	middleware: authorizationMiddleware,
 	async fetch(input, context, user) {

src/pages/api/auth/access-token.ts

@@ -16,7 +16,6 @@ export const GET = defineApiRoute({
 	input: z.object({
 		refreshToken: z.string(),
 	}),
-
 	output: z.object({
 		accessToken: z.string(),
 		accessTokenExpiry: z.number(),

src/pages/api/auth/refresh-token.ts

@@ -5,6 +5,7 @@ import { encodeToken } from "../../../lib/auth/token.js";
 import { validatePassword } from "../../../lib/password.js";
 import { APIError, defineApiRoute } from "astro-typesafe-api/server";
 import { TokenType } from "#lib/auth/types.js";
+import { UUidWithPrefix } from "#components/Ausweis/types.js";
 
 export const GET = defineApiRoute({
 	meta: {
@@ -18,7 +19,7 @@ export const GET = defineApiRoute({
 		passwort: z.string().min(8).max(100),
 	}),
 	output: z.object({
-		uid: z.string().uuid(),
+		uid: UUidWithPrefix,
 		accessToken: z.string(),
 		refreshToken: z.string(),
 		refreshTokenBase64: z.string(),

src/pages/api/objekt/index.ts

@@ -1,3 +1,4 @@
+import { UUidWithPrefix } from "#components/Ausweis/types.js";
 import { authorizationMiddleware } from "#lib/middleware/authorization.js";
 import { ObjektSchema, prisma } from "@ibcornelsen/database/server";
 import { defineApiRoute } from "astro-typesafe-api/server";
@@ -10,7 +11,7 @@ export const PUT = defineApiRoute({
 		benutzer_id: true
 	}),
 	output: z.object({
-		uid: z.string().uuid()
+		uid: UUidWithPrefix
 	}),
 	middleware: authorizationMiddleware,
 	async fetch(input, context, user) {

src/pages/api/ticket.ts

@@ -2,6 +2,7 @@ import { z } from "zod";
 import { TicketsSchema, prisma } from "@ibcornelsen/database/server";
 import { defineApiRoute } from "astro-typesafe-api/server";
 import { maybeAuthorizationMiddleware } from "#lib/middleware/authorization.js";
+import { UUidWithPrefix } from "#components/Ausweis/types.js";
 
 export const PUT = defineApiRoute({
 	meta: {
@@ -23,7 +24,7 @@ export const PUT = defineApiRoute({
 		updated_at: true,
 	}),
 	output: z.object({
-		uid: z.string().uuid(),
+		uid: UUidWithPrefix,
 	}),
 	middleware: maybeAuthorizationMiddleware,
 	async fetch(input, ctx, user) {

src/pages/api/user/index.ts

@@ -1,3 +1,4 @@
+import { UUidWithPrefix } from "#components/Ausweis/types.js";
 import { hashPassword } from "#lib/password.js";
 import { prisma } from "@ibcornelsen/database/server";
 import { APIError, defineApiRoute } from "astro-typesafe-api/server";
@@ -11,7 +12,7 @@ export const PUT = defineApiRoute({
 		name: z.string()
 	}),
 	output: z.object({
-		uid: z.string().uuid()
+		uid: UUidWithPrefix
 	}),
 	async fetch(input) {
 		const user = await prisma.benutzer.findUnique({

src/pages/api/verbrauchsausweis-wohnen/[uid].ts

@@ -1,4 +1,4 @@
-import { OptionalNullable, VerbrauchsausweisWohnenClient, ZodOverlap } from "#components/Ausweis/types.js";
+import { OptionalNullable, UUidWithPrefix, VerbrauchsausweisWohnenClient, ZodOverlap } from "#components/Ausweis/types.js";
 import { exclude } from "#lib/exclude.js";
 import { authorizationMiddleware } from "#lib/middleware/authorization.js";
 import { prisma, VerbrauchsausweisWohnenSchema } from "@ibcornelsen/database/server";
@@ -61,9 +61,9 @@ export const GET = defineApiRoute({
 		}
 	},
 	output: ZodOverlap<OptionalNullable<VerbrauchsausweisWohnenClient>>(VerbrauchsausweisWohnenSchema.merge(z.object({
-		uid_aufnahme: z.string().uuid(),
-		uid_objekt: z.string().uuid(),
-		uid_benutzer: z.string().uuid().optional()
+		uid_aufnahme: UUidWithPrefix,
+		uid_objekt: UUidWithPrefix,
+		uid_benutzer: UUidWithPrefix.optional()
 	})).omit({
 		id: true,
 		aufnahme_id: true,

src/pages/api/verbrauchsausweis-wohnen/index.ts

@@ -1,4 +1,5 @@
-import { authorizationMiddleware } from "#lib/middleware/authorization.js";
+import { UUidWithPrefix } from "#components/Ausweis/types.js";
+import { authorizationHeaders, authorizationMiddleware } from "#lib/middleware/authorization.js";
 import { prisma, VerbrauchsausweisWohnenSchema } from "@ibcornelsen/database/server";
 import { APIError, defineApiRoute } from "astro-typesafe-api/server";
 import { z } from "zod";
@@ -21,13 +22,14 @@ export const PUT = defineApiRoute({
 			uid: true,
 			aufnahme_id: true
 		}),
-		uid_aufnahme: z.string().uuid()
+		uid_aufnahme: UUidWithPrefix
 	}),
 	output: z.object({
-		uid: z.string().uuid(),
-		objekt_uid: z.string().uuid(),
-		aufnahme_uid: z.string().uuid(),
+		uid: UUidWithPrefix,
+		objekt_uid: UUidWithPrefix,
+		aufnahme_uid: UUidWithPrefix,
 	}),
+	headers: authorizationHeaders,
 	middleware: authorizationMiddleware,
 	async fetch(input, ctx, user) {
 		const aufnahme = await prisma.aufnahme.findUnique({