refactor: share approval resolve param parsing

vincentkoc · vincentkoc · commit 56eadf36d019 · 2026-05-30T15:57:57.000+02:00
diff --git a/src/gateway/server-methods/approval-shared.ts b/src/gateway/server-methods/approval-shared.ts
@@ -1,4 +1,9 @@
-import { ErrorCodes, errorShape } from "../../../packages/gateway-protocol/src/index.js";
+import {
+  ErrorCodes,
+  errorShape,
+  formatValidationErrors,
+} from "../../../packages/gateway-protocol/src/index.js";
+import type { ValidationError } from "../../../packages/gateway-protocol/src/index.js";
 import { hasApprovalTurnSourceRoute } from "../../infra/approval-turn-source.js";
 import type { ExecApprovalDecision } from "../../infra/exec-approvals.js";
 import { normalizeOptionalString } from "../../shared/string-coerce.js";
@@ -51,6 +56,17 @@ type PendingApprovalListEntry<TPayload> = {
   expiresAtMs: number;
 };
 
+type ApprovalResolveParams = {
+  id: string;
+  decision: string;
+};
+
+type ApprovalResolveParamsValidator<TParams extends ApprovalResolveParams> = ((
+  params: unknown,
+) => params is TParams) & {
+  errors?: ValidationError[] | null;
+};
+
 function isPromiseLike<T>(value: T | Promise<T>): value is Promise<T> {
   return typeof value === "object" && value !== null && "then" in value;
 }
@@ -180,6 +196,34 @@ export function buildRequestedApprovalEvent<TPayload extends ApprovalTurnSourceF
   };
 }
 
+export function resolveApprovalDecisionParams<TParams extends ApprovalResolveParams>(params: {
+  rawParams: unknown;
+  validate: ApprovalResolveParamsValidator<TParams>;
+  methodName: string;
+  respond: RespondFn;
+}): { inputId: string; decision: ExecApprovalDecision } | null {
+  const rawParams = params.rawParams;
+  if (!params.validate(rawParams)) {
+    params.respond(
+      false,
+      undefined,
+      errorShape(
+        ErrorCodes.INVALID_REQUEST,
+        `invalid ${params.methodName} params: ${formatValidationErrors(params.validate.errors)}`,
+      ),
+    );
+    return null;
+  }
+  if (!isApprovalDecision(rawParams.decision)) {
+    params.respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));
+    return null;
+  }
+  return {
+    inputId: rawParams.id,
+    decision: rawParams.decision,
+  };
+}
+
 export function resolveApprovalRequestRecipientConnIds<TPayload>(params: {
   context: GatewayRequestContext;
   record: ExecApprovalRecord<TPayload>;
diff --git a/src/gateway/server-methods/exec-approval.ts b/src/gateway/server-methods/exec-approval.ts
@@ -20,7 +20,6 @@ import {
   DEFAULT_EXEC_APPROVAL_TIMEOUT_MS,
   resolveExecApprovalAllowedDecisions,
   resolveExecApprovalRequestAllowedDecisions,
-  type ExecApprovalDecision,
   type ExecApprovalRequest,
   type ExecApprovalResolved,
 } from "../../infra/exec-approvals.js";
@@ -37,10 +36,10 @@ import {
   bindApprovalRequesterMetadata,
   buildRequestedApprovalEvent,
   handleApprovalResolve,
-  isApprovalDecision,
   isApprovalRecordVisibleToClient,
   listVisiblePendingApprovalRequests,
   registerPendingApprovalRecord,
+  resolveApprovalDecisionParams,
   respondPendingApprovalLookupError,
   resolvePendingApprovalRecord,
 } from "./approval-shared.js";
@@ -416,28 +415,19 @@ export function createExecApprovalHandlers(
       });
     },
     "exec.approval.resolve": async ({ params, respond, client, context }) => {
-      if (!validateExecApprovalResolveParams(params)) {
-        respond(
-          false,
-          undefined,
-          errorShape(
-            ErrorCodes.INVALID_REQUEST,
-            `invalid exec.approval.resolve params: ${formatValidationErrors(
-              validateExecApprovalResolveParams.errors,
-            )}`,
-          ),
-        );
-        return;
-      }
-      const p = params as { id: string; decision: string };
-      if (!isApprovalDecision(p.decision)) {
-        respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));
+      const resolveParams = resolveApprovalDecisionParams({
+        rawParams: params,
+        validate: validateExecApprovalResolveParams,
+        methodName: "exec.approval.resolve",
+        respond,
+      });
+      if (!resolveParams) {
         return;
       }
-      const decision: ExecApprovalDecision = p.decision;
+      const { inputId, decision } = resolveParams;
       await handleApprovalResolve({
         manager,
-        inputId: p.id,
+        inputId,
         decision,
         respond,
         context,
diff --git a/src/gateway/server-methods/plugin-approval.ts b/src/gateway/server-methods/plugin-approval.ts
@@ -21,9 +21,9 @@ import {
   handleApprovalResolve,
   handleApprovalWaitDecision,
   handlePendingApprovalRequest,
-  isApprovalDecision,
   listVisiblePendingApprovalRequests,
   registerPendingApprovalRecord,
+  resolveApprovalDecisionParams,
 } from "./approval-shared.js";
 import type { GatewayRequestHandlers } from "./types.js";
 
@@ -147,28 +147,19 @@ export function createPluginApprovalHandlers(
     },
 
     "plugin.approval.resolve": async ({ params, respond, client, context }) => {
-      if (!validatePluginApprovalResolveParams(params)) {
-        respond(
-          false,
-          undefined,
-          errorShape(
-            ErrorCodes.INVALID_REQUEST,
-            `invalid plugin.approval.resolve params: ${formatValidationErrors(
-              validatePluginApprovalResolveParams.errors,
-            )}`,
-          ),
-        );
-        return;
-      }
-      const p = params as { id: string; decision: string };
-      if (!isApprovalDecision(p.decision)) {
-        respond(false, undefined, errorShape(ErrorCodes.INVALID_REQUEST, "invalid decision"));
+      const resolveParams = resolveApprovalDecisionParams({
+        rawParams: params,
+        validate: validatePluginApprovalResolveParams,
+        methodName: "plugin.approval.resolve",
+        respond,
+      });
+      if (!resolveParams) {
         return;
       }
-      const decision = p.decision;
+      const { inputId, decision } = resolveParams;
       await handleApprovalResolve({
         manager,
-        inputId: p.id,
+        inputId,
         decision,
         respond,
         context,
