@smartbear/mcp 0.2.2 → 0.4.0

package/dist/api-hub/client.js

@@ -3,6 +3,8 @@ import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from "../common/info.js";
 // Tool definitions for API Hub API client
 export class ApiHubClient {
     headers;
+    name = "API Hub";
+    prefix = "api_hub";
     constructor(token) {
         this.headers = {
             "Authorization": `Bearer ${token}`,
@@ -82,99 +84,343 @@ export class ApiHubClient {
         });
         return response.json();
     }
-    registerTools(server) {
-        server.tool("list_portals", "Search for available portals within API Hub. Only portals where you have at least a designer role, either at the product level or organization level, are returned.", {}, async (_args, _extra) => {
+    registerTools(register, _getInput) {
+        register({
+            title: "List Portals",
+            summary: "Search for available portals within API Hub. Only portals where you have at least a designer role, either at the product level or organization level, are returned.",
+            parameters: [],
+        }, async (_args, _extra) => {
             const response = await this.getPortals();
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("create_portal", "Create a new portal within API Hub.", {
-            name: z.string().optional().describe("The portal name."),
-            subdomain: z.string().describe("The portal subdomain."),
-            offline: z.boolean().optional().describe("If set to true the portal will not be visible to customers."),
-            routing: z.string().optional().describe("Determines the routing strategy ('browser' or 'proxy')."),
-            credentialsEnabled: z.string().optional().describe("Indicates if credentials are enabled for the portal."),
-            swaggerHubOrganizationId: z.string().describe("The corresponding API Hub (formerly SwaggerHub) organization UUID."),
-            openapiRenderer: z.string().optional().describe("Portal level setting for the OpenAPI renderer. SWAGGER_UI - Use the Swagger UI renderer. ELEMENTS - Use the Elements renderer. TOGGLE - Switch between the two renderers with elements set as the default."),
-            pageContentFormat: z.string().optional().describe("The format of the page content.")
+        register({
+            title: "Create Portal",
+            summary: "Create a new portal within API Hub.",
+            parameters: [
+                {
+                    name: "name",
+                    type: z.string(),
+                    required: false,
+                    description: "The portal name.",
+                },
+                {
+                    name: "subdomain",
+                    type: z.string(),
+                    required: true,
+                    description: "The portal subdomain.",
+                },
+                {
+                    name: "offline",
+                    type: z.boolean(),
+                    required: false,
+                    description: "If set to true the portal will not be visible to customers.",
+                },
+                {
+                    name: "routing",
+                    type: z.string(),
+                    required: false,
+                    description: "Determines the routing strategy ('browser' or 'proxy').",
+                },
+                {
+                    name: "credentialsEnabled",
+                    type: z.string(),
+                    required: false,
+                    description: "Indicates if credentials are enabled for the portal.",
+                },
+                {
+                    name: "swaggerHubOrganizationId",
+                    type: z.string(),
+                    required: true,
+                    description: "The corresponding API Hub (formerly SwaggerHub) organization UUID.",
+                },
+                {
+                    name: "openapiRenderer",
+                    type: z.string(),
+                    required: false,
+                    description: "Portal level setting for the OpenAPI renderer. SWAGGER_UI - Use the Swagger UI renderer. ELEMENTS - Use the Elements renderer. TOGGLE - Switch between the two renderers with elements set as the default.",
+                },
+                {
+                    name: "pageContentFormat",
+                    type: z.string(),
+                    required: false,
+                    description: "The format of the page content.",
+                }
+            ],
         }, async (args, _extra) => {
-            const response = await this.createPortal(args);
+            const createPortalArgs = args;
+            const response = await this.createPortal(createPortalArgs);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("get_portal", "Retrieve information about a specific portal.", { portalId: z.string().describe("Portal UUID or subdomain.") }, async (args, _extra) => {
-            const response = await this.getPortal(args.portalId);
+        register({
+            title: "Get Portal",
+            summary: "Retrieve information about a specific portal.",
+            parameters: [
+                {
+                    name: "portalId",
+                    type: z.string(),
+                    description: "Portal UUID or subdomain.",
+                    required: true
+                },
+            ],
+        }, async (args, _extra) => {
+            const portalArgs = args;
+            const response = await this.getPortal(portalArgs.portalId);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("delete_portal", "Delete a portal.", { portalId: z.string().describe("Portal UUID or subdomain.") }, async (args, _extra) => {
-            await this.deletePortal(args.portalId);
+        register({
+            title: "Delete Portal",
+            summary: "Delete a specific portal.",
+            parameters: [
+                {
+                    name: "portalId",
+                    type: z.string(),
+                    description: "Portal UUID or subdomain.",
+                    required: true
+                }
+            ],
+        }, async (args, _extra) => {
+            const portalArgs = args;
+            await this.deletePortal(portalArgs.portalId);
             return {
                 content: [{ type: "text", text: "Portal deleted successfully." }],
             };
         });
-        server.tool("update_portal", "Update a specific portal's configuration", {
-            portalId: z.string().describe("Portal UUID or subdomain."),
-            name: z.string().optional().describe("The portal name."),
-            subdomain: z.string().optional().describe("The portal subdomain."),
-            customDomain: z.boolean().optional().describe("Indicates if the portal has a custom domain."),
-            gtmKey: z.string().optional().describe("Google Tag Manager key for the portal."),
-            offline: z.boolean().optional().describe("If set to true the portal will not be visible to customers."),
-            routing: z.string().optional().describe("Determines the routing strategy ('browser' or 'proxy')."),
-            credentialsEnabled: z.boolean().optional().describe("Indicates if credentials are enabled for the portal."),
-            openapiRenderer: z.string().optional().describe("Portal level setting for the OpenAPI renderer. SWAGGER_UI - Use the Swagger UI renderer. ELEMENTS - Use the Elements renderer. TOGGLE - Switch between the two renderers with elements set as the default."),
-            pageContentFormat: z.string().optional().describe("The format of the page content.")
+        register({
+            title: "Update Portal",
+            summary: "Update a specific portal's configuration.",
+            parameters: [
+                {
+                    name: "portalId",
+                    type: z.string(),
+                    description: "Portal UUID or subdomain.",
+                    required: true
+                },
+                {
+                    name: "name",
+                    type: z.string(),
+                    description: "The portal name.",
+                    required: false
+                },
+                {
+                    name: "subdomain",
+                    type: z.string(),
+                    description: "The portal subdomain.",
+                    required: false
+                },
+                {
+                    name: "customDomain",
+                    type: z.boolean(),
+                    description: "Indicates if the portal has a custom domain.",
+                    required: false
+                },
+                {
+                    name: "gtmKey",
+                    type: z.string(),
+                    description: "Google Tag Manager key for the portal.",
+                    required: false
+                },
+                {
+                    name: "offline",
+                    type: z.boolean(),
+                    description: "If set to true the portal will not be visible to customers.",
+                    required: false
+                },
+                {
+                    name: "routing",
+                    type: z.string(),
+                    description: "Determines the routing strategy ('browser' or 'proxy').",
+                    required: false
+                },
+                {
+                    name: "credentialsEnabled",
+                    type: z.boolean(),
+                    description: "Indicates if credentials are enabled for the portal.",
+                    required: false
+                },
+                {
+                    name: "openapiRenderer",
+                    type: z.string(),
+                    description: "Portal level setting for the OpenAPI renderer. SWAGGER_UI - Use the Swagger UI renderer. ELEMENTS - Use the Elements renderer. TOGGLE - Switch between the two renderers with elements set as the default.",
+                    required: false
+                },
+                {
+                    name: "pageContentFormat",
+                    type: z.string(),
+                    description: "The format of the page content.",
+                    required: false
+                }
+            ],
         }, async (args, _extra) => {
-            const response = await this.updatePortal(args.portalId, args);
+            const updatePortalArgs = args;
+            const response = await this.updatePortal(updatePortalArgs.portalId, updatePortalArgs);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("list_portal_products", "Get products for a specific portal that match your criteria.", { portalId: z.string().describe("Portal UUID or subdomain.") }, async (args, _extra) => {
-            const response = await this.getPortalProducts(args.portalId);
+        register({
+            title: "List Portal Products",
+            summary: "Get products for a specific portal that match your criteria.",
+            parameters: [
+                {
+                    name: "portalId",
+                    type: z.string(),
+                    description: "Portal UUID or subdomain.",
+                    required: true
+                }
+            ],
+        }, async (args, _extra) => {
+            const portalArgs = args;
+            const response = await this.getPortalProducts(portalArgs.portalId);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("create_portal_product", "Create a new product for a specific portal.", {
-            portalId: z.string().describe("Portal UUID or subdomain."),
-            type: z.string().describe("Product type (Allowed values: 'new', 'copy')."),
-            name: z.string().describe("Product name."),
-            slug: z.string().describe("URL component for this product. Must be unique within the portal."),
-            description: z.string().optional().describe("Product description."),
-            public: z.boolean().optional().describe("Indicates if the product is public."),
-            hidden: z.string().optional().describe("Indicates if the product is hidden."),
-            role: z.boolean().optional().describe("Indicates if the product has a role.")
+        register({
+            title: "Create Portal Product",
+            summary: "Create a new product for a specific portal.",
+            parameters: [
+                {
+                    name: "portalId",
+                    type: z.string(),
+                    description: "Portal UUID or subdomain.",
+                    required: true
+                },
+                {
+                    name: "type",
+                    type: z.string(),
+                    description: "Product type (Allowed values: 'new', 'copy').",
+                    required: true
+                },
+                {
+                    name: "name",
+                    type: z.string(),
+                    description: "Product name.",
+                    required: true
+                },
+                {
+                    name: "slug",
+                    type: z.string(),
+                    description: "URL component for this product. Must be unique within the portal.",
+                    required: true
+                },
+                {
+                    name: "description",
+                    type: z.string(),
+                    description: "Product description.",
+                    required: false
+                },
+                {
+                    name: "public",
+                    type: z.boolean(),
+                    description: "Indicates if the product is public.",
+                    required: false
+                },
+                {
+                    name: "hidden",
+                    type: z.string(),
+                    description: "Indicates if the product is hidden.",
+                    required: false
+                },
+                {
+                    name: "role",
+                    type: z.boolean(),
+                    description: "Indicates if the product has a role.",
+                    required: false
+                }
+            ],
         }, async (args, _extra) => {
-            const response = await this.createPortalProduct(args.portalId, args);
+            const createProductArgs = args;
+            const response = await this.createPortalProduct(createProductArgs.portalId, createProductArgs);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("get_portal_product", "Retrieve information about a specific product resource.", { productId: z.string().describe("Product UUID, or identifier in the format.") }, async (args, _extra) => {
-            const response = await this.getPortalProduct(args.productId);
+        register({
+            title: "Get Portal Product",
+            summary: "Retrieve information about a specific product resource.",
+            parameters: [
+                {
+                    name: "productId",
+                    type: z.string(),
+                    description: "Product UUID, or identifier in the format.",
+                    required: true
+                }
+            ],
+        }, async (args, _extra) => {
+            const productArgs = args;
+            const response = await this.getPortalProduct(productArgs.productId);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };
         });
-        server.tool("delete_portal_product", "Delete a product from a specific portal", { productId: z.string().describe("Product UUID, or identifier in the format.") }, async (args, _extra) => {
-            await this.deletePortalProduct(args.productId);
+        register({
+            title: "Delete Portal Product",
+            summary: "Delete a product from a specific portal",
+            parameters: [
+                {
+                    name: "productId",
+                    type: z.string(),
+                    description: "Product UUID, or identifier in the format.",
+                    required: true
+                }
+            ],
+        }, async (args, _extra) => {
+            const productArgs = args;
+            await this.deletePortalProduct(productArgs.productId);
             return {
                 content: [{ type: "text", text: "Product deleted successfully." }],
             };
         });
-        server.tool("update_portal_product", "Update a product's settings within a specific portal.", {
-            productId: z.string().describe("Product UUID, or identifier in the format."),
-            name: z.string().optional().describe("Product name."),
-            slug: z.string().optional().describe("URL component for this product. Must be unique within the portal."),
-            description: z.string().optional().describe("Product description."),
-            public: z.boolean().optional().describe("Indicates if the product is public."),
-            hidden: z.string().optional().describe("Indicates if the product is hidden.")
+        register({
+            title: "Update Portal Product",
+            summary: "Update a product's settings within a specific portal.",
+            parameters: [
+                {
+                    name: "productId",
+                    type: z.string(),
+                    description: "Product UUID, or identifier in the format.",
+                    required: true
+                },
+                {
+                    name: "name",
+                    type: z.string(),
+                    description: "Product name.",
+                    required: false
+                },
+                {
+                    name: "slug",
+                    type: z.string(),
+                    description: "URL component for this product. Must be unique within the portal.",
+                    required: false
+                },
+                {
+                    name: "description",
+                    type: z.string(),
+                    description: "Product description.",
+                    required: false
+                },
+                {
+                    name: "public",
+                    type: z.boolean(),
+                    description: "Indicates if the product is public.",
+                    required: false
+                },
+                {
+                    name: "hidden",
+                    type: z.string(),
+                    description: "Indicates if the product is hidden.",
+                    required: false
+                }
+            ],
         }, async (args, _extra) => {
-            const response = await this.updatePortalProduct(args.productId, args);
+            const updateProductArgs = args;
+            const response = await this.updatePortalProduct(updateProductArgs.productId, updateProductArgs);
             return {
                 content: [{ type: "text", text: JSON.stringify(response) }],
             };

package/dist/common/server.js

@@ -0,0 +1,145 @@
+import { McpServer, ResourceTemplate } from "@modelcontextprotocol/sdk/server/mcp.js";
+import { ZodAny, ZodArray, ZodBoolean, ZodEnum, ZodLiteral, ZodNumber, ZodObject, ZodString, ZodUnion, } from "zod";
+import Bugsnag from "../common/bugsnag.js";
+import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from "./info.js";
+export class SmartBearMcpServer extends McpServer {
+    constructor() {
+        super({
+            name: MCP_SERVER_NAME,
+            version: MCP_SERVER_VERSION,
+        }, {
+            capabilities: {
+                resources: { listChanged: true }, // Server supports dynamic resource lists
+                tools: { listChanged: true }, // Server supports dynamic tool lists
+            },
+        });
+    }
+    addClient(client) {
+        client.registerTools((params, cb) => {
+            const toolName = `${client.prefix}_${params.title.replace(/\s+/g, "_").toLowerCase()}`;
+            const toolTitle = `${client.name}: ${params.title}`;
+            return super.registerTool(toolName, {
+                title: toolTitle,
+                description: this.getDescription(params),
+                inputSchema: this.getInputSchema(params),
+                annotations: this.getAnnotations(toolTitle, params),
+            }, async (args, extra) => {
+                try {
+                    return await cb(args, extra);
+                }
+                catch (e) {
+                    Bugsnag.notify(e);
+                    throw e;
+                }
+            });
+        }, (params, options) => {
+            return this.server.elicitInput(params, options);
+        });
+        if (client.registerResources) {
+            client.registerResources((name, path, cb) => {
+                return super.registerResource(name, new ResourceTemplate(`${client.prefix}://${name}/${path}`, { list: undefined }), {}, async (url, variables, extra) => {
+                    try {
+                        return await cb(url, variables, extra);
+                    }
+                    catch (e) {
+                        Bugsnag.notify(e);
+                        throw e;
+                    }
+                });
+            });
+        }
+    }
+    getAnnotations(toolTitle, params) {
+        const annotations = {
+            title: toolTitle,
+            readOnlyHint: params.readOnly ?? true,
+            destructiveHint: params.destructive ?? false,
+            idempotentHint: params.idempotent ?? true,
+            openWorldHint: params.openWorld ?? false,
+        };
+        return annotations;
+    }
+    getInputSchema(params) {
+        const args = {};
+        for (const param of params.parameters ?? []) {
+            args[param.name] = param.type;
+            if (param.description) {
+                args[param.name] = args[param.name].describe(param.description);
+            }
+            if (!param.required) {
+                args[param.name] = args[param.name].optional();
+            }
+        }
+        if (params.zodSchema && params.zodSchema instanceof ZodObject) {
+            for (const key of Object.keys(params.zodSchema.shape)) {
+                const field = params.zodSchema.shape[key];
+                args[key] = field;
+                if (field.description) {
+                    args[key] = args[key].describe(field.description);
+                }
+                if (field.isOptional()) {
+                    args[key] = args[key].optional();
+                }
+            }
+        }
+        return args;
+    }
+    getDescription(params) {
+        const { summary, useCases, examples, parameters, zodSchema, hints, outputFormat } = params;
+        let description = summary;
+        // Parameters if available otherwise use zodSchema
+        if ((parameters ?? []).length > 0) {
+            description += `\n\n**Parameters:**\n${parameters?.map(p => `- ${p.name} (${this.getReadableTypeName(p.type)})${p.required ? ' *required*' : ''}` +
+                `${p.description ? `: ${p.description}` : ''}` +
+                `${p.examples ? ` (e.g. ${p.examples.join(', ')})` : ''}` +
+                `${p.constraints ? `\n  - ${p.constraints.join('\n  - ')}` : ''}`).join('\n')}`;
+        }
+        if (zodSchema && zodSchema instanceof ZodObject) {
+            description += "\n\n**Parameters:**\n";
+            for (const key of Object.keys(zodSchema.shape)) {
+                const field = zodSchema.shape[key];
+                description += this.formatParameterDescription(key, field);
+            }
+        }
+        if (outputFormat) {
+            description += `\n\n**Output Format:** ${outputFormat}`;
+        }
+        // Use Cases
+        if (useCases && useCases.length > 0) {
+            description += `\n\n**Use Cases:** ${useCases.map((uc, i) => `${i + 1}. ${uc}`).join(' ')}`;
+        }
+        // Examples
+        if (examples && examples.length > 0) {
+            description += `\n\n**Examples:**\n` + examples.map((ex, idx) => `${idx + 1}. ${ex.description}\n\`\`\`json\n${JSON.stringify(ex.parameters, null, 2)}\n\`\`\`${ex.expectedOutput ? `\nExpected Output: ${ex.expectedOutput}` : ''}`).join('\n\n');
+        }
+        // Hints
+        if (hints && hints.length > 0) {
+            description += `\n\n**Hints:** ${hints.map((hint, i) => `${i + 1}. ${hint}`).join(' ')}`;
+        }
+        return description.trim();
+    }
+    formatParameterDescription(key, field) {
+        return `- ${key} (${this.getReadableTypeName(field)})${field.isOptional() ? '' : ' *required*'}${field.description ? `: ${field.description}` : ''}${key === "examples" && field instanceof ZodEnum ? ` (e.g. ${Object.keys(field.enum).join(', ')})` : ''}${key === "constraints" && field instanceof ZodEnum ? `\n  - ${Object.keys(field.enum).join('\n  - ')}` : ''} \n`;
+    }
+    getReadableTypeName(zodType) {
+        if (zodType instanceof ZodString)
+            return 'string';
+        if (zodType instanceof ZodNumber)
+            return 'number';
+        if (zodType instanceof ZodBoolean)
+            return 'boolean';
+        if (zodType instanceof ZodArray)
+            return 'array';
+        if (zodType instanceof ZodObject)
+            return 'object';
+        if (zodType instanceof ZodEnum)
+            return 'enum';
+        if (zodType instanceof ZodLiteral)
+            return 'literal';
+        if (zodType instanceof ZodUnion)
+            return 'union';
+        if (zodType instanceof ZodAny)
+            return 'any';
+        return 'any';
+    }
+}

package/dist/index.js

@@ -1,11 +1,11 @@
 #!/usr/bin/env node
-import { McpServer } from "@modelcontextprotocol/sdk/server/mcp.js";
 import { StdioServerTransport } from "@modelcontextprotocol/sdk/server/stdio.js";
 import Bugsnag from "./common/bugsnag.js";
-import { MCP_SERVER_NAME, MCP_SERVER_VERSION } from "./common/info.js";
 import { InsightHubClient } from "./insight-hub/client.js";
 import { ReflectClient } from "./reflect/client.js";
 import { ApiHubClient } from "./api-hub/client.js";
+import { SmartBearMcpServer } from "./common/server.js";
+import { PactflowClient } from "./pactflow/client.js";
 // This is used to report errors in the MCP server itself
 // If you want to use your own BugSnag API key, set the MCP_SERVER_INSIGHT_HUB_API_KEY environment variable
 const McpServerBugsnagAPIKey = process.env.MCP_SERVER_INSIGHT_HUB_API_KEY;
@@ -13,36 +13,45 @@ if (McpServerBugsnagAPIKey) {
     Bugsnag.start(McpServerBugsnagAPIKey);
 }
 async function main() {
-    const server = new McpServer({
-        name: MCP_SERVER_NAME,
-        version: MCP_SERVER_VERSION,
-    }, {
-        capabilities: {
-            resources: { listChanged: true }, // Server supports dynamic resource lists
-            tools: { listChanged: true }, // Server supports dynamic tool lists
-        },
-    });
+    const server = new SmartBearMcpServer();
     const reflectToken = process.env.REFLECT_API_TOKEN;
     const insightHubToken = process.env.INSIGHT_HUB_AUTH_TOKEN;
     const apiHubToken = process.env.API_HUB_API_KEY;
-    if (!reflectToken && !insightHubToken && !apiHubToken) {
-        console.error("Please set one of REFLECT_API_TOKEN, INSIGHT_HUB_AUTH_TOKEN or API_HUB_API_KEY environment variables");
-        process.exit(1);
-    }
+    const pactBrokerToken = process.env.PACT_BROKER_TOKEN;
+    const pactBrokerUrl = process.env.PACT_BROKER_BASE_URL;
+    const pactBrokerUsername = process.env.PACT_BROKER_USERNAME;
+    const pactBrokerPassword = process.env.PACT_BROKER_PASSWORD;
+    let client_defined = false;
     if (reflectToken) {
-        const reflectClient = new ReflectClient(reflectToken);
-        reflectClient.registerTools(server);
-        reflectClient.registerResources(server);
+        server.addClient(new ReflectClient(reflectToken));
+        client_defined = true;
     }
     if (insightHubToken) {
         const insightHubClient = new InsightHubClient(insightHubToken, process.env.INSIGHT_HUB_PROJECT_API_KEY, process.env.INSIGHT_HUB_ENDPOINT);
         await insightHubClient.initialize();
-        insightHubClient.registerTools(server);
-        insightHubClient.registerResources(server);
+        server.addClient(insightHubClient);
+        client_defined = true;
     }
     if (apiHubToken) {
-        const apiHubClient = new ApiHubClient(apiHubToken);
-        apiHubClient.registerTools(server);
+        server.addClient(new ApiHubClient(apiHubToken));
+        client_defined = true;
+    }
+    if (pactBrokerUrl) {
+        if (pactBrokerToken) {
+            server.addClient(new PactflowClient(pactBrokerToken, pactBrokerUrl, "pactflow"));
+            client_defined = true;
+        }
+        else if (pactBrokerUsername && pactBrokerPassword) {
+            server.addClient(new PactflowClient({ username: pactBrokerUsername, password: pactBrokerPassword }, pactBrokerUrl, "pact_broker"));
+            client_defined = true;
+        }
+        else {
+            console.error("If the Pact Broker base URL is specified, you must specify either (a) a PactFlow token, or (b) a Pact Broker username and password pair.");
+        }
+    }
+    if (!client_defined) {
+        console.error("Please set one of REFLECT_API_TOKEN, INSIGHT_HUB_AUTH_TOKEN, API_HUB_API_KEY or PACT_BROKER_BASE_URL / (and relevant Pact auth) environment variables");
+        process.exit(1);
     }
     const transport = new StdioServerTransport();
     await server.connect(transport);

package/dist/insight-hub/client/api/CurrentUser.js

@@ -1,7 +1,7 @@
 import { BaseAPI, pickFieldsFromArray } from './base.js';
 // --- API Class ---
 export class CurrentUserAPI extends BaseAPI {
-    static organizationFields = ['id', 'name'];
+    static organizationFields = ['id', 'name', 'slug'];
     static projectFields = ['id', 'name', 'slug', 'api_key'];
     constructor(configuration) {
         super(configuration);
@@ -25,7 +25,10 @@ export class CurrentUserAPI extends BaseAPI {
             url,
         }, paginate);
         // Only return allowed fields
-        return pickFieldsFromArray(data, CurrentUserAPI.organizationFields);
+        return {
+            ...data,
+            body: pickFieldsFromArray(data.body || [], CurrentUserAPI.organizationFields)
+        };
     }
     /**
      * List projects for a given organization
@@ -49,6 +52,9 @@ export class CurrentUserAPI extends BaseAPI {
             url,
         }, paginate);
         // Only return allowed fields
-        return pickFieldsFromArray(data, CurrentUserAPI.projectFields);
+        return {
+            ...data,
+            body: pickFieldsFromArray(data.body || [], CurrentUserAPI.projectFields)
+        };
     }
 }