Update samples

dotnetcore · Nov 11, 2023 · d94e2a0 · d94e2a0
1 parent 88f10da
commit d94e2a0
Show file tree

Hide file tree

Showing 3 changed files with 60 additions and 43 deletions.
diff --git a/samples/Sample.Dashboard.Auth/Properties/launchSettings.json b/samples/Sample.Dashboard.Auth/Properties/launchSettings.json
@@ -0,0 +1,28 @@
+{
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:49319/",
+      "sslPort": 44328
+    }
+  },
+  "profiles": {
+    "IIS Express": {
+      "commandName": "IISExpress",
+      "launchBrowser": true,
+      "launchUrl": "cap",
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      }
+    },
+    "Sample.Dashboard.Auth": {
+      "commandName": "Project",
+      "launchBrowser": true,
+      "environmentVariables": {
+        "ASPNETCORE_ENVIRONMENT": "Development"
+      },
+      "applicationUrl": "https://localhost:5001"
+    }
+  }
+}
diff --git a/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj b/samples/Sample.Dashboard.Auth/Sample.Dashboard.Auth.csproj
@@ -6,12 +6,12 @@
 
     <ItemGroup>
         <ProjectReference Include="..\..\src\DotNetCore.CAP.Dashboard\DotNetCore.CAP.Dashboard.csproj" />
-        <ProjectReference Include="..\..\src\DotNetCore.CAP.MySql\DotNetCore.CAP.MySql.csproj" />
-        <ProjectReference Include="..\..\src\DotNetCore.CAP.RabbitMQ\DotNetCore.CAP.RabbitMQ.csproj" />
+        <ProjectReference Include="..\..\src\DotNetCore.CAP.InMemoryStorage\DotNetCore.CAP.InMemoryStorage.csproj" />
         <ProjectReference Include="..\..\src\DotNetCore.CAP\DotNetCore.CAP.csproj" />
     </ItemGroup>
 
     <ItemGroup>
         <PackageReference Include="Microsoft.AspNetCore.Authentication.OpenIdConnect" Version="7.0.4" />
+        <PackageReference Include="Savorboard.CAP.InMemoryMessageQueue" Version="7.0.0" />
     </ItemGroup>
 </Project>
diff --git a/samples/Sample.Dashboard.Auth/Startup.cs b/samples/Sample.Dashboard.Auth/Startup.cs
@@ -1,53 +1,47 @@
 using Microsoft.AspNetCore.Authentication.Cookies;
 using Microsoft.AspNetCore.Authentication.OpenIdConnect;
 using Microsoft.AspNetCore.Builder;
-using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
+using Savorboard.CAP.InMemoryMessageQueue;
 
 namespace Sample.Dashboard.Auth
 {
     public class Startup
     {
-        private readonly IConfiguration _configuration;
-
-        public Startup(IConfiguration configuration)
-        {
-            _configuration = configuration;
-        }
-
         public void ConfigureServices(IServiceCollection services)
         {
-            services                
-               .AddAuthorization((options =>
-               {
-                   // only if you want to apply role filter to CAP Dashboard user 
-                   options.AddPolicy("PolicyCap", policy => policy.RequireRole("admin.events"));
-               }))
-               .AddAuthentication(options =>
-               {
-                   options.DefaultScheme =  CookieAuthenticationDefaults.AuthenticationScheme;
-                   options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
-               })
-               .AddCookie()
-               .AddOpenIdConnect(options =>
-               {
-                   options.Authority = "https://demo.duendesoftware.com/";
-                   options.ClientId = "interactive.confidential";
-                   options.ClientSecret = "secret";
-                   options.ResponseType = "code";
-                   options.UsePkce = true;
+            services
+                .AddAuthorization((options =>
+                {
+                    // only if you want to apply role filter to CAP Dashboard user 
+                    options.AddPolicy("PolicyCap", policy => policy.RequireRole("admin.events"));
+                }))
+                .AddAuthentication(options =>
+                {
+                    options.DefaultScheme = CookieAuthenticationDefaults.AuthenticationScheme;
+                    options.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
+                })
+                .AddCookie()
+                .AddOpenIdConnect(options =>
+                {
+                    options.RequireHttpsMetadata = false;
+                    options.Authority = "https://demo.duendesoftware.com/";
+                    options.ClientId = "interactive.confidential";
+                    options.ClientSecret = "secret";
+                    options.ResponseType = "code";
+                    options.UsePkce = true;
 
-                   options.Scope.Clear();
-                   options.Scope.Add("openid");
-                   options.Scope.Add("profile");
-               })
-               .AddScheme<MyDashboardAuthenticationSchemeOptions, MyDashboardAuthenticationHandler>("MyDashboardScheme",null);
+                    options.Scope.Clear();
+                    options.Scope.Add("openid");
+                    options.Scope.Add("profile");
+                });
+               //.AddScheme<MyDashboardAuthenticationSchemeOptions, MyDashboardAuthenticationHandler>("MyDashboardScheme",null);
 
             services.AddCors(x =>
             {
                 x.AddDefaultPolicy(p =>
                 {
-                    p.WithOrigins("http://localhost:8080").AllowCredentials().AllowAnyHeader().AllowAnyMethod();
+                    p.WithOrigins("https://localhost:5001").AllowCredentials().AllowAnyHeader().AllowAnyMethod();
                 });
             });
 
@@ -58,17 +52,12 @@ public void ConfigureServices(IServiceCollection services)
                     d.UseChallengeOnAuth = true;
                     d.DefaultChallengeScheme = OpenIdConnectDefaults.AuthenticationScheme;
                     d.UseAuth = true;
-                    d.DefaultAuthenticationScheme = "MyDashboardScheme";
+                    d.DefaultAuthenticationScheme = CookieAuthenticationDefaults.AuthenticationScheme;// "MyDashboardScheme";
                     // only if you want to apply policy authorization filter to CAP Dashboard user 
                     //d.AuthorizationPolicy = "PolicyCap";
                 });
-                cap.UseMySql("server=192.168.3.57;port=3307;database=cap;UserId=root;Password=123123;");
-                cap.UseRabbitMQ(aa =>
-                {
-                    aa.HostName = "192.168.3.57";
-                    aa.UserName = "user";
-                    aa.Password = "wJ0p5gSs17";
-                });
+                cap.UseInMemoryStorage();
+                cap.UseInMemoryMessageQueue();
                 //cap.UseDiscovery(_ =>
                 //{
                 //    _.DiscoveryServerHostName = "localhost";