Merge pull request #2027 from abpframework/maliming/patch-3

Upgrade Ocelot to support net core 3.0

samples/MicroserviceDemo/applications/AuthServer.Host/AuthServerDataSeeder.cs

@@ -117,6 +117,7 @@ namespace AuthServer.Host
                 commonScopes.Union(new[] { "BackendAdminAppGateway", "IdentityService", "ProductService" }),
                 new[] { "hybrid" },
                 commonSecret,
+                permissions: new[] { IdentityPermissions.Users.Default, "ProductManagement.Product" },
                 redirectUri: "http://localhost:51954/signin-oidc",
                 postLogoutRedirectUri: "http://localhost:51954/signout-callback-oidc"
             );

samples/MicroserviceDemo/applications/BackendAdminApp.Host/BackendAdminAppHostModule.cs

@@ -54,7 +54,6 @@ namespace BackendAdminApp.Host
                 })
                 .AddCookie("Cookies", options =>
                 {
-                    options.Cookie.Expiration = TimeSpan.FromDays(365);
                     options.ExpireTimeSpan = TimeSpan.FromDays(365);
                 })
                 .AddOpenIdConnect("oidc", options =>
@@ -100,6 +99,7 @@ namespace BackendAdminApp.Host
             app.UseVirtualFiles();
             app.UseRouting();
             app.UseAuthentication();
+            app.UseAuthorization();
             app.UseAbpRequestLocalization();
             app.UseSwagger();
             app.UseSwaggerUI(options =>

samples/MicroserviceDemo/applications/PublicWebSite.Host/PublicWebSiteHostModule.cs

@@ -52,7 +52,6 @@ namespace PublicWebSite.Host
                 })
                 .AddCookie("Cookies", options =>
                 {
-                    options.Cookie.Expiration = TimeSpan.FromDays(365);
                     options.ExpireTimeSpan = TimeSpan.FromDays(365);
                 })
                 .AddOpenIdConnect("oidc", options =>

samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGateway.Host.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
-    <PackageReference Include="Ocelot" Version="13.5.2" />
+    <PackageReference Include="Ocelot" Version="13.8.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />

samples/MicroserviceDemo/gateways/BackendAdminAppGateway.Host/BackendAdminAppGatewayHostModule.cs

@@ -103,7 +103,11 @@ namespace BackendAdminAppGateway.Host
             app.MapWhen(
                 ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") ||
                        ctx.Request.Path.ToString().StartsWith("/Abp/"),
-                app2 => { app2.UseMvcWithDefaultRouteAndArea(); }
+                app2 =>
+                {
+                    app2.UseRouting();
+                    app2.UseMvcWithDefaultRouteAndArea();
+                }
             );
 
             app.UseOcelot().Wait();

samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGateway.Host.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
-    <PackageReference Include="Ocelot" Version="13.5.2" />
+    <PackageReference Include="Ocelot" Version="13.8.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />

samples/MicroserviceDemo/gateways/InternalGateway.Host/InternalGatewayHostModule.cs

@@ -94,7 +94,11 @@ namespace InternalGateway.Host
                     ctx.Request.Path.ToString().StartsWith("/api/abp/") ||
                     ctx.Request.Path.ToString().StartsWith("/Abp/") ||
                     ctx.Request.Path.ToString().StartsWith("/Test/"),
-                app2 => { app2.UseMvcWithDefaultRouteAndArea(); }
+                app2 =>
+                {
+                    app2.UseRouting();
+                    app2.UseMvcWithDefaultRouteAndArea();
+                }
             );
 
             app.UseOcelot().Wait();

samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGateway.Host.csproj

@@ -16,7 +16,7 @@
     <PackageReference Include="Serilog.Sinks.File" Version="4.0.0" />
     <PackageReference Include="Serilog.Sinks.Elasticsearch" Version="6.5.0" />
     <PackageReference Include="Swashbuckle.AspNetCore" Version="5.0.0-rc4" />
-    <PackageReference Include="Ocelot" Version="13.5.2" />
+    <PackageReference Include="Ocelot" Version="13.8.0" />
     <PackageReference Include="IdentityServer4.AccessTokenValidation" Version="3.0.0" />
     <PackageReference Include="Microsoft.Extensions.Caching.StackExchangeRedis" Version="3.0.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="3.0.0" />

samples/MicroserviceDemo/gateways/PublicWebSiteGateway.Host/PublicWebSiteGatewayHostModule.cs

@@ -90,7 +90,11 @@ namespace PublicWebSiteGateway.Host
             app.MapWhen(
                 ctx => ctx.Request.Path.ToString().StartsWith("/api/abp/") ||
                        ctx.Request.Path.ToString().StartsWith("/Abp/"),
-                app2 => { app2.UseMvcWithDefaultRouteAndArea(); }
+                app2 =>
+                {
+                    app2.UseRouting();
+                    app2.UseMvcWithDefaultRouteAndArea();
+                }
             );
 
             app.UseOcelot().Wait();