docusaurus-theme-openapi-docs 0.0.0-1004 → 0.0.0-1006

package/lib/theme/ApiExplorer/buildPostmanRequest.js

@@ -379,9 +379,8 @@ function buildPostmanRequest(
     }
     clonedPostman.url.host = [url];
   }
-  setQueryParams(clonedPostman, queryParams);
-  setPathParams(clonedPostman, pathParams);
-  const cookie = buildCookie(cookieParams);
+  const enhancedQueryParams = [...queryParams];
+  const enhancedCookieParams = [...cookieParams];
   let otherHeaders = [];
   let selectedAuth = [];
   if (auth.selected !== undefined) {
@@ -434,23 +433,41 @@ function buildPostmanRequest(
       });
       continue;
     }
-    // API Key
+    // API Key in header
     if (a.type === "apiKey" && a.in === "header") {
       const { apiKey } = auth.data[a.key];
-      if (apiKey === undefined) {
-        otherHeaders.push({
-          key: a.name,
-          value: `<${a.name ?? a.type}>`,
-        });
-        continue;
-      }
       otherHeaders.push({
         key: a.name,
-        value: apiKey,
+        value: apiKey || `<${a.name ?? a.type}>`,
+      });
+      continue;
+    }
+    // API Key in query
+    if (a.type === "apiKey" && a.in === "query") {
+      const { apiKey } = auth.data[a.key];
+      enhancedQueryParams.push({
+        name: a.name,
+        in: "query",
+        value: apiKey || `<${a.name ?? a.type}>`,
+      });
+      continue;
+    }
+    // API Key in cookie
+    if (a.type === "apiKey" && a.in === "cookie") {
+      const { apiKey } = auth.data[a.key];
+      enhancedCookieParams.push({
+        name: a.name,
+        in: "cookie",
+        value: apiKey || `<${a.name ?? a.type}>`,
       });
       continue;
     }
   }
+  // Use the enhanced params that might include API keys
+  setQueryParams(clonedPostman, enhancedQueryParams);
+  setPathParams(clonedPostman, pathParams);
+  // Use enhanced cookie params that might include API keys
+  const cookie = buildCookie(enhancedCookieParams);
   setHeaders(
     clonedPostman,
     contentType,

package/lib/theme/Schema/index.js

@@ -114,10 +114,7 @@ const AnyOneOf = ({ schema, schemaType }) => {
           react_1.default.createElement(
             TabItem_1.default,
             { key: index, label: label, value: `${index}-item-properties` },
-            (["string", "number", "integer", "boolean"].includes(
-              anyOneSchema.type
-            ) ||
-              anyOneSchema.const) &&
+            (isPrimitive(anyOneSchema) || anyOneSchema.const) &&
               react_1.default.createElement(SchemaItem_1.default, {
                 collapsible: false,
                 name: undefined,
@@ -884,3 +881,13 @@ const SchemaNode = ({ schema, schemaType }) => {
   return renderChildren(schema, schemaType);
 };
 exports.default = SchemaNode;
+const PRIMITIVE_TYPES = {
+  string: true,
+  number: true,
+  integer: true,
+  boolean: true,
+  null: true,
+};
+const isPrimitive = (schema) => {
+  return PRIMITIVE_TYPES[schema.type];
+};

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "docusaurus-theme-openapi-docs",
   "description": "OpenAPI theme for Docusaurus.",
-  "version": "0.0.0-1004",
+  "version": "0.0.0-1006",
   "license": "MIT",
   "keywords": [
     "openapi",
@@ -36,7 +36,7 @@
     "@types/lodash": "^4.14.176",
     "@types/pako": "^2.0.3",
     "concurrently": "^5.2.0",
-    "docusaurus-plugin-openapi-docs": "0.0.0-1004",
+    "docusaurus-plugin-openapi-docs": "0.0.0-1006",
     "docusaurus-plugin-sass": "^0.2.3",
     "eslint-plugin-prettier": "^5.0.1"
   },
@@ -79,5 +79,5 @@
   "engines": {
     "node": ">=14"
   },
-  "gitHead": "6c6f8eca76a5407f7896a4141ac9d104f75a5970"
+  "gitHead": "e73c0b0cead279cb3771b546adc1caebabf336ae"
 }

package/src/theme/ApiExplorer/buildPostmanRequest.ts

@@ -430,10 +430,9 @@ function buildPostmanRequest(
     clonedPostman.url.host = [url];
   }
 
-  setQueryParams(clonedPostman, queryParams);
-  setPathParams(clonedPostman, pathParams);
+  const enhancedQueryParams = [...queryParams];
+  const enhancedCookieParams = [...cookieParams];
 
-  const cookie = buildCookie(cookieParams);
   let otherHeaders = [];
 
   let selectedAuth: Scheme[] = [];
@@ -491,24 +490,46 @@ function buildPostmanRequest(
       continue;
     }
 
-    // API Key
+    // API Key in header
     if (a.type === "apiKey" && a.in === "header") {
       const { apiKey } = auth.data[a.key];
-      if (apiKey === undefined) {
-        otherHeaders.push({
-          key: a.name,
-          value: `<${a.name ?? a.type}>`,
-        });
-        continue;
-      }
       otherHeaders.push({
         key: a.name,
-        value: apiKey,
+        value: apiKey || `<${a.name ?? a.type}>`,
+      });
+      continue;
+    }
+
+    // API Key in query
+    if (a.type === "apiKey" && a.in === "query") {
+      const { apiKey } = auth.data[a.key];
+      enhancedQueryParams.push({
+        name: a.name,
+        in: "query",
+        value: apiKey || `<${a.name ?? a.type}>`,
+      });
+      continue;
+    }
+
+    // API Key in cookie
+    if (a.type === "apiKey" && a.in === "cookie") {
+      const { apiKey } = auth.data[a.key];
+      enhancedCookieParams.push({
+        name: a.name,
+        in: "cookie",
+        value: apiKey || `<${a.name ?? a.type}>`,
       });
       continue;
     }
   }
 
+  // Use the enhanced params that might include API keys
+  setQueryParams(clonedPostman, enhancedQueryParams);
+  setPathParams(clonedPostman, pathParams);
+
+  // Use enhanced cookie params that might include API keys
+  const cookie = buildCookie(enhancedCookieParams);
+
   setHeaders(
     clonedPostman,
     contentType,

package/src/theme/Schema/index.tsx

@@ -21,7 +21,10 @@ import {
   getQualifierMessage,
   getSchemaName,
 } from "docusaurus-plugin-openapi-docs/lib/markdown/schema";
-import { SchemaObject } from "docusaurus-plugin-openapi-docs/lib/openapi/types";
+import {
+  SchemaObject,
+  SchemaType,
+} from "docusaurus-plugin-openapi-docs/lib/openapi/types";
 import isEmpty from "lodash/isEmpty";
 
 // eslint-disable-next-line import/no-extraneous-dependencies
@@ -122,10 +125,7 @@ const AnyOneOf: React.FC<SchemaProps> = ({ schema, schemaType }) => {
               value={`${index}-item-properties`}
             >
               {/* Handle primitive types directly */}
-              {(["string", "number", "integer", "boolean"].includes(
-                anyOneSchema.type
-              ) ||
-                anyOneSchema.const) && (
+              {(isPrimitive(anyOneSchema) || anyOneSchema.const) && (
                 <SchemaItem
                   collapsible={false}
                   name={undefined}
@@ -938,3 +938,17 @@ const SchemaNode: React.FC<SchemaProps> = ({ schema, schemaType }) => {
 };
 
 export default SchemaNode;
+
+type PrimitiveSchemaType = Exclude<SchemaType, "object" | "array">;
+
+const PRIMITIVE_TYPES: Record<PrimitiveSchemaType, true> = {
+  string: true,
+  number: true,
+  integer: true,
+  boolean: true,
+  null: true,
+} as const;
+
+const isPrimitive = (schema: SchemaObject) => {
+  return PRIMITIVE_TYPES[schema.type as PrimitiveSchemaType];
+};