From 4e6a73ada1fc16522ecb592b41323f5380b40069 Mon Sep 17 00:00:00 2001 From: Pavel Kuzmin Date: Mon, 13 Nov 2023 12:12:41 +0500 Subject: [PATCH] fix --- dist/module.json | 2 +- dist/runtime/templates/OpenApiTemplateNuxt2.vue | 10 ++++++++++ package-lock.json | 4 ++-- package.json | 2 +- playground2/docs/openapi/webhook.yaml | 2 ++ src/runtime/templates/OpenApiTemplateNuxt2.vue | 10 ++++++++++ 6 files changed, 26 insertions(+), 4 deletions(-) diff --git a/dist/module.json b/dist/module.json index c39b75d7e..b31972e3f 100644 --- a/dist/module.json +++ b/dist/module.json @@ -1,5 +1,5 @@ { "name": "nuxt-open-api-docs", "configKey": "openApiDocs", - "version": "4.7.5" + "version": "4.7.6" } \ No newline at end of file diff --git a/dist/runtime/templates/OpenApiTemplateNuxt2.vue b/dist/runtime/templates/OpenApiTemplateNuxt2.vue index 874955dd0..4b65945ae 100644 --- a/dist/runtime/templates/OpenApiTemplateNuxt2.vue +++ b/dist/runtime/templates/OpenApiTemplateNuxt2.vue @@ -218,6 +218,16 @@ export default { } } + if (this.activeWebhook) { + if(this.activeWebhook.servers && this.activeWebhook.servers[0]) { + return this.activeWebhook.servers[0].url ?? null + } + + if(this.activeWebhook[this.type] && this.activePath[this.type].servers && this.activeWebhook[this.type].servers[0]) { + return this.activeWebhook[this.type].servers[0].url ?? null + } + } + let currentServer = this.currentServer; if (currentServer > 0 && this.options.doc.servers && !this.options.doc.servers[currentServer]) { diff --git a/package-lock.json b/package-lock.json index ded315304..217806ee8 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nuxt-openapi-docs-module", - "version": "4.7.4", + "version": "4.7.6", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nuxt-openapi-docs-module", - "version": "4.7.4", + "version": "4.7.6", "license": "MIT", "dependencies": { "@nuxt/kit": "3.2.3", diff --git a/package.json b/package.json index 94a4e6cd2..6f262329f 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nuxt-openapi-docs-module", - "version": "4.7.5", + "version": "4.7.6", "description": "A plugin for Nuxt.js to generate pages from OpenAPI specifications", "homepage": "https://github.com/on-org/nuxt-openapi-docs-module#readme", "scripts": { diff --git a/playground2/docs/openapi/webhook.yaml b/playground2/docs/openapi/webhook.yaml index 44fc73aaa..895e8d0b5 100644 --- a/playground2/docs/openapi/webhook.yaml +++ b/playground2/docs/openapi/webhook.yaml @@ -8,6 +8,8 @@ webhooks: newPet: # This is a Path Item Object, the only difference is that the request is initiated by the API provider post: + servers: + - url: 'https://{ourserver.com}/' requestBody: description: Information about a new pet in the system content: diff --git a/src/runtime/templates/OpenApiTemplateNuxt2.vue b/src/runtime/templates/OpenApiTemplateNuxt2.vue index 2be0bfb5a..41e06adda 100644 --- a/src/runtime/templates/OpenApiTemplateNuxt2.vue +++ b/src/runtime/templates/OpenApiTemplateNuxt2.vue @@ -218,6 +218,16 @@ export default { } } + if (this.activeWebhook) { + if(this.activeWebhook.servers && this.activeWebhook.servers[0]) { + return this.activeWebhook.servers[0].url ?? null + } + + if(this.activeWebhook[this.type] && this.activePath[this.type].servers && this.activeWebhook[this.type].servers[0]) { + return this.activeWebhook[this.type].servers[0].url ?? null + } + } + let currentServer = this.currentServer; if (currentServer > 0 && this.options.doc.servers && !this.options.doc.servers[currentServer]) {