fix(redwood): fix incorrect error type thrown (#1659)

zenstackhq · Aug 24, 2024 · 1d81325 · 1d81325
1 parent 32c258c
commit 1d81325
Show file tree

Hide file tree

Showing 5 changed files with 6 additions and 7 deletions.
diff --git a/packages/misc/redwood/src/graphql.ts b/packages/misc/redwood/src/graphql.ts
@@ -1,9 +1,8 @@
-import { ForbiddenError } from '@redwoodjs/graphql-server';
+import { ForbiddenError, ValidationError } from '@redwoodjs/graphql-server';
 import {
     CrudFailureReason,
     EnhancementOptions,
     PrismaErrorCode,
-    ValidationError,
     enhance,
     isPrismaClientKnownRequestError,
     type AuthUser,
@@ -47,7 +46,7 @@ export function useZenStack<PrismaClient extends object>(
 
 // Transforms ZenStack errors into appropriate RedwoodJS errors
 function transformError(error: unknown) {
-    if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINED_FAILED) {
+    if (isPrismaClientKnownRequestError(error) && error.code === PrismaErrorCode.CONSTRAINT_FAILED) {
         if (
             error.meta?.reason === CrudFailureReason.ACCESS_POLICY_VIOLATION ||
             error.meta?.reason === CrudFailureReason.RESULT_NOT_READABLE

diff --git a/packages/runtime/src/constants.ts b/packages/runtime/src/constants.ts
@@ -40,7 +40,7 @@ export enum PrismaErrorCode {
     /**
      * A constraint failed on the database
      */
-    CONSTRAINED_FAILED = 'P2004',
+    CONSTRAINT_FAILED = 'P2004',
 
     /**
      * The required connected records were not found

diff --git a/packages/runtime/src/enhancements/policy/policy-utils.ts b/packages/runtime/src/enhancements/policy/policy-utils.ts
@@ -1215,7 +1215,7 @@ export class PolicyUtil extends QueryUtils {
         reason?: CrudFailureReason,
         zodErrors?: ZodError
     ) {
-        const args: any = { clientVersion: getVersion(), code: PrismaErrorCode.CONSTRAINED_FAILED, meta: {} };
+        const args: any = { clientVersion: getVersion(), code: PrismaErrorCode.CONSTRAINT_FAILED, meta: {} };
         if (reason) {
             args.meta.reason = reason;
         }

diff --git a/packages/server/src/api/rest/index.ts b/packages/server/src/api/rest/index.ts
@@ -1589,7 +1589,7 @@ class RequestHandler extends APIHandlerBase {
 
     private handlePrismaError(err: unknown) {
         if (isPrismaClientKnownRequestError(err)) {
-            if (err.code === PrismaErrorCode.CONSTRAINED_FAILED) {
+            if (err.code === PrismaErrorCode.CONSTRAINT_FAILED) {
                 if (err.meta?.reason === CrudFailureReason.DATA_VALIDATION_VIOLATION) {
                     return this.makeError(
                         'validationError',

diff --git a/packages/server/src/api/rpc/index.ts b/packages/server/src/api/rpc/index.ts
@@ -18,7 +18,7 @@ import { logError, registerCustomSerializers } from '../utils';
 registerCustomSerializers();
 
 const ERROR_STATUS_MAPPING: Record<string, number> = {
-    [PrismaErrorCode.CONSTRAINED_FAILED]: 403,
+    [PrismaErrorCode.CONSTRAINT_FAILED]: 403,
     [PrismaErrorCode.REQUIRED_CONNECTED_RECORD_NOT_FOUND]: 404,
     [PrismaErrorCode.DEPEND_ON_RECORD_NOT_FOUND]: 404,
 };