Use safeParse to correctly capture Rpc errors (#15)

Author: bsurmanski

src/assessment.ts

@@ -21,6 +21,15 @@
 import { z } from "zod";
 import * as action from "./action";
 
+export const ErrorSchema = z
+        .object({
+          code: z.number().optional(),
+          message: z.string().optional(),
+          status: z.number().or(z.string()).optional(),
+        });
+
+export const RpcErrorSchema = z.object({error: ErrorSchema.required()});
+
 /** Zod Schema for FirewallPolicy type. */
 export const FirewallPolicySchema = z.object({
   name: z.string().optional(),
@@ -82,13 +91,7 @@ export const AssessmentSchema = z.object({
     .optional(),
   firewallPolicyAssessment: z
     .object({
-      error: z
-        .object({
-          code: z.number().optional(),
-          message: z.string().optional(),
-          status: z.number().optional(),
-        })
-        .optional(),
+      error: ErrorSchema.optional(),
       firewallPolicy: FirewallPolicySchema.optional(),
     })
     .optional(),

src/createAssessment.ts

@@ -19,7 +19,7 @@
  */
 
 import * as action from "./action";
-import { Assessment, AssessmentSchema, Event, EventSchema } from "./assessment";
+import { Assessment, AssessmentSchema, Event, EventSchema, RpcErrorSchema } from "./assessment";
 import * as error from "./error";
 import { RecaptchaContext } from "./index";
 
@@ -132,9 +132,15 @@ export async function callCreateAssessment(
       return response
         .json()
         .then((json) => {
-          let ret = AssessmentSchema.parse(json);
-          context.log("debug", "[rpc] createAssessment (ok)");
-          return ret;
+          let ret = AssessmentSchema.safeParse(json);
+          if (ret.success && Object.keys(ret.data).length > 0) {
+            return ret.data;
+          }
+          let err_ret = RpcErrorSchema.required().safeParse(json);
+          if (err_ret.success) {
+            throw err_ret.data.error;
+          }
+          throw {message: "Response does not conform to Assesment schema: " + json};
         })
         .catch((reason) => {
           throw new error.ParseError(