Skip to content

Commit 758ccea

Browse files
authored
Merge pull request #27 from Project-MONAI/vchang/depdec
Update dependency decisions & fix warnings
2 parents d1e0faf + c70c131 commit 758ccea

File tree

4 files changed

+46
-29
lines changed

4 files changed

+46
-29
lines changed

doc/dependency_decisions.yml

+6-6
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,14 @@
1818
- :who: mocsharp
1919
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
2020
:versions:
21-
- 6.0.11
21+
- 6.0.12
2222
:when: 2022-10-14 23:36:49.751931025 Z
2323
- - :approve
2424
- Microsoft.AspNetCore.TestHost
2525
- :who: mocsharp
2626
:why: MIT (https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
2727
:versions:
28-
- 6.0.11
28+
- 6.0.12
2929
:when: 2022-10-14 23:36:49.751931025 Z
3030
- - :approve
3131
- Microsoft.CSharp
@@ -39,7 +39,7 @@
3939
- :who: mocsharp
4040
:why: MIT (https://github.com/microsoft/vstest/raw/main/LICENSE)
4141
:versions:
42-
- 17.4.0
42+
- 17.4.1
4343
:when: 2022-08-16 23:05:48.342748414 Z
4444
- - :approve
4545
- Microsoft.Extensions.Configuration
@@ -256,7 +256,7 @@
256256
- :who: mocsharp
257257
:why: MIT (https://github.com/raw/microsoft/vstest/main/LICENSE)
258258
:versions:
259-
- 17.4.0
259+
- 17.4.1
260260
:when: 2022-09-01 23:06:13.008314524 Z
261261
- - :approve
262262
- Microsoft.NETCore.Platforms
@@ -277,14 +277,14 @@
277277
- :who: mocsharp
278278
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
279279
:versions:
280-
- 17.4.0
280+
- 17.4.1
281281
:when: 2022-08-16 23:06:16.175705981 Z
282282
- - :approve
283283
- Microsoft.TestPlatform.TestHost
284284
- :who: mocsharp
285285
:why: MIT (https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
286286
:versions:
287-
- 17.4.0
287+
- 17.4.1
288288
:when: 2022-08-16 23:06:17.671459450 Z
289289
- - :approve
290290
- Microsoft.Win32.Primitives

src/Authentication/Configurations/AuthenticationOptions.cs

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 MONAI Consortium
2+
* Copyright 2023 MONAI Consortium
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -106,7 +106,7 @@ private void ValidateClaims(List<ClaimMapping> claims, bool validateEndpoints)
106106
}
107107
}
108108

109-
if (validateEndpoints && claim.Endpoints.IsNullOrEmpty())
109+
if (validateEndpoints && claim.Endpoints!.IsNullOrEmpty())
110110
{
111111
throw new InvalidOperationException("Value for claimType is invalid.");
112112
}

src/Authentication/Middleware/BasicAuthorizationMiddleware.cs

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright 2022 MONAI Consortium
2+
* Copyright 2023 MONAI Consortium
33
*
44
* Licensed under the Apache License, Version 2.0 (the "License");
55
* you may not use this file except in compliance with the License.
@@ -59,11 +59,11 @@ public async Task InvokeAsync(HttpContext httpContext)
5959
var authHeader = AuthenticationHeaderValue.Parse(httpContext.Request.Headers["Authorization"]);
6060
if (authHeader.Scheme == "Basic")
6161
{
62-
var credentialBytes = Convert.FromBase64String(authHeader.Parameter);
62+
var credentialBytes = Convert.FromBase64String(authHeader.Parameter ?? "");
6363
var credentials = Encoding.UTF8.GetString(credentialBytes).Split(':', 2);
6464
var username = credentials[0];
6565
var password = credentials[1];
66-
if (string.Compare(username, _options.Value.BasicAuth.Id, false) is 0 &&
66+
if (string.Compare(username, _options.Value.BasicAuth!.Id, false) is 0 &&
6767
string.Compare(password, _options.Value.BasicAuth.Password, false) is 0)
6868
{
6969
var claims = new[] { new Claim("name", credentials[0]) };

third-party-licenses.md

+35-18
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,20 @@
1+
<!--
2+
Copyright 2023 MONAI Consortium
3+
4+
Licensed under the Apache License, Version 2.0 (the "License");
5+
you may not use this file except in compliance with the License.
6+
You may obtain a copy of the License at
7+
8+
http://www.apache.org/licenses/LICENSE-2.0
9+
10+
Unless required by applicable law or agreed to in writing, software
11+
distributed under the License is distributed on an "AS IS" BASIS,
12+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
See the License for the specific language governing permissions and
14+
limitations under the License.
15+
-->
16+
17+
118
# Third-Party Licenses
219

320

@@ -123,14 +140,14 @@ SOFTWARE.
123140

124141

125142
<details>
126-
<summary>Microsoft.AspNetCore.Authentication.JwtBearer 6.0.11</summary>
143+
<summary>Microsoft.AspNetCore.Authentication.JwtBearer 6.0.12</summary>
127144

128145
## Microsoft.AspNetCore.Authentication.JwtBearer
129146

130-
- Version: 6.0.11
147+
- Version: 6.0.12
131148
- Authors: Microsoft
132149
- Project URL: https://asp.net/
133-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.JwtBearer/6.0.11)
150+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.AspNetCore.Authentication.JwtBearer/6.0.12)
134151
- License: [MIT](https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
135152

136153

@@ -164,14 +181,14 @@ SOFTWARE.
164181

165182

166183
<details>
167-
<summary>Microsoft.AspNetCore.TestHost 6.0.11</summary>
184+
<summary>Microsoft.AspNetCore.TestHost 6.0.12</summary>
168185

169186
## Microsoft.AspNetCore.TestHost
170187

171-
- Version: 6.0.11
188+
- Version: 6.0.12
172189
- Authors: Microsoft
173190
- Project URL: https://asp.net/
174-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.AspNetCore.TestHost/6.0.11)
191+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.AspNetCore.TestHost/6.0.12)
175192
- License: [MIT](https://github.com/dotnet/aspnetcore/raw/main/LICENSE.txt)
176193

177194

@@ -247,15 +264,15 @@ SOFTWARE.
247264

248265

249266
<details>
250-
<summary>Microsoft.CodeCoverage 17.4.0</summary>
267+
<summary>Microsoft.CodeCoverage 17.4.1</summary>
251268

252269
## Microsoft.CodeCoverage
253270

254-
- Version: 17.4.0
271+
- Version: 17.4.1
255272
- Authors: Microsoft
256273
- Owners: Microsoft
257274
- Project URL: https://github.com/microsoft/vstest/
258-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.CodeCoverage/17.4.0)
275+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.CodeCoverage/17.4.1)
259276
- License: [MIT](https://github.com/microsoft/vstest/raw/main/LICENSE)
260277

261278

@@ -1505,15 +1522,15 @@ SOFTWARE.
15051522

15061523

15071524
<details>
1508-
<summary>Microsoft.NET.Test.Sdk 17.4.0</summary>
1525+
<summary>Microsoft.NET.Test.Sdk 17.4.1</summary>
15091526

15101527
## Microsoft.NET.Test.Sdk
15111528

1512-
- Version: 17.4.0
1529+
- Version: 17.4.1
15131530
- Authors: Microsoft
15141531
- Owners: Microsoft
15151532
- Project URL: https://github.com/microsoft/vstest/
1516-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/17.4.0)
1533+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.NET.Test.Sdk/17.4.1)
15171534
- License: [MIT](https://github.com/raw/microsoft/vstest/main/LICENSE)
15181535

15191536

@@ -1943,15 +1960,15 @@ consequential or other damages.
19431960

19441961

19451962
<details>
1946-
<summary>Microsoft.TestPlatform.ObjectModel 17.4.0</summary>
1963+
<summary>Microsoft.TestPlatform.ObjectModel 17.4.1</summary>
19471964

19481965
## Microsoft.TestPlatform.ObjectModel
19491966

1950-
- Version: 17.4.0
1967+
- Version: 17.4.1
19511968
- Authors: Microsoft
19521969
- Owners: Microsoft
19531970
- Project URL: https://github.com/microsoft/vstest/
1954-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.0)
1971+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.TestPlatform.ObjectModel/17.4.1)
19551972
- License: [MIT](https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
19561973

19571974

@@ -1981,15 +1998,15 @@ SOFTWARE.
19811998

19821999

19832000
<details>
1984-
<summary>Microsoft.TestPlatform.TestHost 17.4.0</summary>
2001+
<summary>Microsoft.TestPlatform.TestHost 17.4.1</summary>
19852002

19862003
## Microsoft.TestPlatform.TestHost
19872004

1988-
- Version: 17.4.0
2005+
- Version: 17.4.1
19892006
- Authors: Microsoft
19902007
- Owners: Microsoft
19912008
- Project URL: https://github.com/microsoft/vstest/
1992-
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.TestPlatform.TestHost/17.4.0)
2009+
- Source: [NuGet](https://www.nuget.org/packages/Microsoft.TestPlatform.TestHost/17.4.1)
19932010
- License: [MIT](https://github.com/microsoft/vstest/raw/v17.4.0/LICENSE)
19942011

19952012

0 commit comments

Comments
 (0)