From ce2275b67d340578a207b125a38a3d9bb9edaf8f Mon Sep 17 00:00:00 2001
From: derberg <lpgornicki@gmail.com>
Date: Tue, 28 Mar 2023 14:40:27 +0200
Subject: [PATCH 1/2] fix: rename filter to the existing one

---
 template/config/common.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/template/config/common.yml b/template/config/common.yml
index d29d8ba8..1a4a3a18 100644
--- a/template/config/common.yml
+++ b/template/config/common.yml
@@ -4,7 +4,7 @@ default:
     version: {{ asyncapi.info().version() }}
 {% if asyncapi.server(params.server).protocol() === "ws" %}
   ws:
-    port: {{ asyncapi.server(params.server).url() | replaceVariablesWithValues(asyncapi.server(params.server).variables()) | port(80) }}
+    port: {{ asyncapi.server(params.server).url() | replaceServerVariablesWithValues(asyncapi.server(params.server).variables()) | port(80) }}
     path: /ws
     topicSeparator: '__'
 {% endif %}

From 77e8801ac05e65cb54a7c36c4938fa89f3235426 Mon Sep 17 00:00:00 2001
From: derberg <lpgornicki@gmail.com>
Date: Tue, 28 Mar 2023 15:36:20 +0200
Subject: [PATCH 2/2] fix config parsing for ws

---
 filters/all.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/filters/all.js b/filters/all.js
index ee6f786f..91b0603d 100644
--- a/filters/all.js
+++ b/filters/all.js
@@ -176,7 +176,11 @@ function getConfig(p) {
   let protocol = p;
   let configName = 'broker';
 
-  if (p === 'ws') configName = 'ws';
+  if (p === 'ws') {
+    configName = 'ws';
+    return `config.${configName}`;
+  }
+
   if (p === 'kafka-secure') protocol = 'kafka';
 
   return `config.${configName}.${protocol}`;