merge

AobaClient/Cargo.toml

@@ -6,7 +6,7 @@ edition = "2024"
 # See more keys and their definitions at https://doc.rust-lang.org/cargo/reference/manifest.html
 
 [dependencies]
-dioxus = { version = "0.6.0", features = ["router"] }
+dioxus = { version = "0.7.2", features = ["router"] }
 serde = "1.0.219"
 serde_repr = "0.1.20"
 tonic = { version = "*", default-features = false, features = [

AobaClient/src/contexts/auth_context.rs

@@ -1,4 +1,4 @@
-use dioxus::signals::{Signal, Writable};
+use dioxus::signals::{Signal, WritableExt};
 use web_sys::window;
 
 use crate::rpc::{login, logout};

AobaServer/Dockerfile

@@ -22,7 +22,7 @@ RUN apt install -y protobuf-compiler libprotobuf-dev ffmpeg
 
 # Install `dx`
 RUN curl -L --proto '=https' --tlsv1.2 -sSf https://raw.githubusercontent.com/cargo-bins/cargo-binstall/main/install-from-binstall-release.sh | bash
-RUN cargo binstall dioxus-cli@0.6.3 --root /.cargo -y --force
+RUN cargo binstall dioxus-cli@0.7.2 --root /.cargo -y --force
 ENV PATH="/.cargo/bin:$PATH"
 ARG VERSION
 ENV APP_VERSION=$VERSION

AobaServer/Program.cs

@@ -1,167 +1,167 @@
-using AobaCore;
-
-using AobaServer.Auth;
-using AobaServer.Middleware;
-using AobaServer.Models;
-using AobaServer.Services;
-
-using Microsoft.AspNetCore.Authentication;
-using Microsoft.AspNetCore.Authentication.JwtBearer;
-using Microsoft.AspNetCore.Http.Features;
-using Microsoft.IdentityModel.Tokens;
-
-using MongoDB.Driver;
-using MongoDB.Driver.Core.Extensions.DiagnosticSources;
-
-var builder = WebApplication.CreateBuilder(args);
-
-builder.WebHost.ConfigureKestrel(o =>
-{
-	o.Limits.MaxRequestBodySize = null;
-#if !DEBUG
-	o.ListenAnyIP(8081, lo =>
-    {
-        lo.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http2;
-    });
-	o.ListenAnyIP(8080, lo =>
-    {
-        lo.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
-    });
-#endif
-});
-var config = builder.Configuration;
-// Add services to the container.
-builder.Services.AddControllers(opt => opt.ModelBinderProviders.Add(new BsonIdModelBinderProvider()));
-
-builder.Services.AddObersability(builder.Configuration);
-builder.Services.AddGrpc();
-
-//DB
-var dbString = config["DB_STRING"];
-var settings = MongoClientSettings.FromConnectionString(dbString);
-settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
-var dbClient = new MongoClient(settings);
-var db = dbClient.GetDatabase("Aoba");
-
-builder.Services.AddSingleton(dbClient);
-builder.Services.AddSingleton<IMongoDatabase>(db);
-
-var authCfg = new AuthConfigService(db);
-builder.Services.AddSingleton(authCfg);
-
-
-var authInfo = authCfg.GetDefaultAuthInfoAsync().GetAwaiter().GetResult();
-var signingKey = new SymmetricSecurityKey(authInfo.SecureKey);
-
-var validationParams = new TokenValidationParameters
-{
-	ValidateIssuerSigningKey = true,
-	IssuerSigningKey = signingKey,
-	ValidateIssuer = true,
-	ValidIssuer = authInfo.Issuer,
-	ValidateAudience = true,
-	ValidAudience = authInfo.Audience,
-	ValidateLifetime = false,
-	ClockSkew = TimeSpan.FromMinutes(1),
-};
-
-builder.Services.AddCors(o =>
-{
-	o.AddPolicy("AllowAll", p =>
-	{
-		p.AllowAnyOrigin();
-		p.AllowAnyMethod();
-		p.AllowAnyHeader();
-	});
-	o.AddPolicy("RPC", p =>
-	{
-		p.AllowAnyMethod();
-		p.AllowAnyHeader();
-		p.WithExposedHeaders("Grpc-Status", "Grpc-Message", "Grpc-Encoding", "Grpc-Accept-Encoding");
-		p.AllowAnyOrigin();
-	});
-});
-
-var metricsAuthInfo = authCfg.GetAuthInfoAsync("aoba", "metrics").GetAwaiter().GetResult();
-builder.Services.AddAuthentication(options =>
-{
-	options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
-	options.DefaultChallengeScheme = "Aoba";
-}).AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => //Bearer auth
-{
-	options.TokenValidationParameters = validationParams;
-	options.TokenHandlers.Add(new MetricsTokenValidator(metricsAuthInfo));
-	options.Events = new JwtBearerEvents
-	{
-		OnMessageReceived = ctx => //Retreive token from cookie if not found in headers
-		{
-			if (string.IsNullOrWhiteSpace(ctx.Token))
-				ctx.Token = ctx.Request.Headers.Authorization.FirstOrDefault()?.Replace("Bearer ", "");
-
-#if DEBUG //allow cookie based auth when in debug mode
-			if (string.IsNullOrWhiteSpace(ctx.Token))
-				ctx.Token = ctx.Request.Cookies.FirstOrDefault(c => c.Key == "token").Value;
-#endif
-
-			return Task.CompletedTask;
-		},
-		OnAuthenticationFailed = ctx =>
-		{
-			ctx.Response.Cookies.Append("token", "", new CookieOptions
-			{
-				MaxAge = TimeSpan.Zero,
-				Expires = DateTime.Now
-			});
-			ctx.Options.ForwardChallenge = "Aoba";
-
-			return Task.CompletedTask;
-		}
-	};
-}).AddScheme<AuthenticationSchemeOptions, AobaAuthenticationHandler>("Aoba", null);
-
-
-builder.Services.AddAoba();
-#if DEBUG
-builder.Services.AddHostedService<DebugService>();
-#endif
-builder.Services.Configure<FormOptions>(opt =>
-{
-	opt.ValueLengthLimit = int.MaxValue;
-	opt.MultipartBodyLengthLimit = int.MaxValue;
-});
-
-var app = builder.Build();
-
-// Configure the HTTP request pipeline.
-if (!app.Environment.IsDevelopment())
-{
-	app.UseExceptionHandler("/Home/Error");
-	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
-	app.UseHsts();
-}
-
-app.UseGrpcWeb(new GrpcWebOptions { DefaultEnabled = true });
-app.UseStaticFiles();
-app.UseRouting();
-
-
-app.UseCors();
-
-
-app.UseAuthentication();
-app.UseAuthorization();
-
-app.MapControllers();
-app.MapObserability();
-app.MapGrpcService<AobaRpcService>()
-	.RequireAuthorization()
-	.RequireCors("RPC");
-app.MapGrpcService<MetricsRpcService>()
-	.RequireAuthorization()
-	.RequireCors("RPC");
-app.MapGrpcService<AobaAuthService>()
-	.AllowAnonymous()
-	.RequireCors("RPC");
-app.MapFallbackToFile("index.html");
-
-app.Run();
+using AobaCore;
+
+using AobaServer.Auth;
+using AobaServer.Middleware;
+using AobaServer.Models;
+using AobaServer.Services;
+
+using Microsoft.AspNetCore.Authentication;
+using Microsoft.AspNetCore.Authentication.JwtBearer;
+using Microsoft.AspNetCore.Http.Features;
+using Microsoft.IdentityModel.Tokens;
+
+using MongoDB.Driver;
+using MongoDB.Driver.Core.Extensions.DiagnosticSources;
+
+var builder = WebApplication.CreateBuilder(args);
+
+builder.WebHost.ConfigureKestrel(o =>
+{
+	o.Limits.MaxRequestBodySize = null;
+#if !DEBUG
+	o.ListenAnyIP(8081, lo =>
+    {
+        lo.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http2;
+    });
+	o.ListenAnyIP(8080, lo =>
+    {
+        lo.Protocols = Microsoft.AspNetCore.Server.Kestrel.Core.HttpProtocols.Http1AndHttp2;
+    });
+#endif
+});
+var config = builder.Configuration;
+// Add services to the container.
+builder.Services.AddControllers(opt => opt.ModelBinderProviders.Add(new BsonIdModelBinderProvider()));
+
+builder.Services.AddObersability(builder.Configuration);
+builder.Services.AddGrpc();
+
+//DB
+var dbString = config["DB_STRING"];
+var settings = MongoClientSettings.FromConnectionString(dbString);
+settings.ClusterConfigurator = cb => cb.Subscribe(new DiagnosticsActivityEventSubscriber());
+var dbClient = new MongoClient(settings);
+var db = dbClient.GetDatabase("Aoba");
+
+builder.Services.AddSingleton(dbClient);
+builder.Services.AddSingleton<IMongoDatabase>(db);
+
+var authCfg = new AuthConfigService(db);
+builder.Services.AddSingleton(authCfg);
+
+
+var authInfo = authCfg.GetDefaultAuthInfoAsync().GetAwaiter().GetResult();
+var signingKey = new SymmetricSecurityKey(authInfo.SecureKey);
+
+var validationParams = new TokenValidationParameters
+{
+	ValidateIssuerSigningKey = true,
+	IssuerSigningKey = signingKey,
+	ValidateIssuer = true,
+	ValidIssuer = authInfo.Issuer,
+	ValidateAudience = true,
+	ValidAudience = authInfo.Audience,
+	ValidateLifetime = false,
+	ClockSkew = TimeSpan.FromMinutes(1),
+};
+
+builder.Services.AddCors(o =>
+{
+	o.AddPolicy("AllowAll", p =>
+	{
+		p.AllowAnyOrigin();
+		p.AllowAnyMethod();
+		p.AllowAnyHeader();
+	});
+	o.AddPolicy("RPC", p =>
+	{
+		p.AllowAnyMethod();
+		p.AllowAnyHeader();
+		p.WithExposedHeaders("Grpc-Status", "Grpc-Message", "Grpc-Encoding", "Grpc-Accept-Encoding");
+		p.AllowAnyOrigin();
+	});
+});
+
+var metricsAuthInfo = authCfg.GetAuthInfoAsync("aoba", "metrics").GetAwaiter().GetResult();
+builder.Services.AddAuthentication(options =>
+{
+	options.DefaultAuthenticateScheme = JwtBearerDefaults.AuthenticationScheme;
+	options.DefaultChallengeScheme = "Aoba";
+}).AddJwtBearer(JwtBearerDefaults.AuthenticationScheme, options => //Bearer auth
+{
+	options.TokenValidationParameters = validationParams;
+	options.TokenHandlers.Add(new MetricsTokenValidator(metricsAuthInfo));
+	options.Events = new JwtBearerEvents
+	{
+		OnMessageReceived = ctx => //Retreive token from cookie if not found in headers
+		{
+			if (string.IsNullOrWhiteSpace(ctx.Token))
+				ctx.Token = ctx.Request.Headers.Authorization.FirstOrDefault()?.Replace("Bearer ", "");
+
+#if DEBUG //allow cookie based auth when in debug mode
+			if (string.IsNullOrWhiteSpace(ctx.Token))
+				ctx.Token = ctx.Request.Cookies.FirstOrDefault(c => c.Key == "token").Value;
+#endif
+
+			return Task.CompletedTask;
+		},
+		OnAuthenticationFailed = ctx =>
+		{
+			ctx.Response.Cookies.Append("token", "", new CookieOptions
+			{
+				MaxAge = TimeSpan.Zero,
+				Expires = DateTime.Now
+			});
+			ctx.Options.ForwardChallenge = "Aoba";
+
+			return Task.CompletedTask;
+		}
+	};
+}).AddScheme<AuthenticationSchemeOptions, AobaAuthenticationHandler>("Aoba", null);
+
+
+builder.Services.AddAoba();
+#if DEBUG
+builder.Services.AddHostedService<DebugService>();
+#endif
+builder.Services.Configure<FormOptions>(opt =>
+{
+	opt.ValueLengthLimit = int.MaxValue;
+	opt.MultipartBodyLengthLimit = long.MaxValue;
+});
+
+var app = builder.Build();
+
+// Configure the HTTP request pipeline.
+if (!app.Environment.IsDevelopment())
+{
+	app.UseExceptionHandler("/Home/Error");
+	// The default HSTS value is 30 days. You may want to change this for production scenarios, see https://aka.ms/aspnetcore-hsts.
+	app.UseHsts();
+}
+
+app.UseGrpcWeb(new GrpcWebOptions { DefaultEnabled = true });
+app.UseStaticFiles();
+app.UseRouting();
+
+
+app.UseCors();
+
+
+app.UseAuthentication();
+app.UseAuthorization();
+
+app.MapControllers();
+app.MapObserability();
+app.MapGrpcService<AobaRpcService>()
+	.RequireAuthorization()
+	.RequireCors("RPC");
+app.MapGrpcService<MetricsRpcService>()
+	.RequireAuthorization()
+	.RequireCors("RPC");
+app.MapGrpcService<AobaAuthService>()
+	.AllowAnonymous()
+	.RequireCors("RPC");
+app.MapFallbackToFile("index.html");
+
+app.Run();