fix: missing baseurl on import openapi

hoppscotch · Sep 8, 2023 · dfd1bb3 · dfd1bb3
1 parent 1431ecc
commit dfd1bb3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/packages/hoppscotch-common/src/helpers/import-export/import/index.ts b/packages/hoppscotch-common/src/helpers/import-export/import/index.ts
@@ -58,7 +58,7 @@ type HoppImporterDefinition<T, Y, E> = {
 export const defineImporter = <ReturnType, StepType, Errors>(input: {
   id: string
   name: string
-  icon: Component
+  icon: object | Component
   importer: HoppImporter<ReturnType, StepType, Errors>
   applicableTo: HoppImporterApplicableTo
   steps: StepType

diff --git a/packages/hoppscotch-common/src/helpers/import-export/import/openapi.ts b/packages/hoppscotch-common/src/helpers/import-export/import/openapi.ts
@@ -195,7 +195,7 @@ const parseOpenAPIV3Body = (
   // We only take the first definition
   const [contentType, media]: [
     string,
-    OpenAPIV3.MediaTypeObject | OpenAPIV31.MediaTypeObject,
+    OpenAPIV3.MediaTypeObject | OpenAPIV31.MediaTypeObject
   ] = objs[0]
 
   return contentType in knownContentTypes
@@ -514,6 +514,17 @@ const parseOpenAPIAuth = (
     ? parseOpenAPIV3Auth(doc as OpenAPIV3.Document | OpenAPIV31.Document, op)
     : parseOpenAPIV2Auth(doc as OpenAPIV2.Document, op)
 
+const parseOpenAPIUrl = (doc: OpenAPI.Document): string => {
+  let url = ""
+  if (objectHasProperty(doc, "host")) {
+    url += doc.host
+  }
+  if (objectHasProperty(doc, "basePath")) {
+    url += doc.basePath
+  }
+  return url
+}
+
 const convertPathToHoppReqs = (
   doc: OpenAPI.Document,
   pathName: string,
@@ -535,7 +546,9 @@ const convertPathToHoppReqs = (
       makeRESTRequest({
         name: info.operationId ?? info.summary ?? "Untitled Request",
         method: method.toUpperCase(),
-        endpoint: `<<baseUrl>>${replaceOpenApiPathTemplating(pathName)}`, // TODO: Make this proper
+        endpoint: `${parseOpenAPIUrl(doc)}${replaceOpenApiPathTemplating(
+          pathName
+        )}`,
 
         // We don't need to worry about reference types as the Dereferencing pass should remove them
         params: parseOpenAPIParams(