Skip to content

Fix CSharp client BaseUrl usage #5113

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
MaximBalaganskiy wants to merge 1 commit into
base: master
Choose a base branch
from
+7 −10
Open

Fix CSharp client BaseUrl usage #5113

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 7 additions & 10 deletions src/NSwag.CodeGeneration.CSharp/Templates/Client.Class.liquid
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,12 +2,6 @@
[System.CodeDom.Compiler.GeneratedCode("NSwag", "{{ ToolchainVersion }}")]
{{ ClientClassAccessModifier }} partial class {{ Class }} {% if HasBaseType %}: {% endif %}{% if HasBaseClass %}{{ BaseClass }}{% if GenerateClientInterfaces %}, {% endif %}{% endif %}{% if GenerateClientInterfaces %}I{{ Class }}{% endif %}
{
{% if UseBaseUrl -%}
#pragma warning disable 8618
private string _baseUrl;
#pragma warning restore 8618

{% endif -%}
{% if InjectHttpClient -%}
private {{ HttpClientType }} _httpClient;
{% endif -%}
Expand Down Expand Up @@ -47,9 +41,9 @@
{% assign lastUrlCharIndex = baseUrlLength | minus: 1 -%}
{% assign lastUrlChar = BaseUrl | slice: lastUrlCharIndex, 1 -%}
{% if lastUrlChar == "/" -%}
_baseUrl = "{{ BaseUrl }}";
BaseUrl = "{{ BaseUrl }}";
{% else -%}
_baseUrl = "{{ BaseUrl }}/";
BaseUrl = "{{ BaseUrl }}/";
{% endif -%}
{% endif -%}
{% endif -%}
Expand All @@ -58,7 +52,7 @@
BaseUrl = baseUrl;
{% else -%}
{% if HasConfigurationClass == false -%}
_baseUrl = (string.IsNullOrEmpty(baseUrl) || baseUrl.EndsWith("/"))
BaseUrl = (string.IsNullOrEmpty(baseUrl) || baseUrl.EndsWith("/"))
? baseUrl
: baseUrl + "/";
{% endif -%}
Expand Down Expand Up @@ -88,6 +82,9 @@
}

{% if UseBaseUrl and GenerateBaseUrlProperty -%}
#pragma warning disable 8618
private string _baseUrl;
#pragma warning restore 8618
public string BaseUrl
{
get { return _baseUrl; }
Expand Down Expand Up @@ -295,7 +292,7 @@
{% endif -%}

var urlBuilder_ = new System.Text.StringBuilder();
{% if UseBaseUrl %}if (!string.IsNullOrEmpty(_baseUrl)) urlBuilder_.Append(_baseUrl);{% endif %}
{% if UseBaseUrl %}if (!string.IsNullOrEmpty(BaseUrl)) urlBuilder_.Append(BaseUrl);{% endif %}
// Operation Path: "{{ operation.Path }}"
{% if operation.Path contains "{" -%}
{% assign pathParts = operation.Path | split: "{" -%}
Expand Down
Loading