Skip to content

Commit c4163dc

Browse files
unchaseunchase
committed
build: Update dependencies: update System.Text.Encodings.Web to v4.7.2
feat: Add option for accepting all untrusted certificates on the first wizard page
1 parent b6c2ffc commit c4163dc

File tree

10 files changed

+47
-10
lines changed

10 files changed

+47
-10
lines changed

‎CHANGELOG.md‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,6 +7,11 @@
77

88
These are the changes to each version that has been released on the official [Visual Studio extension gallery](https://marketplace.visualstudio.com/items?itemName=unchase.UnchaseOpenAPIConnectedService).
99

10+
## v1.5.21 `(2021-04-28)`
11+
12+
- [x] Update dependencies: update System.Text.Encodings.Web to v4.7.2
13+
- [x] Add option for accepting all untrusted certificates on the first wizard page
14+
1015
## v1.5.20 `(2021-04-13)`
1116

1217
- [x] Update dependencies: add support for [Microsoft.OpenApi.OData v1.0.7](https://www.nuget.org/packages/Microsoft.OpenApi.OData/1.0.7)

‎src/Models/ServiceConfiguration.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@ internal class ServiceConfiguration
1111

1212
public string ServiceName { get; set; }
1313

14+
public bool AcceptAllUntrustedCertificates { get; set; }
15+
1416
public string GeneratedFileName { get; set; }
1517

1618
public string Endpoint { get; set; }

‎src/Models/UserSettings.cs‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -69,6 +69,9 @@ internal class UserSettings
6969
[DataMember]
7070
public OpenApiSpecVersion OpenApiSpecVersion { get; set; }
7171

72+
[DataMember]
73+
public bool AcceptAllUntrustedCertificates { get; set; } = true;
74+
7275
public string ProjectPath { get; set; }
7376

7477
#endregion
@@ -98,6 +101,7 @@ internal void SetFromServiceConfiguration(ServiceConfiguration serviceConfigurat
98101
this.OpenGeneratedFilesOnComplete = serviceConfiguration.OpenGeneratedFilesOnComplete;
99102
this.Runtime = serviceConfiguration.Runtime;
100103
this.ServiceName = serviceConfiguration.ServiceName;
104+
this.AcceptAllUntrustedCertificates = serviceConfiguration.AcceptAllUntrustedCertificates;
101105
this.GeneratedFileName = serviceConfiguration.GeneratedFileName;
102106
this.UseRelativePath = serviceConfiguration.UseRelativePath;
103107
this.ConvertFromOdata = serviceConfiguration.ConvertFromOdata;

‎src/Properties/AssemblyInfo.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
// You can specify all the values or you can default the Build and Revision Numbers
3131
// by using the '*' as shown below:
3232
// [assembly: AssemblyVersion("1.2.*")]
33-
[assembly: AssemblyVersion("1.5.20")]
34-
[assembly: AssemblyFileVersion("1.5.20.0")]
33+
[assembly: AssemblyVersion("1.5.21")]
34+
[assembly: AssemblyFileVersion("1.5.21.0")]
3535
[assembly: NeutralResourcesLanguage("en-US")]
3636

‎src/Unchase.OpenAPI.ConnectedService.csproj‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -529,7 +529,7 @@
529529
</Reference>
530530
<Reference Include="System" />
531531
<Reference Include="System.Buffers, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
532-
<HintPath>packages\System.Buffers.4.5.0\lib\netstandard2.0\System.Buffers.dll</HintPath>
532+
<HintPath>packages\System.Buffers.4.5.1\lib\net461\System.Buffers.dll</HintPath>
533533
</Reference>
534534
<Reference Include="System.Collections.Immutable, Version=1.2.3.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
535535
<Reference Include="System.ComponentModel.Annotations, Version=4.2.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -565,7 +565,7 @@
565565
<HintPath>packages\System.IO.Pipelines.4.6.0\lib\netstandard2.0\System.IO.Pipelines.dll</HintPath>
566566
</Reference>
567567
<Reference Include="System.Memory, Version=4.0.1.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
568-
<HintPath>packages\System.Memory.4.5.3\lib\netstandard2.0\System.Memory.dll</HintPath>
568+
<HintPath>packages\System.Memory.4.5.4\lib\net461\System.Memory.dll</HintPath>
569569
</Reference>
570570
<Reference Include="System.Net" />
571571
<Reference Include="System.Net.Http, Version=4.1.1.3, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
@@ -607,8 +607,8 @@
607607
<Reference Include="System.Text.Encoding.CodePages, Version=4.1.1.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a, processorArchitecture=MSIL">
608608
<HintPath>packages\System.Text.Encoding.CodePages.4.5.1\lib\net461\System.Text.Encoding.CodePages.dll</HintPath>
609609
</Reference>
610-
<Reference Include="System.Text.Encodings.Web, Version=4.0.4.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
611-
<HintPath>packages\System.Text.Encodings.Web.4.6.0\lib\netstandard2.0\System.Text.Encodings.Web.dll</HintPath>
610+
<Reference Include="System.Text.Encodings.Web, Version=4.0.5.1, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
611+
<HintPath>packages\System.Text.Encodings.Web.4.7.2\lib\net461\System.Text.Encodings.Web.dll</HintPath>
612612
</Reference>
613613
<Reference Include="System.Text.Json, Version=4.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
614614
<HintPath>packages\System.Text.Json.4.6.0\lib\net461\System.Text.Json.dll</HintPath>

‎src/ViewModels/ConfigOpenApiEndpointViewModel.cs‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,18 @@ internal class ConfigOpenApiEndpointViewModel : ConnectedServiceWizardPage
2727

2828
public string ServiceName { get; set; }
2929

30+
private bool _acceptAllUntrustedCertificates;
31+
public bool AcceptAllUntrustedCertificates
32+
{
33+
get => _acceptAllUntrustedCertificates;
34+
set
35+
{
36+
_acceptAllUntrustedCertificates = value;
37+
UserSettings.AcceptAllUntrustedCertificates = value;
38+
OnPropertyChanged(nameof(AcceptAllUntrustedCertificates));
39+
}
40+
}
41+
3042
public string GeneratedFileName { get; set; }
3143

3244
public string SpecificationTempPath { get; set; }
@@ -89,6 +101,7 @@ public ConfigOpenApiEndpointViewModel(UserSettings userSettings, Wizard wizard)
89101
this.View = new ConfigOpenApiEndpoint(this.InternalWizard) {DataContext = this};
90102
this.UserSettings = userSettings;
91103
this.ServiceName = string.IsNullOrWhiteSpace(userSettings.ServiceName) ? Constants.DefaultServiceName : userSettings.ServiceName;
104+
this.AcceptAllUntrustedCertificates = userSettings.AcceptAllUntrustedCertificates;
92105
this.GeneratedFileName = string.IsNullOrWhiteSpace(userSettings.GeneratedFileName) ? Constants.DefaultGeneratedFileName : userSettings.GeneratedFileName;
93106
this.Endpoint = userSettings.Endpoint;
94107
this.UseNetworkCredentials = false;
@@ -179,6 +192,9 @@ internal async Task<string> GetSpecificationAsync()
179192
this.NetworkCredentialsPassword, this.NetworkCredentialsDomain);
180193
}
181194

195+
if (this.UserSettings.AcceptAllUntrustedCertificates)
196+
ServicePointManager.ServerCertificateValidationCallback += (sender, certificate, chain, sslPolicyErrors) => true;
197+
182198
using (var httpClient = new HttpClient(httpHandler))
183199
{
184200
var specificationEndpoint = await httpClient.GetStringAsync(this.UserSettings.Endpoint);

‎src/Views/ConfigOpenApiEndpoint.xaml‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -124,6 +124,14 @@
124124
FontWeight="Bold"
125125
IsChecked="{Binding Path=UserSettings.OpenGeneratedFilesOnComplete, Mode=TwoWay}" />
126126

127+
<CheckBox
128+
x:Name="AcceptAllUntrustedCertificates"
129+
Margin="20,5,10,5"
130+
HorizontalAlignment="Stretch"
131+
Content="Accept all untrusted certificates."
132+
FontWeight="Bold"
133+
IsChecked="{Binding Path=UserSettings.AcceptAllUntrustedCertificates, Mode=TwoWay}" />
134+
127135
<TextBlock
128136
Margin="0,5,10,5"
129137
HorizontalAlignment="Stretch"

‎src/Wizard.cs‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@ public Wizard(ConnectedServiceProviderContext context)
6565
var serviceConfig = this.Context.GetExtendedDesignerData<ServiceConfiguration>();
6666
ConfigOpenApiEndpointViewModel.Endpoint = serviceConfig.Endpoint;
6767
ConfigOpenApiEndpointViewModel.ServiceName = serviceConfig.ServiceName;
68+
ConfigOpenApiEndpointViewModel.AcceptAllUntrustedCertificates = serviceConfig.AcceptAllUntrustedCertificates;
6869
ConfigOpenApiEndpointViewModel.GeneratedFileName = serviceConfig.GeneratedFileName;
6970
ConfigOpenApiEndpointViewModel.UseWebProxy = serviceConfig.UseWebProxy;
7071
ConfigOpenApiEndpointViewModel.NetworkCredentialsDomain = serviceConfig.NetworkCredentialsDomain;
@@ -208,6 +209,7 @@ private ServiceConfiguration CreateServiceConfiguration()
208209
var serviceConfiguration = new ServiceConfiguration
209210
{
210211
ServiceName = string.IsNullOrWhiteSpace(ConfigOpenApiEndpointViewModel.UserSettings.ServiceName) ? Constants.DefaultServiceName : ConfigOpenApiEndpointViewModel.UserSettings.ServiceName,
212+
AcceptAllUntrustedCertificates = ConfigOpenApiEndpointViewModel.UserSettings.AcceptAllUntrustedCertificates,
211213
GeneratedFileName = string.IsNullOrWhiteSpace(ConfigOpenApiEndpointViewModel.UserSettings.GeneratedFileName) ? Constants.DefaultGeneratedFileName : ConfigOpenApiEndpointViewModel.UserSettings.GeneratedFileName,
212214
Endpoint = ConfigOpenApiEndpointViewModel.UserSettings.Endpoint,
213215
GeneratedFileNamePrefix = CSharpClientSettingsViewModel.GeneratedFileName,

‎src/packages.config‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@
132132
<package id="stdole" version="7.0.3303" targetFramework="net461" />
133133
<package id="StreamJsonRpc" version="1.3.23" targetFramework="net472" />
134134
<package id="System.AppContext" version="4.3.0" targetFramework="net461" />
135-
<package id="System.Buffers" version="4.5.0" targetFramework="net461" />
135+
<package id="System.Buffers" version="4.5.1" targetFramework="net461" />
136136
<package id="System.Collections" version="4.3.0" targetFramework="net461" />
137137
<package id="System.Collections.Concurrent" version="4.3.0" targetFramework="net461" />
138138
<package id="System.Collections.Immutable" version="1.6.0" targetFramework="net461" />
@@ -155,7 +155,7 @@
155155
<package id="System.IO.Pipelines" version="4.6.0" targetFramework="net461" />
156156
<package id="System.Linq" version="4.3.0" targetFramework="net461" />
157157
<package id="System.Linq.Expressions" version="4.3.0" targetFramework="net461" />
158-
<package id="System.Memory" version="4.5.3" targetFramework="net461" />
158+
<package id="System.Memory" version="4.5.4" targetFramework="net461" />
159159
<package id="System.Net.Http" version="4.3.4" targetFramework="net461" />
160160
<package id="System.Net.Primitives" version="4.3.1" targetFramework="net461" />
161161
<package id="System.Net.Sockets" version="4.3.0" targetFramework="net461" />
@@ -182,7 +182,7 @@
182182
<package id="System.Text.Encoding" version="4.3.0" targetFramework="net461" />
183183
<package id="System.Text.Encoding.CodePages" version="4.5.1" targetFramework="net461" />
184184
<package id="System.Text.Encoding.Extensions" version="4.3.0" targetFramework="net461" />
185-
<package id="System.Text.Encodings.Web" version="4.6.0" targetFramework="net461" />
185+
<package id="System.Text.Encodings.Web" version="4.7.2" targetFramework="net461" />
186186
<package id="System.Text.Json" version="4.6.0" targetFramework="net461" />
187187
<package id="System.Text.RegularExpressions" version="4.3.1" targetFramework="net461" />
188188
<package id="System.Threading" version="4.3.0" targetFramework="net461" />

‎src/source.extension.vsixmanifest‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<PackageManifest Version="2.0.0" xmlns="http://schemas.microsoft.com/developer/vsx-schema/2011" xmlns:d="http://schemas.microsoft.com/developer/vsx-schema-design/2011">
33
<Metadata>
4-
<Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.20" Language="en-US" Publisher="Unchase" />
4+
<Identity Id="Unchase.Openapi.ConnectedService.63199638-6211-4285-ba8f-75b1f0326c2a" Version="1.5.21" Language="en-US" Publisher="Unchase" />
55
<DisplayName>Unchase OpenAPI (Swagger) Connected Service</DisplayName>
66
<Description xml:space="preserve">Connected service for Visual Studio to generate OpenAPI (Swagger) web service reference.</Description>
77
<MoreInfo>https://github.com/unchase/Unchase.OpenAPI.Connectedservice</MoreInfo>

0 commit comments

Comments
 (0)