fix: Swagger validation errors (#677)

* fix: Swagger validation errors

* undo package changes

Author: arcoraven

src/server/middleware/error.ts

@@ -22,13 +22,12 @@ export const createCustomError = (
   code,
 });
 
-export const customDateTimestampError = (date: string): CustomError => {
-  return createCustomError(
+export const customDateTimestampError = (date: string): CustomError =>
+  createCustomError(
     `Invalid date: ${date}. Needs to new Date() / new Date().toISOstring() / new Date().getTime() / Unix Epoch`,
     StatusCodes.BAD_REQUEST,
     "INVALID_DATE_TIME",
   );
-};
 
 export const badAddressError = (address: string): CustomError =>
   createCustomError(

src/server/middleware/open-api.ts

@@ -29,11 +29,6 @@ export const withOpenApi = async (server: FastifyInstance) => {
         },
       ],
     },
-    refResolver: {
-      buildLocalReference(json, baseUri, fragment, i) {
-        return json.$id || `def-${i}`;
-      },
-    },
   });
 
   // Exports the /json endpoint without the Swagger UI.

src/server/routes/auth/access-tokens/create.ts

@@ -1,7 +1,7 @@
-import { Static, Type } from "@sinclair/typebox";
+import { Type, type Static } from "@sinclair/typebox";
 import { buildJWT } from "@thirdweb-dev/auth";
 import { LocalWallet } from "@thirdweb-dev/wallets";
-import { FastifyInstance } from "fastify";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { updateConfiguration } from "../../../../db/configuration/updateConfiguration";
 import { createToken } from "../../../../db/tokens/createToken";
@@ -16,12 +16,10 @@ const requestBodySchema = Type.Object({
 });
 
 const responseBodySchema = Type.Object({
-  result: Type.Composite([
-    AccessTokenSchema,
-    Type.Object({
-      accessToken: Type.String(),
-    }),
-  ]),
+  result: Type.Object({
+    ...AccessTokenSchema.properties,
+    accessToken: Type.String(),
+  }),
 });
 
 export async function createAccessToken(fastify: FastifyInstance) {
@@ -35,7 +33,7 @@ export async function createAccessToken(fastify: FastifyInstance) {
       summary: "Create a new access token",
       description: "Create a new access token",
       tags: ["Access Tokens"],
-      operationId: "create",
+      operationId: "createAccessToken",
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,

src/server/routes/auth/access-tokens/getAll.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { getAccessTokens } from "../../../../db/tokens/getAccessTokens";
 import { AddressSchema } from "../../../schemas/address";
@@ -28,7 +28,7 @@ export async function getAllAccessTokens(fastify: FastifyInstance) {
       summary: "Get all access tokens",
       description: "Get all access tokens",
       tags: ["Access Tokens"],
-      operationId: "getAll",
+      operationId: "listAccessTokens",
       response: {
         ...standardResponseSchema,
         [StatusCodes.OK]: responseBodySchema,

src/server/routes/auth/access-tokens/revoke.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { revokeToken } from "../../../../db/tokens/revokeToken";
 import { accessTokenCache } from "../../../../utils/cache/accessToken";
@@ -26,7 +26,7 @@ export async function revokeAccessToken(fastify: FastifyInstance) {
       summary: "Revoke an access token",
       description: "Revoke an access token",
       tags: ["Access Tokens"],
-      operationId: "revoke",
+      operationId: "revokeAccessTokens",
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,

src/server/routes/auth/access-tokens/update.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { updateToken } from "../../../../db/tokens/updateToken";
 import { accessTokenCache } from "../../../../utils/cache/accessToken";
@@ -27,7 +27,7 @@ export async function updateAccessToken(fastify: FastifyInstance) {
       summary: "Update an access token",
       description: "Update an access token",
       tags: ["Access Tokens"],
-      operationId: "update",
+      operationId: "updateAccessTokens",
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,

src/server/routes/auth/permissions/getAll.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { prisma } from "../../../../db/client";
 import { AddressSchema } from "../../../schemas/address";
@@ -25,7 +25,7 @@ export async function getAllPermissions(fastify: FastifyInstance) {
       summary: "Get all permissions",
       description: "Get all users with their corresponding permissions",
       tags: ["Permissions"],
-      operationId: "getAll",
+      operationId: "listAdmins",
       response: {
         ...standardResponseSchema,
         [StatusCodes.OK]: responseBodySchema,

src/server/routes/auth/permissions/grant.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { updatePermissions } from "../../../../db/permissions/updatePermissions";
 import { AddressSchema } from "../../../schemas/address";
@@ -29,7 +29,7 @@ export async function grantPermissions(fastify: FastifyInstance) {
       summary: "Grant permissions to user",
       description: "Grant permissions to a user",
       tags: ["Permissions"],
-      operationId: "grant",
+      operationId: "grantAdmin",
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,

src/server/routes/auth/permissions/revoke.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { deletePermissions } from "../../../../db/permissions/deletePermissions";
 import { AddressSchema } from "../../../schemas/address";
@@ -26,7 +26,7 @@ export async function revokePermissions(fastify: FastifyInstance) {
       summary: "Revoke permissions from user",
       description: "Revoke a user's permissions",
       tags: ["Permissions"],
-      operationId: "revoke",
+      operationId: "revokeAdmin",
       body: requestBodySchema,
       response: {
         ...standardResponseSchema,

src/server/routes/backend-wallet/create.ts

@@ -1,5 +1,5 @@
-import { Static, Type } from "@sinclair/typebox";
-import { FastifyInstance } from "fastify";
+import { Type, type Static } from "@sinclair/typebox";
+import type { FastifyInstance } from "fastify";
 import { StatusCodes } from "http-status-codes";
 import { WalletType } from "../../../schema/wallet";
 import { getConfig } from "../../../utils/cache/getConfig";