bump libraries, in particular upgrading identity server to v7

AerisG222 · Feb 23, 2024 · f1e6a95 · f1e6a95
1 parent 263ae34
commit f1e6a95
Show file tree

Hide file tree

Showing 11 changed files with 32 additions and 68 deletions.
diff --git a/src/Maw.Cache/Maw.Cache.csproj b/src/Maw.Cache/Maw.Cache.csproj
@@ -10,7 +10,7 @@
 
     <ItemGroup>
         <PackageReference Include="Microsoft.Extensions.DependencyInjection" Version="8.0.0" />
-        <PackageReference Include="StackExchange.Redis" Version="2.7.10" />
+        <PackageReference Include="StackExchange.Redis" Version="2.7.20" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Maw.Data/Maw.Data.csproj b/src/Maw.Data/Maw.Data.csproj
@@ -14,9 +14,9 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Dapper" Version="2.1.24" />
+        <PackageReference Include="Dapper" Version="2.1.28" />
         <PackageReference Include="MiniProfiler.AspNetCore.Mvc" Version="4.3.8" />
-        <PackageReference Include="Npgsql" Version="8.0.1" />
+        <PackageReference Include="Npgsql" Version="8.0.2" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/src/Maw.Domain/Maw.Domain.csproj b/src/Maw.Domain/Maw.Domain.csproj
@@ -18,12 +18,12 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="Google.Apis.Gmail.v1" Version="1.64.0.3231" />
+        <PackageReference Include="Google.Apis.Gmail.v1" Version="1.67.0.3287" />
         <PackageReference Include="IdentityModel" Version="6.2.0" />
         <PackageReference Include="MailKit" Version="4.3.0" />
         <PackageReference Include="MedallionShell" Version="1.6.2" />
         <PackageReference Include="Microsoft.FeatureManagement" Version="3.1.1" />
-        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.1" />
+        <PackageReference Include="SixLabors.ImageSharp" Version="3.1.2" />
         <PackageReference Include="SolrNet.Core" Version="1.1.1" />
     </ItemGroup>
 

diff --git a/src/api/api.csproj b/src/api/api.csproj
@@ -14,10 +14,10 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.JwtBearer" Version="8.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.SignalR.Protocols.MessagePack" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
-        <PackageReference Include="NSwag.AspNetCore" Version="14.0.0-preview012" />
+        <PackageReference Include="NSwag.AspNetCore" Version="14.0.3" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
         <PackageReference Include="SolrNet.Core" Version="1.1.1" />
         <PackageReference Include="SolrNet.Microsoft.DependencyInjection" Version="1.1.1" />

diff --git a/src/auth/Models/Config.cs b/src/auth/Models/Config.cs
@@ -12,21 +12,18 @@ public class Config
 
     readonly string _wwwUrl;
     readonly string _wwwSecret;
-    readonly string _photosUrl;
     readonly string _filesUrl;
     readonly string _photosSolidUrl;
 
-    public Config(string wwwUrl, string wwwSecret, string photosUrl, string filesUrl, string photosSolidUrl)
+    public Config(string wwwUrl, string wwwSecret, string filesUrl, string photosSolidUrl)
     {
         ArgumentNullException.ThrowIfNull(wwwUrl);
         ArgumentNullException.ThrowIfNull(wwwSecret);
-        ArgumentNullException.ThrowIfNull(photosUrl);
         ArgumentNullException.ThrowIfNull(filesUrl);
         ArgumentNullException.ThrowIfNull(photosSolidUrl);
 
         _wwwUrl = wwwUrl;
         _wwwSecret = wwwSecret;
-        _photosUrl = photosUrl;
         _filesUrl = filesUrl;
         _photosSolidUrl = photosSolidUrl;
     }
@@ -125,47 +122,14 @@ public IEnumerable<Client> GetClients()
                 // AbsoluteRefreshTokenLifetime = 20
             },
             new Client
-            {
-                ClientId = "maw-photos",
-                ClientName = "mikeandwan.us Photo Application",
-                AllowedGrantTypes = GrantTypes.Code,
-                RequireClientSecret = false,
-                AllowAccessTokensViaBrowser = true,
-                AllowOfflineAccess = true,
-                RedirectUris = new List<string>
-                {
-                    $"{_photosUrl}/login",
-                    $"{_photosUrl}/silent-refresh.html"
-                },
-                PostLogoutRedirectUris = new List<string>
-                {
-                    $"{_photosUrl}/signout-callback.html"
-                },
-                AllowedCorsOrigins = new List<string>
-                {
-                    _photosUrl
-                },
-                AllowedScopes = new List<string>
-                {
-                    IdentityServerConstants.StandardScopes.OfflineAccess,
-                    IdentityServerConstants.StandardScopes.OpenId,
-                    IdentityServerConstants.StandardScopes.Profile,
-
-                    // apis
-                    "maw_api",
-
-                    // identity resources
-                    JwtClaimTypes.Role
-                }
-            },
-            new Client
             {
                 ClientId = "maw-photos-solid",
                 ClientName = "mikeandwan.us Photo Application",
                 AllowedGrantTypes = GrantTypes.Code,
                 RequireClientSecret = false,
                 AllowAccessTokensViaBrowser = true,
                 AllowOfflineAccess = true,
+                RefreshTokenUsage = TokenUsage.ReUse,
                 RedirectUris = new List<string>
                 {
                     $"{_photosSolidUrl}/login/handle-response"
@@ -199,6 +163,7 @@ public IEnumerable<Client> GetClients()
                 RequireClientSecret = false,
                 AllowAccessTokensViaBrowser = true,
                 AllowOfflineAccess = true,
+                RefreshTokenUsage = TokenUsage.ReUse,
                 RedirectUris = new List<string>
                 {
                     $"{_filesUrl}/login",

diff --git a/src/auth/Startup.cs b/src/auth/Startup.cs
@@ -39,7 +39,6 @@ public void ConfigureServices(IServiceCollection services)
         var config = new Config(
             _config["Environment:WwwUrl"] ?? throw new InvalidOperationException("www url cannot be null!"),
             _config["Environment:WwwClientSecret"] ?? throw new InvalidOperationException("www client secret cannot be null!"),
-            _config["Environment:PhotosUrl"] ?? throw new InvalidOperationException("photos url cannot be null!"),
             _config["Environment:FilesUrl"] ?? throw new InvalidOperationException("files url cannot be null!"),
             _config["Environment:PhotosSolidUrl"] ?? throw new InvalidOperationException("photos-solid url cannot be null!"));
 

diff --git a/src/auth/auth.csproj b/src/auth/auth.csproj
@@ -14,15 +14,15 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Duende.IdentityServer" Version="6.3.7" />
-        <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="6.3.7" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.0" />
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.0" />
+        <PackageReference Include="Duende.IdentityServer" Version="7.0.1" />
+        <PackageReference Include="Duende.IdentityServer.AspNetIdentity" Version="7.0.1" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="8.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.MicrosoftAccount" Version="8.0.2" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.Twitter" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
         <PackageReference Include="AspNet.Security.OAuth.GitHub" Version="8.0.0" />
-        <PackageReference Include="Dapper" Version="2.1.24" />
-        <PackageReference Include="Npgsql" Version="8.0.1" />
+        <PackageReference Include="Dapper" Version="2.1.28" />
+        <PackageReference Include="Npgsql" Version="8.0.2" />
         <PackageReference Include="NWebsec.AspNetCore.Middleware" Version="3.0.0" />
     </ItemGroup>
 

diff --git a/src/www/www.csproj b/src/www/www.csproj
@@ -14,7 +14,7 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="8.0.2" />
         <PackageReference Include="Microsoft.Extensions.Hosting.Systemd" Version="8.0.0" />
         <PackageReference Include="IdentityModel" Version="6.2.0" />
         <PackageReference Include="Microsoft.FeatureManagement.AspNetCore" Version="3.1.1" />

diff --git a/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj b/tests/Maw.Cache.Tests/Maw.Cache.Tests.csproj
@@ -8,14 +8,14 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="StackExchange.Redis" Version="2.7.10" />
-        <PackageReference Include="xunit" Version="2.6.4" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="StackExchange.Redis" Version="2.7.20" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>

diff --git a/tests/Maw.Data.Tests/Maw.Data.Tests.csproj b/tests/Maw.Data.Tests/Maw.Data.Tests.csproj
@@ -7,16 +7,16 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.4" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="xunit.analyzers" Version="1.8.0" />
+        <PackageReference Include="xunit.analyzers" Version="1.11.0" />
     </ItemGroup>
 
     <ItemGroup>

diff --git a/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj b/tests/Maw.Domain.Models.Tests/Maw.Domain.Models.Tests.csproj
@@ -8,13 +8,13 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.8.0" />
-        <PackageReference Include="xunit" Version="2.6.4" />
-        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.6">
+        <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.9.0" />
+        <PackageReference Include="xunit" Version="2.7.0" />
+        <PackageReference Include="xunit.runner.visualstudio" Version="2.5.7">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>
-        <PackageReference Include="coverlet.collector" Version="6.0.0">
+        <PackageReference Include="coverlet.collector" Version="6.0.1">
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
             <PrivateAssets>all</PrivateAssets>
         </PackageReference>