@jskit-ai/workspaces-core 0.1.31 → 0.1.33

package/src/server/workspaceBootstrapContributor.js

@@ -5,7 +5,6 @@ import {
   TENANCY_MODE_NONE,
   resolveTenancyProfile
 } from "../shared/tenancyProfile.js";
-import { workspacePendingInvitationsResource } from "../shared/resources/workspacePendingInvitationsResource.js";
 import {
   mapMembershipSummary,
   mapWorkspaceSettingsPublic,
@@ -17,12 +16,6 @@ const REQUESTED_WORKSPACE_STATUS_NOT_FOUND = "not_found";
 const REQUESTED_WORKSPACE_STATUS_FORBIDDEN = "forbidden";
 const REQUESTED_WORKSPACE_STATUS_UNAUTHENTICATED = "unauthenticated";
 
-function normalizePendingInvites(invites) {
-  return workspacePendingInvitationsResource.operations.list.outputValidator.normalize({
-    pendingInvites: invites
-  }).pendingInvites;
-}
-
 function normalizeQueryPayload(value = {}) {
   if (!value || typeof value !== "object" || Array.isArray(value)) {
     return {};
@@ -168,13 +161,11 @@ function createWorkspaceBootstrapContributor({
 
       const pendingInvites =
         workspaceInvitationsEnabled
-          ? normalizePendingInvites(
-              await workspacePendingInvitationsService.listPendingInvitesForUser(latestProfile, {
-                context: {
-                  actor: latestProfile
-                }
-              })
-            )
+          ? await workspacePendingInvitationsService.listPendingInvitesForUser(latestProfile, {
+              context: {
+                actor: latestProfile
+              }
+            })
           : [];
       const workspaces = await workspaceService.listWorkspacesForUser(latestProfile, { request });
       let workspaceContext = null;

package/src/server/workspaceDirectory/bootWorkspaceDirectoryRoutes.js

@@ -1,9 +1,30 @@
-import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
-import { workspaceResource } from "../../shared/resources/workspaceResource.js";
+import { createJsonApiResourceRouteContract } from "@jskit-ai/http-runtime/shared/validators/jsonApiRouteTransport";
+import {
+  workspaceListItemOutputValidator,
+  workspaceResource
+} from "../../shared/resources/workspaceResource.js";
+import {
+  WORKSPACES_COLLECTION_TRANSPORT,
+  WORKSPACES_TRANSPORT
+} from "../../shared/jsonApiTransports.js";
 import { resolveWorkspaceRoutePath } from "../common/support/workspaceRoutePaths.js";
 import { workspaceSlugParamsValidator } from "../common/validators/routeParamsValidator.js";
 import { resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig } from "../support/workspaceActionSurfaces.js";
 
+function resolveWorkspaceRecordId(record = {}, context = {}) {
+  const workspaceId = record?.workspace?.id ?? record?.id;
+  if (workspaceId != null && String(workspaceId).trim()) {
+    return workspaceId;
+  }
+
+  const workspaceSlug = context?.request?.params?.workspaceSlug;
+  if (workspaceSlug != null && String(workspaceSlug).trim()) {
+    return workspaceSlug;
+  }
+
+  throw new Error("Workspace JSON:API response requires workspace id.");
+}
+
 function bootWorkspaceDirectoryRoutes(app) {
   if (!app || typeof app.make !== "function" || typeof app.has !== "function") {
     throw new Error("bootWorkspaceDirectoryRoutes requires application make()/has().");
@@ -22,18 +43,18 @@ function bootWorkspaceDirectoryRoutes(app) {
       "/api/workspaces",
       {
         auth: "required",
-        meta: {
-          tags: ["workspace"],
-          summary: "Create a workspace for the authenticated user"
-        },
-        bodyValidator: workspaceResource.operations.create.bodyValidator,
-        responseValidators: withStandardErrorResponses(
-          {
-            200: workspaceResource.operations.create.outputValidator
-          },
-          { includeValidation400: true }
-        )
+      meta: {
+        tags: ["workspace"],
+        summary: "Create a workspace for the authenticated user"
       },
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACES_TRANSPORT,
+        body: workspaceResource.operations.create.body,
+        output: workspaceResource.operations.create.output,
+        outputKind: "record",
+        includeValidation400: true
+      })
+    },
       async function (request, reply) {
         const body = request.input.body || {};
         const response = await request.executeAction({
@@ -57,8 +78,10 @@ function bootWorkspaceDirectoryRoutes(app) {
         tags: ["workspace"],
         summary: "List workspaces visible to authenticated user"
       },
-      responseValidators: withStandardErrorResponses({
-        200: workspaceResource.operations.list.outputValidator
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACES_COLLECTION_TRANSPORT,
+        output: workspaceListItemOutputValidator,
+        outputKind: "collection"
       })
     },
     async function (request, reply) {
@@ -81,9 +104,12 @@ function bootWorkspaceDirectoryRoutes(app) {
         tags: ["workspace"],
         summary: "Get workspace profile by workspace slug"
       },
-      paramsValidator: workspaceSlugParamsValidator,
-      responseValidators: withStandardErrorResponses({
-        200: workspaceResource.operations.view.outputValidator
+      params: workspaceSlugParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACES_TRANSPORT,
+        output: workspaceResource.operations.view.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceRecordId
       })
     },
     async function (request, reply) {
@@ -108,21 +134,22 @@ function bootWorkspaceDirectoryRoutes(app) {
         tags: ["workspace"],
         summary: "Update workspace profile by workspace slug"
       },
-      paramsValidator: workspaceSlugParamsValidator,
-      bodyValidator: workspaceResource.operations.patch.bodyValidator,
-      responseValidators: withStandardErrorResponses(
-        {
-          200: workspaceResource.operations.patch.outputValidator
-        },
-        { includeValidation400: true }
-      )
+      params: workspaceSlugParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACES_TRANSPORT,
+        body: workspaceResource.operations.patch.body,
+        output: workspaceResource.operations.patch.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceRecordId,
+        includeValidation400: true
+      })
     },
     async function (request, reply) {
       const response = await request.executeAction({
         actionId: "workspace.workspaces.update",
         input: {
           workspaceSlug: request.input.params.workspaceSlug,
-          patch: request.input.body
+          ...(request.input.body || {})
         }
       });
       reply.code(200).send(response);

package/src/server/workspaceDirectory/workspaceDirectoryActions.js

@@ -1,11 +1,21 @@
 import {
-  EMPTY_INPUT_VALIDATOR,
+  emptyInputValidator,
   resolveRequest
 } from "@jskit-ai/kernel/shared/actions/actionContributorHelpers";
+import { returnJsonApiData } from "@jskit-ai/http-runtime/shared";
+import { composeSchemaDefinitions } from "@jskit-ai/kernel/shared/validators";
 import { workspaceResource } from "../../shared/resources/workspaceResource.js";
 import { workspaceSlugParamsValidator } from "../common/validators/routeParamsValidator.js";
 import { resolveActionUser } from "../common/support/resolveActionUser.js";
 
+const workspaceUpdateInputValidator = composeSchemaDefinitions([
+  workspaceSlugParamsValidator,
+  workspaceResource.operations.patch.body
+], {
+  mode: "patch",
+  context: "workspaceDirectoryActions.workspaceUpdateInputValidator"
+});
+
 const workspaceDirectoryActions = Object.freeze([
   {
     id: "workspace.workspaces.create",
@@ -16,8 +26,8 @@ const workspaceDirectoryActions = Object.freeze([
     permission: {
       require: "authenticated"
     },
-    inputValidator: workspaceResource.operations.create.bodyValidator,
-    outputValidator: workspaceResource.operations.create.outputValidator,
+    input: workspaceResource.operations.create.body,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.workspaces.create"
@@ -29,10 +39,10 @@ const workspaceDirectoryActions = Object.freeze([
       }
     },
     async execute(input, context, deps) {
-      return deps.workspaceService.createWorkspaceForAuthenticatedUser(resolveActionUser(context, input), input, {
+      return returnJsonApiData(await deps.workspaceService.createWorkspaceForAuthenticatedUser(resolveActionUser(context, input), input, {
         request: resolveRequest(context),
         context
-      });
+      }));
     }
   },
   {
@@ -44,21 +54,21 @@ const workspaceDirectoryActions = Object.freeze([
     permission: {
       require: "authenticated"
     },
-    inputValidator: EMPTY_INPUT_VALIDATOR,
-    outputValidator: workspaceResource.operations.list.outputValidator,
+    input: emptyInputValidator,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.workspaces.list"
     },
     observability: {},
     async execute(input, context, deps) {
-      return {
+      return returnJsonApiData({
         items: await deps.workspaceService.listWorkspacesForAuthenticatedUser(resolveActionUser(context, input), {
           request: resolveRequest(context),
           context
         }),
         nextCursor: null
-      };
+      });
     }
   },
   {
@@ -71,22 +81,22 @@ const workspaceDirectoryActions = Object.freeze([
       require: "any",
       permissions: ["workspace.settings.view", "workspace.settings.update"]
     },
-    inputValidator: workspaceSlugParamsValidator,
-    outputValidator: workspaceResource.operations.view.outputValidator,
+    input: workspaceSlugParamsValidator,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.workspaces.read"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceService.getWorkspaceForAuthenticatedUser(
+      return returnJsonApiData(await deps.workspaceService.getWorkspaceForAuthenticatedUser(
         resolveActionUser(context, input),
         input.workspaceSlug,
         {
           request: resolveRequest(context),
           context
         }
-      );
+      ));
     }
   },
   {
@@ -99,13 +109,8 @@ const workspaceDirectoryActions = Object.freeze([
       require: "all",
       permissions: ["workspace.settings.update"]
     },
-    inputValidator: [
-      workspaceSlugParamsValidator,
-      {
-        patch: workspaceResource.operations.patch.bodyValidator
-      }
-    ],
-    outputValidator: workspaceResource.operations.patch.outputValidator,
+    input: workspaceUpdateInputValidator,
+    output: null,
     idempotency: "optional",
     audit: {
       actionName: "workspace.workspaces.update"
@@ -117,15 +122,16 @@ const workspaceDirectoryActions = Object.freeze([
       }
     },
     async execute(input, context, deps) {
-      return deps.workspaceService.updateWorkspaceForAuthenticatedUser(
+      const { workspaceSlug, ...patch } = input;
+      return returnJsonApiData(await deps.workspaceService.updateWorkspaceForAuthenticatedUser(
         resolveActionUser(context, input),
-        input.workspaceSlug,
-        input.patch,
+        workspaceSlug,
+        patch,
         {
           request: resolveRequest(context),
           context
         }
-      );
+      ));
     }
   }
 ]);

package/src/server/workspaceMembers/bootWorkspaceMembers.js

@@ -1,4 +1,11 @@
-import { withStandardErrorResponses } from "@jskit-ai/http-runtime/shared/validators/errorResponses";
+import { createJsonApiResourceRouteContract } from "@jskit-ai/http-runtime/shared/validators/jsonApiRouteTransport";
+import {
+  WORKSPACE_INVITES_TRANSPORT,
+  WORKSPACE_INVITE_CREATE_TRANSPORT,
+  WORKSPACE_MEMBERS_TRANSPORT,
+  WORKSPACE_MEMBER_ROLE_UPDATE_TRANSPORT,
+  WORKSPACE_ROLE_CATALOG_TRANSPORT
+} from "../../shared/jsonApiTransports.js";
 import { workspaceMembersResource } from "../../shared/resources/workspaceMembersResource.js";
 import { resolveWorkspaceRoutePath } from "../common/support/workspaceRoutePaths.js";
 import {
@@ -7,6 +14,20 @@ import {
 } from "../common/validators/routeParamsValidator.js";
 import { resolveDefaultWorkspaceRouteSurfaceIdFromAppConfig } from "../support/workspaceActionSurfaces.js";
 
+function resolveWorkspaceAggregateRecordId(record = {}, context = {}) {
+  const workspaceId = record?.workspace?.id;
+  if (workspaceId != null && String(workspaceId).trim()) {
+    return workspaceId;
+  }
+
+  const workspaceSlug = context?.request?.params?.workspaceSlug;
+  if (workspaceSlug != null && String(workspaceSlug).trim()) {
+    return workspaceSlug;
+  }
+
+  throw new Error("Workspace JSON:API response requires workspace id.");
+}
+
 function bootWorkspaceMembers(app) {
   if (!app || typeof app.make !== "function") {
     throw new Error("bootWorkspaceMembers requires application make().");
@@ -32,9 +53,12 @@ function bootWorkspaceMembers(app) {
         tags: ["workspace"],
         summary: "Get workspace role catalog by workspace slug"
       },
-      paramsValidator: workspaceSlugParamsValidator,
-      responseValidators: withStandardErrorResponses({
-        200: workspaceMembersResource.operations.rolesList.outputValidator
+      params: workspaceSlugParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACE_ROLE_CATALOG_TRANSPORT,
+        output: workspaceMembersResource.operations.rolesList.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceAggregateRecordId
       })
     },
     async function (request, reply) {
@@ -60,9 +84,12 @@ function bootWorkspaceMembers(app) {
         tags: ["workspace"],
         summary: "List members by workspace slug"
       },
-      paramsValidator: workspaceSlugParamsValidator,
-      responseValidators: withStandardErrorResponses({
-        200: workspaceMembersResource.operations.membersList.outputValidator
+      params: workspaceSlugParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACE_MEMBERS_TRANSPORT,
+        output: workspaceMembersResource.operations.membersList.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceAggregateRecordId
       })
     },
     async function (request, reply) {
@@ -88,14 +115,15 @@ function bootWorkspaceMembers(app) {
         tags: ["workspace"],
         summary: "Update workspace member role by workspace slug"
       },
-      paramsValidator: routeParamsValidator,
-      bodyValidator: workspaceMembersResource.operations.updateMemberRole.bodyValidator,
-      responseValidators: withStandardErrorResponses(
-        {
-          200: workspaceMembersResource.operations.updateMemberRole.outputValidator
-        },
-        { includeValidation400: true }
-      )
+      params: routeParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACE_MEMBER_ROLE_UPDATE_TRANSPORT,
+        body: workspaceMembersResource.operations.updateMemberRole.body,
+        output: workspaceMembersResource.operations.updateMemberRole.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceAggregateRecordId,
+        includeValidation400: true
+      })
     },
     async function (request, reply) {
       const response = await request.executeAction({
@@ -122,9 +150,12 @@ function bootWorkspaceMembers(app) {
         tags: ["workspace"],
         summary: "Remove workspace member by workspace slug"
       },
-      paramsValidator: routeParamsValidator,
-      responseValidators: withStandardErrorResponses({
-        200: workspaceMembersResource.operations.removeMember.outputValidator
+      params: routeParamsValidator,
+      ...createJsonApiResourceRouteContract({
+        ...WORKSPACE_MEMBERS_TRANSPORT,
+        output: workspaceMembersResource.operations.removeMember.output,
+        outputKind: "record",
+        getRecordId: resolveWorkspaceAggregateRecordId
       })
     },
     async function (request, reply) {
@@ -152,9 +183,12 @@ function bootWorkspaceMembers(app) {
           tags: ["workspace"],
           summary: "List workspace invites by workspace slug"
         },
-        paramsValidator: workspaceSlugParamsValidator,
-        responseValidators: withStandardErrorResponses({
-          200: workspaceMembersResource.operations.invitesList.outputValidator
+        params: workspaceSlugParamsValidator,
+        ...createJsonApiResourceRouteContract({
+          ...WORKSPACE_INVITES_TRANSPORT,
+          output: workspaceMembersResource.operations.invitesList.output,
+          outputKind: "record",
+          getRecordId: resolveWorkspaceAggregateRecordId
         })
       },
       async function (request, reply) {
@@ -180,14 +214,15 @@ function bootWorkspaceMembers(app) {
           tags: ["workspace"],
           summary: "Create workspace invite by workspace slug"
         },
-        paramsValidator: workspaceSlugParamsValidator,
-        bodyValidator: workspaceMembersResource.operations.createInvite.bodyValidator,
-        responseValidators: withStandardErrorResponses(
-          {
-            200: workspaceMembersResource.operations.createInvite.outputValidator
-          },
-          { includeValidation400: true }
-        )
+        params: workspaceSlugParamsValidator,
+        ...createJsonApiResourceRouteContract({
+          ...WORKSPACE_INVITE_CREATE_TRANSPORT,
+          body: workspaceMembersResource.operations.createInvite.body,
+          output: workspaceMembersResource.operations.createInvite.output,
+          outputKind: "record",
+          getRecordId: resolveWorkspaceAggregateRecordId,
+          includeValidation400: true
+        })
       },
       async function (request, reply) {
         const response = await request.executeAction({
@@ -214,9 +249,12 @@ function bootWorkspaceMembers(app) {
           tags: ["workspace"],
           summary: "Revoke workspace invite by workspace slug"
         },
-        paramsValidator: routeParamsValidator,
-        responseValidators: withStandardErrorResponses({
-          200: workspaceMembersResource.operations.revokeInvite.outputValidator
+        params: routeParamsValidator,
+        ...createJsonApiResourceRouteContract({
+          ...WORKSPACE_INVITES_TRANSPORT,
+          output: workspaceMembersResource.operations.revokeInvite.output,
+          outputKind: "record",
+          getRecordId: resolveWorkspaceAggregateRecordId
         })
       },
       async function (request, reply) {

package/src/server/workspaceMembers/workspaceMembersActions.js

@@ -1,8 +1,42 @@
+import { composeSchemaDefinitions } from "@jskit-ai/kernel/shared/validators";
+import { returnJsonApiData } from "@jskit-ai/http-runtime/shared";
 import { resolveWorkspace } from "../support/resolveWorkspace.js";
 import { resolveActionUser } from "../common/support/resolveActionUser.js";
 import { workspaceMembersResource } from "../../shared/resources/workspaceMembersResource.js";
 import { workspaceSlugParamsValidator } from "../common/validators/routeParamsValidator.js";
 
+const updateMemberRoleActionInput = composeSchemaDefinitions([
+  workspaceSlugParamsValidator,
+  workspaceMembersResource.operations.updateMemberRole.input
+], {
+  mode: workspaceMembersResource.operations.updateMemberRole.input.mode,
+  context: "workspaceMembersActions.updateMemberRoleActionInput"
+});
+
+const removeMemberActionInput = composeSchemaDefinitions([
+  workspaceSlugParamsValidator,
+  workspaceMembersResource.operations.removeMember.input
+], {
+  mode: workspaceMembersResource.operations.removeMember.input.mode,
+  context: "workspaceMembersActions.removeMemberActionInput"
+});
+
+const createInviteActionInput = composeSchemaDefinitions([
+  workspaceSlugParamsValidator,
+  workspaceMembersResource.operations.createInvite.body
+], {
+  mode: workspaceMembersResource.operations.createInvite.body.mode,
+  context: "workspaceMembersActions.createInviteActionInput"
+});
+
+const revokeInviteActionInput = composeSchemaDefinitions([
+  workspaceSlugParamsValidator,
+  workspaceMembersResource.operations.revokeInvite.input
+], {
+  mode: workspaceMembersResource.operations.revokeInvite.input.mode,
+  context: "workspaceMembersActions.revokeInviteActionInput"
+});
+
 const workspaceMembersActions = Object.freeze([
   {
     id: "workspace.roles.list",
@@ -14,15 +48,15 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.roles.view"]
     },
-    inputValidator: workspaceSlugParamsValidator,
-    outputValidator: workspaceMembersResource.operations.rolesList.outputValidator,
+    input: workspaceSlugParamsValidator,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.roles.list"
     },
     observability: {},
     async execute(_input, context, deps) {
-      return deps.workspaceMembersService.listRoles({ context });
+      return returnJsonApiData(await deps.workspaceMembersService.listRoles({ context }));
     }
   },
   {
@@ -35,17 +69,17 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.members.view"]
     },
-    inputValidator: workspaceSlugParamsValidator,
-    outputValidator: workspaceMembersResource.operations.membersList.outputValidator,
+    input: workspaceSlugParamsValidator,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.members.list"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.listMembers(resolveWorkspace(context, input), {
+      return returnJsonApiData(await deps.workspaceMembersService.listMembers(resolveWorkspace(context, input), {
         context
-      });
+      }));
     }
   },
   {
@@ -58,20 +92,20 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.members.manage"]
     },
-    inputValidator: [workspaceSlugParamsValidator, workspaceMembersResource.operations.updateMemberRole.inputValidator],
-    outputValidator: workspaceMembersResource.operations.updateMemberRole.outputValidator,
+    input: updateMemberRoleActionInput,
+    output: null,
     idempotency: "optional",
     audit: {
       actionName: "workspace.member.role.update"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.updateMemberRole(resolveWorkspace(context, input), {
+      return returnJsonApiData(await deps.workspaceMembersService.updateMemberRole(resolveWorkspace(context, input), {
         memberUserId: input.memberUserId,
         roleSid: input.roleSid
       }, {
         context
-      });
+      }));
     }
   },
   {
@@ -84,19 +118,19 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.members.manage"]
     },
-    inputValidator: [workspaceSlugParamsValidator, workspaceMembersResource.operations.removeMember.inputValidator],
-    outputValidator: workspaceMembersResource.operations.removeMember.outputValidator,
+    input: removeMemberActionInput,
+    output: null,
     idempotency: "optional",
     audit: {
       actionName: "workspace.member.remove"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.removeMember(resolveWorkspace(context, input), {
+      return returnJsonApiData(await deps.workspaceMembersService.removeMember(resolveWorkspace(context, input), {
         memberUserId: input.memberUserId
       }, {
         context
-      });
+      }));
     }
   },
   {
@@ -109,17 +143,17 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.members.view"]
     },
-    inputValidator: workspaceSlugParamsValidator,
-    outputValidator: workspaceMembersResource.operations.invitesList.outputValidator,
+    input: workspaceSlugParamsValidator,
+    output: null,
     idempotency: "none",
     audit: {
       actionName: "workspace.invites.list"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.listInvites(resolveWorkspace(context, input), {
+      return returnJsonApiData(await deps.workspaceMembersService.listInvites(resolveWorkspace(context, input), {
         context
-      });
+      }));
     }
   },
   {
@@ -132,8 +166,8 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.members.invite"]
     },
-    inputValidator: [workspaceSlugParamsValidator, workspaceMembersResource.operations.createInvite.bodyValidator],
-    outputValidator: workspaceMembersResource.operations.createInvite.outputValidator,
+    input: createInviteActionInput,
+    output: null,
     idempotency: "optional",
     audit: {
       actionName: "workspace.invite.create"
@@ -145,7 +179,7 @@ const workspaceMembersActions = Object.freeze([
       }
     },
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.createInvite(
+      return returnJsonApiData(await deps.workspaceMembersService.createInvite(
         resolveWorkspace(context, input),
         resolveActionUser(context, input),
         {
@@ -155,7 +189,7 @@ const workspaceMembersActions = Object.freeze([
         {
           context
         }
-      );
+      ));
     }
   },
   {
@@ -168,17 +202,17 @@ const workspaceMembersActions = Object.freeze([
       require: "all",
       permissions: ["workspace.invites.revoke"]
     },
-    inputValidator: [workspaceSlugParamsValidator, workspaceMembersResource.operations.revokeInvite.inputValidator],
-    outputValidator: workspaceMembersResource.operations.revokeInvite.outputValidator,
+    input: revokeInviteActionInput,
+    output: null,
     idempotency: "optional",
     audit: {
       actionName: "workspace.invite.revoke"
     },
     observability: {},
     async execute(input, context, deps) {
-      return deps.workspaceMembersService.revokeInvite(resolveWorkspace(context, input), input.inviteId, {
+      return returnJsonApiData(await deps.workspaceMembersService.revokeInvite(resolveWorkspace(context, input), input.inviteId, {
         context
-      });
+      }));
     }
   }
 ]);