diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 0000000..ad90488 --- /dev/null +++ b/.gitattributes @@ -0,0 +1,15 @@ +* text=auto + +*.cs text eol=lf +*.csproj text eol=lf +*.json text eol=lf +*.md text eol=lf +*.razor text eol=lf +*.yml text eol=lf +Dockerfile text eol=lf + +*.jpg binary +*.jpeg binary +*.png binary +*.mp4 binary +*.pdf binary diff --git a/.github/workflows/smartbotweb.yml b/.github/workflows/smartbotweb.yml index 7b11bf8..74e063e 100644 --- a/.github/workflows/smartbotweb.yml +++ b/.github/workflows/smartbotweb.yml @@ -15,7 +15,7 @@ permissions: env: PUBLISH_PATH: published CONFIGURATION: Release - DOTNET_CORE_VERSION: 8.0.x + DOTNET_CORE_VERSION: 10.0.300 PROJECT_PATH: src/server/SmartBotBlazorApp/SmartBotBlazorApp.csproj SOLUTION_PATH: src/server/SmartBotBlazorApp.sln jobs: @@ -28,11 +28,18 @@ jobs: with: dotnet-version: ${{ env.DOTNET_CORE_VERSION }} - name: Restore - run: dotnet restore "${{ env.SOLUTION_PATH }}" + run: dotnet restore "${{ env.SOLUTION_PATH }}" --locked-mode + - name: Verify formatting + run: dotnet format "${{ env.SOLUTION_PATH }}" --verify-no-changes --no-restore + - name: Audit NuGet packages + shell: bash + run: | + dotnet list "${{ env.SOLUTION_PATH }}" package --vulnerable --include-transitive --format json > vulnerable-packages.json + test "$(jq '[.projects[]?.frameworks[]? | ((.topLevelPackages // []) + (.transitivePackages // []))[]] | length' vulnerable-packages.json)" -eq 0 - name: Build run: dotnet build "${{ env.SOLUTION_PATH }}" --configuration ${{ env.CONFIGURATION }} --no-restore - name: Test - run: dotnet test "${{ env.SOLUTION_PATH }}" --configuration ${{ env.CONFIGURATION }} --no-build + run: dotnet test "${{ env.SOLUTION_PATH }}" --configuration ${{ env.CONFIGURATION }} --no-build --collect:"XPlat Code Coverage" --results-directory TestResults - name: Publish run: dotnet publish "${{ env.PROJECT_PATH }}" --configuration ${{ env.CONFIGURATION }} --no-build --output "${{ env.PUBLISH_PATH }}" - name: Publish Artifacts @@ -40,3 +47,15 @@ jobs: with: name: webapp path: ${{ env.PUBLISH_PATH }} + if-no-files-found: error + - name: Publish quality reports + if: always() + uses: actions/upload-artifact@v4 + with: + name: quality-reports + path: | + TestResults + vulnerable-packages.json + if-no-files-found: warn + - name: Build container image + run: docker build --file src/server/SmartBotBlazorApp/Dockerfile --tag smartbotapi:ci . diff --git a/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000..f860221 --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,5 @@ + + + true + + diff --git a/README.md b/README.md index 0082d8c..f2e9a58 100644 --- a/README.md +++ b/README.md @@ -157,7 +157,7 @@ SmartBotAPI/ ### Web Server -**Prerequisites:** [.NET SDK 8.0](https://dotnet.microsoft.com/download/dotnet/8.0), SQL Server LocalDB on Windows (installed with Visual Studio) or any reachable SQL Server instance. +**Prerequisites:** [.NET SDK 10.0](https://dotnet.microsoft.com/download/dotnet/10.0) (the application targets .NET 8), SQL Server LocalDB on Windows (installed with Visual Studio) or any reachable SQL Server instance. ```powershell cd src/server/SmartBotBlazorApp @@ -171,7 +171,7 @@ The app applies EF Core migrations automatically on startup and listens on: - `https://localhost:7297` - `http://localhost:5221` -On first launch, create a dashboard account at `https://localhost:7297/Account/Register`, then sign in. +The `https` launch profile uses the Development environment, where account registration and the local self-confirmation link are enabled. Create a dashboard account at `https://localhost:7297/Account/Register`, then sign in. Both options are disabled by default outside Development; configure `AccountAccess` explicitly and use a real email sender for a public deployment. To run the automated tests from the repository root: @@ -191,6 +191,8 @@ docker run -p 8080:8080 \ smartbotblazorapp ``` +The container serves plain HTTP on port 8080 unless you explicitly mount and configure an HTTPS certificate. Registration remains disabled in the default production configuration. + ### Robot Firmware **Prerequisites:** Arduino IDE 2.x with the ESP32 board package; an ESP32-C3 DevKitM-1 wired per the schematic in [`docs/schemat.pdf`](docs/schemat.pdf). @@ -226,7 +228,7 @@ The [firmware and hardware reference](docs/firmware.md) links to the manufacture ## Deployment -Pushing to `main` or opening a pull request against it triggers the GitHub Actions workflow (`.github/workflows/smartbotweb.yml`), which builds and tests the solution and publishes a deployable web-app artifact. It does not deploy to an external environment automatically. +Pushing to `main` or opening a pull request against it triggers the GitHub Actions workflow (`.github/workflows/smartbotweb.yml`), which performs a locked restore, verifies formatting, audits NuGet packages, builds and tests with coverage, builds the container image, and publishes a deployable web-app artifact. It does not deploy to an external environment automatically. For the project presentation, the application was deployed to the **smartbotweb** Azure App Service and the firmware targeted `smartbotweb.azurewebsites.net:443`. That service is no longer hosted; the current firmware configuration uses an explicit placeholder that must be replaced with the address of the current server before use. diff --git a/README.pl.md b/README.pl.md index a238af9..d3124b7 100644 --- a/README.pl.md +++ b/README.pl.md @@ -158,7 +158,7 @@ SmartBotAPI/ ### Serwer webowy -**Wymagania:** [.NET SDK 8.0](https://dotnet.microsoft.com/download/dotnet/8.0), SQL Server LocalDB w systemie Windows (instalowany z Visual Studio) lub dowolna dostępna instancja SQL Server. +**Wymagania:** [.NET SDK 10.0](https://dotnet.microsoft.com/download/dotnet/10.0) (aplikacja jest kierowana na .NET 8), SQL Server LocalDB w systemie Windows (instalowany z Visual Studio) lub dowolna dostępna instancja SQL Server. ```powershell cd src/server/SmartBotBlazorApp @@ -172,7 +172,7 @@ Aplikacja automatycznie stosuje migracje EF Core przy starcie i nasłuchuje na: - `https://localhost:7297` - `http://localhost:5221` -Przy pierwszym uruchomieniu utwórz konto panelu pod adresem `https://localhost:7297/Account/Register`, a następnie się zaloguj. +Profil uruchomieniowy `https` korzysta ze środowiska Development, w którym rejestracja i lokalny link samodzielnego potwierdzenia konta są włączone. Utwórz konto panelu pod adresem `https://localhost:7297/Account/Register`, a następnie się zaloguj. Poza Development obie opcje są domyślnie wyłączone; przy publicznym wdrożeniu skonfiguruj jawnie sekcję `AccountAccess` i prawdziwą wysyłkę e-mail. Aby uruchomić testy automatyczne z katalogu głównego repozytorium: @@ -192,6 +192,8 @@ docker run -p 8080:8080 \ smartbotblazorapp ``` +Kontener udostępnia zwykły HTTP na porcie 8080, o ile certyfikat HTTPS nie zostanie jawnie zamontowany i skonfigurowany. W domyślnej konfiguracji produkcyjnej rejestracja pozostaje wyłączona. + ### Firmware robota **Wymagania:** Arduino IDE 2.x z pakietem płytek ESP32; ESP32-C3 DevKitM-1 połączone wg schematu w [`docs/schemat.pdf`](docs/schemat.pdf). @@ -227,7 +229,7 @@ Po połączeniu robot pojawia się na stronie **Live View Image** zalogowanego p ## Wdrożenie -Push do `main` lub otwarcie pull requesta do tej gałęzi uruchamia workflow GitHub Actions (`.github/workflows/smartbotweb.yml`), który buduje i testuje rozwiązanie oraz publikuje artefakt aplikacji webowej gotowy do wdrożenia. Workflow nie wdraża automatycznie do środowiska zewnętrznego. +Push do `main` lub otwarcie pull requesta do tej gałęzi uruchamia workflow GitHub Actions (`.github/workflows/smartbotweb.yml`), który wykonuje odtwarzalny restore, sprawdza formatowanie i podatności pakietów, buduje i testuje rozwiązanie z pomiarem pokrycia, buduje obraz kontenera oraz publikuje artefakt aplikacji webowej. Workflow nie wdraża automatycznie do środowiska zewnętrznego. Na potrzeby prezentacji projektu aplikacja była wdrożona na Azure App Service **smartbotweb**, a firmware łączył się z `smartbotweb.azurewebsites.net:443`. Usługa nie jest już hostowana; aktualna konfiguracja firmware zawiera jawny placeholder, który przed użyciem trzeba zastąpić adresem bieżącego serwera. diff --git a/THIRD_PARTY_NOTICES.md b/THIRD_PARTY_NOTICES.md index 33b4b62..b60fcdf 100644 --- a/THIRD_PARTY_NOTICES.md +++ b/THIRD_PARTY_NOTICES.md @@ -43,30 +43,28 @@ Changes: the track was trimmed and mixed with the SmartBot driving-test montage. NuGet packages retain their upstream license files and metadata. The direct dependencies declared by the server, client, and test projects, together with -the transitive dependency carrying nonstandard Microsoft terms, are: +the transitive dependencies carrying nonstandard Microsoft terms are: | Package or package group | Version | License | |---|---:|---| -| Azure.Identity | 1.13.1 | [MIT](https://licenses.nuget.org/MIT) | -| Microsoft.AspNetCore.Components.WebAssembly, .Authentication, .Server; Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; Microsoft.AspNetCore.Identity.EntityFrameworkCore; Microsoft.AspNetCore.SignalR.Client | 8.0.10 | [MIT](https://licenses.nuget.org/MIT) | -| Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools | 9.0.0 | [MIT](https://licenses.nuget.org/MIT) | -| MudBlazor | 7.15.0 | [MIT](https://licenses.nuget.org/MIT) | -| Newtonsoft.Json | 13.0.3 | [MIT](https://licenses.nuget.org/MIT) | -| System.Formats.Asn1 | 9.0.0 | [MIT](https://licenses.nuget.org/MIT) | +| Microsoft.AspNetCore.Components.WebAssembly, .Authentication, .Server; Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore; Microsoft.AspNetCore.Identity.EntityFrameworkCore; Microsoft.AspNetCore.SignalR.Client | 8.0.29 | [MIT](https://licenses.nuget.org/MIT) | +| Microsoft.EntityFrameworkCore.SqlServer, Microsoft.EntityFrameworkCore.Tools | 9.0.18 | [MIT](https://licenses.nuget.org/MIT) | +| Microsoft.Data.SqlClient | 6.1.6 | [MIT](https://licenses.nuget.org/MIT) | +| MudBlazor | 7.16.0 | [MIT](https://licenses.nuget.org/MIT) | +| Newtonsoft.Json | 13.0.4 | [MIT](https://licenses.nuget.org/MIT) | | SixLabors.ImageSharp | 3.1.12 | Apache-2.0 grant for qualifying open-source use under the [Six Labors Split License 1.0](https://sixlabors.com/posts/license-changes/) | -| Microsoft.Data.SqlClient.SNI.runtime (transitive runtime component) | 5.1.1 | [Microsoft Software License Terms](https://www.nuget.org/packages/Microsoft.Data.SqlClient.SNI.runtime/5.1.1) | -| Microsoft.VisualStudio.Azure.Containers.Tools.Targets (build tooling) | 1.21.0 | [Microsoft Software License Terms](https://www.nuget.org/packages/Microsoft.VisualStudio.Azure.Containers.Tools.Targets/1.21.0) | -| coverlet.collector, Microsoft.NET.Test.Sdk | 10.0.1, 18.7.0 | [MIT](https://licenses.nuget.org/MIT) | -| xunit, xunit.runner.visualstudio | 2.9.3, 3.1.5 | [Apache-2.0](https://licenses.nuget.org/Apache-2.0) | +| Microsoft.Data.SqlClient.SNI.runtime (transitive runtime component) | 6.0.2 | [Microsoft Software License Terms](https://www.nuget.org/packages/Microsoft.Data.SqlClient.SNI.runtime/6.0.2) | +| Microsoft.Identity.Client.NativeInterop (transitive runtime component) | 0.20.6 | [Microsoft Software License Terms](https://www.nuget.org/packages/Microsoft.Identity.Client.NativeInterop/0.20.6) | +| coverlet.collector, Microsoft.NET.Test.Sdk | 10.0.1, 18.8.1 | [MIT](https://licenses.nuget.org/MIT) | +| xunit.v3, xunit.runner.visualstudio | 3.2.2, 3.1.5 | [Apache-2.0](https://licenses.nuget.org/Apache-2.0) | -The restore verified on July 15, 2026 resolves 144 unique package/version pairs +The restore verified on July 15, 2026 resolves 140 unique package/version pairs across the server, client, and test projects. Their NuGet metadata consists of -125 MIT license expressions, 7 Apache-2.0 expressions, 9 legacy upstream -license URLs, and 3 embedded license files. The three embedded licenses are the -SNI runtime, ImageSharp, and the Visual Studio container build tooling listed -above; the legacy URLs belong to Microsoft/.NET Core packages and -`xunit.abstractions`. This accounts for the complete restored graph at that -date. Exact transitive versions can change after a future restore, so each +127 MIT license expressions, 10 Apache-2.0 expressions, no legacy upstream +license URLs, and 3 embedded license files. The embedded licenses are the SNI +runtime, Microsoft Identity native interop, and ImageSharp listed above. +Together, these entries account for the complete restored graph at that date. +Exact transitive versions can change after a future restore, so each package's `.nuspec` metadata and included license file remain authoritative. ## Firmware libraries installed separately @@ -84,10 +82,6 @@ Manager; their source code is not vendored in this repository. ## Externally loaded assets and trademarks -The web application loads Font Awesome Free 6.0.0-beta3 from cdnjs. Font -Awesome Free uses CC BY 4.0 for icons, SIL OFL 1.1 for fonts, and MIT for code; -see the [Font Awesome Free License](https://fontawesome.com/license/free). - `src/server/SmartBotBlazorApp/wwwroot/GitHub_Logo.png` is used only to link to the SmartBotAPI repository. GitHub and the GitHub logo are trademarks of GitHub, Inc.; use is subject to the [GitHub Logo Policy](https://docs.github.com/en/site-policy/other-site-policies/github-logo-policy). diff --git a/docs/architecture.md b/docs/architecture.md index 50fde9e..5e0b39c 100644 --- a/docs/architecture.md +++ b/docs/architecture.md @@ -31,7 +31,7 @@ sequenceDiagram ## Transport - **Protocol:** SignalR JSON hub protocol over WebSocket. The browser uses the official SignalR client; the ESP32 speaks the protocol directly — it performs the JSON handshake (`{"protocol":"json","version":1}`), then exchanges invocation messages (type `1`), each terminated by the SignalR record separator `0x1E`. -- **Security:** dashboards authenticate with the ASP.NET Core Identity cookie. The robot supplies `SECRET_API_KEY` as the SignalR `access_token` query value; the server compares it in constant time with `RobotApiKey` (minimum 32 characters). Production transport uses TLS (`wss://`). +- **Security:** dashboards authenticate with the ASP.NET Core Identity cookie. Interactive Server pages exchange their authenticated session for a five-minute, data-protected operator token; the WebAssembly diagnostics page uses the cookie directly. The robot supplies `SECRET_API_KEY` as the SignalR `access_token` query value, which is compared in constant time with `RobotApiKey` (minimum 32 characters). Hub methods enforce operator-versus-robot roles, and production transport uses TLS (`wss://`). - **Hub endpoint:** `/signalhub` (mapped in `Program.cs`). - **Reconnection:** the firmware retries the WebSocket every 5 s (`WS_RECONNECT_INTERVAL`); response compression is enabled server-side for `application/octet-stream`. @@ -132,4 +132,4 @@ The web application uses Blazor's hybrid rendering: - **Interactive Server** pages (`SmartBotBlazorApp/Components/Pages/`) — live visualization and robot-control pages that hold a SignalR connection server-side. - **Interactive WebAssembly** pages (`SmartBotBlazorApp.Client/Pages/`) — the `/chat` text-diagnostics page connects to the hub directly from WASM. -ASP.NET Core Identity provides the account system (registration, login, 2FA, management pages under `/Account/*`). Receiver and diagnostics pages require authorization. +ASP.NET Core Identity provides the account system (registration, login, 2FA, management pages under `/Account/*`). Receiver and diagnostics pages require authorization. Registration and the no-email confirmation link are available in Development but disabled by default in other environments. diff --git a/docs/getting-started.md b/docs/getting-started.md index 27b76f0..aa4da82 100644 --- a/docs/getting-started.md +++ b/docs/getting-started.md @@ -6,7 +6,7 @@ This guide walks through setting up the full SmartBotAPI stack: the web server, **Server:** -- [.NET SDK 8.0](https://dotnet.microsoft.com/download/dotnet/8.0) +- [.NET SDK 10.0](https://dotnet.microsoft.com/download/dotnet/10.0) (the projects target .NET 8) - SQL Server — LocalDB (installed with Visual Studio) is enough for development; any SQL Server instance works in production - Optional: Docker Desktop, Visual Studio 2022 @@ -32,10 +32,12 @@ On first start the app creates the database and applies all EF Core migrations a |---|---| | `https` | `https://localhost:7297` (+ `http://localhost:5221`) | | `http` | `http://localhost:5221` | -| Docker | `http://localhost:8080`, `https://localhost:8081` | +| Docker | `http://localhost:8080` | Open the site in a browser — the **Home** page and the navigation menu list all dashboard pages. +The local launch profile uses `Development`, so registration and the no-email self-confirmation link are enabled. In other environments both are disabled by default. `AccountAccess__AllowRegistration` and `AccountAccess__ShowSelfConfirmationLink` can override them; do not expose the self-confirmation link on a public deployment. + ### Custom database Set the environment variable before starting; it overrides `appsettings.json`: @@ -57,7 +59,7 @@ docker run -p 8080:8080 \ smartbotblazorapp ``` -> The container cannot reach LocalDB — always provide a real SQL Server connection string when running in Docker. +> The container cannot reach LocalDB — always provide a real SQL Server connection string when running in Docker. It serves HTTP on port 8080 unless you mount and configure an HTTPS certificate. Registration is disabled by default in Production. ## 2. Flash the Robot Firmware diff --git a/docs/server.md b/docs/server.md index 0f8f5a6..97e4902 100644 --- a/docs/server.md +++ b/docs/server.md @@ -55,7 +55,7 @@ The single real-time endpoint shared by robots and dashboards. See [architecture ### `Data/MeasurementService.cs` -- `SaveMeasurementsToDatabase(user, measurements, avgDistance)` — inserts a `Measurement` row behind an approximately one-write-per-second, process-wide static timestamp check. It is shared across robot IDs and is not a strict synchronized rate limiter. +- `SaveMeasurementsToDatabase(user, measurements, avgDistance)` — validates the seven-value IMU payload and inserts at most one row per second for each robot ID. The in-process throttle is synchronized across concurrent hub calls and uses UTC for elapsed-time comparisons while retaining local timestamps for the existing chart filters. - `RoundMeasurements(measurements, digits)` — display rounding (2 decimal places). - Date-range query used by the charts page. @@ -86,6 +86,8 @@ EF Core context combining ASP.NET Core Identity tables with the `Measurement` te | `ConnectionStrings:DefaultConnection` | SQL Server connection (LocalDB by default) | | `Logging:LogLevel:*` | Standard ASP.NET Core logging levels | | `Api:Url` | External API base URL placeholder | +| `AccountAccess:AllowRegistration` | Enables the registration endpoint; `false` by default, `true` in Development | +| `AccountAccess:ShowSelfConfirmationLink` | Shows the no-email confirmation link; for local development only | | `AllowedHosts` | Host filtering (`*` by default) | ### Environment variables @@ -95,7 +97,8 @@ EF Core context combining ASP.NET Core Identity tables with the `Measurement` te | `SmartBotDBConnectionString` | Overrides the connection string (used in Docker/Azure) | | `RobotApiKey` | URL-safe key (minimum 32 characters) accepted from robot connections to `/signalhub` | | `ASPNETCORE_ENVIRONMENT` | `Development` / `Production` | -| `ASPNETCORE_HTTP_PORTS` / `ASPNETCORE_HTTPS_PORTS` | Container port bindings (8080/8081 in Docker) | +| `AccountAccess__AllowRegistration` / `AccountAccess__ShowSelfConfirmationLink` | Environment-variable overrides for account provisioning | +| `ASPNETCORE_HTTP_PORTS` / `ASPNETCORE_HTTPS_PORTS` | Optional container port bindings; the image serves HTTP on 8080 by default | ### Ports (`Properties/launchSettings.json`) @@ -103,18 +106,18 @@ EF Core context combining ASP.NET Core Identity tables with the `Measurement` te |---|---|---| | Kestrel (`http`/`https`) | 5221 | 7297 | | IIS Express | 24385 | 44312 | -| Docker | 8080 | 8081 | +| Docker (default runtime) | 8080 | — | ## Middleware Pipeline (from `Program.cs`) -Response compression (including `application/octet-stream` for SignalR payloads) → CORS → HTTPS redirection → static files → Identity authentication/authorization → SignalR access guard → antiforgery → Razor components (Server + WASM render modes) → SignalR hub at `/signalhub` → Identity endpoints. +Response compression (including `application/octet-stream` for SignalR payloads) → HTTPS redirection → static files → Identity authentication/authorization → role-aware SignalR access guard → antiforgery → Razor components (Server + WASM render modes) → SignalR hub at `/signalhub` → Identity endpoints. Notes for hardening before production use: -- CORS currently allows any origin — restrict it to the deployed dashboard origins in production. -- `IEmailSender` is a no-op stub (`IdentityNoOpEmailSender`) — plug in a real sender for account confirmation emails. +- Registration is disabled outside Development. Temporarily provision accounts in a trusted environment or connect a controlled administrative flow. +- `IEmailSender` is a no-op stub (`IdentityNoOpEmailSender`) — plug in a real sender before enabling registration publicly. Never enable the self-confirmation link publicly. ## Deployment -- **Docker:** `src/server/SmartBotBlazorApp/Dockerfile` (multi-stage: SDK build → publish → `mcr.microsoft.com/dotnet/aspnet:8.0` runtime, exposing 8080/8081). The project also defines .NET SDK container metadata (`kamilr616/smartbotblazorapp:latest`). -- **CI:** `.github/workflows/smartbotweb.yml` builds and tests the solution and publishes a deployable artifact for pushes and pull requests targeting `main`. External deployment is intentionally manual; the Azure App Service used for the project presentation is no longer hosted. +- **Docker:** `src/server/SmartBotBlazorApp/Dockerfile` (multi-stage .NET 10 SDK build → publish → non-root `mcr.microsoft.com/dotnet/aspnet:8.0` runtime, serving HTTP on 8080). The project also defines .NET SDK container metadata (`kamilr616/smartbotblazorapp:latest`). +- **CI:** `.github/workflows/smartbotweb.yml` performs locked restore, formatting and vulnerability checks, build, tests with coverage, publish, and a container build for pushes and pull requests targeting `main`. External deployment is intentionally manual; the Azure App Service used for the project presentation is no longer hosted. diff --git a/global.json b/global.json new file mode 100644 index 0000000..50baaf1 --- /dev/null +++ b/global.json @@ -0,0 +1,6 @@ +{ + "sdk": { + "version": "10.0.300", + "rollForward": "latestPatch" + } +} diff --git a/src/server/Dockerfile b/src/server/Dockerfile deleted file mode 100644 index 2ff6a3b..0000000 --- a/src/server/Dockerfile +++ /dev/null @@ -1,22 +0,0 @@ - -FROM mcr.microsoft.com/dotnet/aspnet:8.0 AS base -WORKDIR /app -EXPOSE 8080 -EXPOSE 8081 - -FROM mcr.microsoft.com/dotnet/sdk:8.0 AS build -WORKDIR /src -COPY ["SmartBotBlazorApp/SmartBotBlazorApp.csproj", "SmartBotBlazorApp/"] -COPY ["SmartBotBlazorApp.Client/SmartBotBlazorApp.Client.csproj", "SmartBotBlazorApp.Client/"] - -RUN dotnet restore "SmartBotBlazorApp/SmartBotBlazorApp.csproj" -COPY . . -RUN dotnet build "SmartBotBlazorApp/SmartBotBlazorApp.csproj" -c Release -o /app/build - -FROM build AS publish -RUN dotnet publish "SmartBotBlazorApp/SmartBotBlazorApp.csproj" -c Release -o /app/publish - -FROM base AS final -WORKDIR /app -COPY --from=publish /app/publish . -ENTRYPOINT ["dotnet", "SmartBotBlazorApp.dll"] diff --git a/src/server/SmartBotBlazorApp.Client/Pages/Chat.razor b/src/server/SmartBotBlazorApp.Client/Pages/Chat.razor index c931a30..ab78cdf 100644 --- a/src/server/SmartBotBlazorApp.Client/Pages/Chat.razor +++ b/src/server/SmartBotBlazorApp.Client/Pages/Chat.razor @@ -1,5 +1,5 @@ @page "/chat" -@rendermode InteractiveAuto +@rendermode @(new InteractiveWebAssemblyRenderMode(prerender: false)) @implements IAsyncDisposable @inject NavigationManager Navigation @attribute [Authorize] @@ -83,4 +83,4 @@ else await hubConnection.DisposeAsync(); } } -} \ No newline at end of file +} diff --git a/src/server/SmartBotBlazorApp.Client/SmartBotBlazorApp.Client.csproj b/src/server/SmartBotBlazorApp.Client/SmartBotBlazorApp.Client.csproj index a3e70dd..16b08a7 100644 --- a/src/server/SmartBotBlazorApp.Client/SmartBotBlazorApp.Client.csproj +++ b/src/server/SmartBotBlazorApp.Client/SmartBotBlazorApp.Client.csproj @@ -10,10 +10,11 @@ - - - - + + + + + diff --git a/src/server/SmartBotBlazorApp.Client/packages.lock.json b/src/server/SmartBotBlazorApp.Client/packages.lock.json new file mode 100644 index 0000000..fec6e3f --- /dev/null +++ b/src/server/SmartBotBlazorApp.Client/packages.lock.json @@ -0,0 +1,312 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "Microsoft.AspNetCore.Components.WebAssembly": { + "type": "Direct", + "requested": "[8.0.29, )", + "resolved": "8.0.29", + "contentHash": "wAPYLWm1Y2ikdUY0OgsWOJ0A1iQ0GJIvwsgbQKXTBUP/9r5rK3DvmJnZy9a0yEMslJPxvYesACNYDmLz2sTcxQ==", + "dependencies": { + "Microsoft.AspNetCore.Components.Web": "8.0.29", + "Microsoft.Extensions.Configuration.Binder": "8.0.2", + "Microsoft.Extensions.Configuration.Json": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1", + "Microsoft.JSInterop.WebAssembly": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.WebAssembly.Authentication": { + "type": "Direct", + "requested": "[8.0.29, )", + "resolved": "8.0.29", + "contentHash": "rs3U4TsemB1lqnpBVtLlQbQM3ewtAImIy3OjlhM7YjxJb/1AEXmIno1Wm8S3HPScYmLZtwLrTG5//uNlYzlRag==", + "dependencies": { + "Microsoft.AspNetCore.Components.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components.Web": "8.0.29" + } + }, + "Microsoft.AspNetCore.SignalR.Client": { + "type": "Direct", + "requested": "[8.0.29, )", + "resolved": "8.0.29", + "contentHash": "GeNFUL39i+NZ+Z8tGFLyqYpdMIwolMfrE7qUbw6ipt864yF4gEDRb/vBoOJhRRaJU6KVdXVuKwUX1s+Atvsprw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Connections.Client": "8.0.29", + "Microsoft.AspNetCore.SignalR.Client.Core": "8.0.29" + } + }, + "Microsoft.NET.ILLink.Tasks": { + "type": "Direct", + "requested": "[8.0.28, )", + "resolved": "8.0.28", + "contentHash": "XMqgVjlLxLqWmEh3c49haXLQwsMNtvo6YscUaqfvEGfg1iA8hnYgkUVq3i9Zu9gKeNKMWiiZKVwZExc/qyEAsQ==" + }, + "Microsoft.NET.Sdk.WebAssembly.Pack": { + "type": "Direct", + "requested": "[10.0.9, )", + "resolved": "10.0.9", + "contentHash": "VZrxevxXB2tmpyRKTbvVCNUt3GsJiOvWokwa7G328bQf7rKap9cNHPWrtPzTAWNphL7b6byHclNu1jc4QXv46w==" + }, + "Microsoft.AspNetCore.Authorization": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "IMVrMqYF7LASYMWVt/sL9f5vkA8qtfvsLEaxSchEc1Pk/zxdQt1fP1W3hN6Wxm0+wJjAKO+DhF/1mi22AtAfCQ==", + "dependencies": { + "Microsoft.AspNetCore.Metadata": "8.0.29", + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.Components": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1ZNdFYtEORG9LOYFJf0AtNMSAtkQ8WQ5XEGQXdEDvRMYBp4MS5t6mPAiWGVMb5aKpPfaeXOGHQqDcZHP3QfuAA==", + "dependencies": { + "Microsoft.AspNetCore.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components.Analyzers": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Analyzers": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "AoGUtJ3CgKhihjGCga7vNCawzWUHb7QNMtxzBJKjTYYhM9HwkGE/xmg6sZNO3Tw5W+ke5PoUO411Squ//jgiTQ==" + }, + "Microsoft.AspNetCore.Components.Authorization": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1zf+E8B8BZod/1POB4c/YnHKPXaj/zkoFeT079iwJHWMBXxB/Y75Dug2KstusYEZBHyiHdN7UUD+Fh2edLEVvg==", + "dependencies": { + "Microsoft.AspNetCore.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Forms": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "GXmEG6N30oDLZHvyxUmwKDPh/iQkcsktjUb3wffSV3Qi4DD1O37Zzz4EBIsgLQwTr4WtqjQ94yprJtKy+YSE1g==", + "dependencies": { + "Microsoft.AspNetCore.Components": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Web": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1El7nDceNvO07z3Wr8uYj9J5Y7KdtIEgpbyfb9r88BYFVuZxaDDA2F4n907mWib1iLbw+XoV25XbNcPH2rne/A==", + "dependencies": { + "Microsoft.AspNetCore.Components": "8.0.29", + "Microsoft.AspNetCore.Components.Forms": "8.0.29", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Primitives": "8.0.0", + "Microsoft.JSInterop": "8.0.29", + "System.IO.Pipelines": "8.0.0" + } + }, + "Microsoft.AspNetCore.Connections.Abstractions": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "jq7oQyQE4EgWNeK6sHQn/XGyDHQ2pB5JzU4Bam9m1PQ9UtxLI/4AFqXW5Yl9VDZkTf8hkRLcJ1AbkBNCy/NiGQ==", + "dependencies": { + "Microsoft.Extensions.Features": "8.0.29", + "System.IO.Pipelines": "8.0.0" + } + }, + "Microsoft.AspNetCore.Http.Connections.Client": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "ZnUtm+OPtOOKnnF+ZQucdPb/oBix5gyznn+XUztW7Z5c5TpWkwx4NNJVxJGoazMdpQu3EUsXF3anN2nOSK7pNg==", + "dependencies": { + "Microsoft.AspNetCore.Http.Connections.Common": "8.0.29", + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.Http.Connections.Common": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "JBJI5k7nXefp2pdlk2cgdQp1zdweCcKzzeXjIalEQDuFdkJ4nMZ/Lzt3NA2XhqCKzKzKSh+EfKMytkYkxdK0NA==", + "dependencies": { + "Microsoft.AspNetCore.Connections.Abstractions": "8.0.29" + } + }, + "Microsoft.AspNetCore.Metadata": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "5Oyb4tncDGft/tXVJoyO7iWy1fnz1AzgycQfzPPSJqafmp3J+xLhgfDSTB+hzVVyG9mcb9z/8m9RDEx7bCj3Kw==" + }, + "Microsoft.AspNetCore.SignalR.Client.Core": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "T7RADZHU0G093e037prxlYIjV09mxIaVXcSip4tcpMMivawMBAR9WIJc9mqhkmAhO8RxmFKaK8BloOzLPuk/9Q==", + "dependencies": { + "Microsoft.AspNetCore.SignalR.Common": "8.0.29", + "Microsoft.AspNetCore.SignalR.Protocols.Json": "8.0.29", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1", + "System.Threading.Channels": "8.0.0" + } + }, + "Microsoft.AspNetCore.SignalR.Common": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "silO++Rqw7ssetrLnSPTauWwJUwU/sgITKsYpuvJtDrqwZnXLYqvMflKkdS118oPLrh5GgZspvakJoQffbin4Q==", + "dependencies": { + "Microsoft.AspNetCore.Connections.Abstractions": "8.0.29", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.SignalR.Protocols.Json": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "lS8j3Awf+kwG0lGHNIHXJFiCEogdTroLhmRxQ4+T68aJUaXIu0LxVAZL9hjm16LoohL4jVmTPwgQHF7mYKo4Ow==", + "dependencies": { + "Microsoft.AspNetCore.SignalR.Common": "8.0.29" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3lE/iLSutpgX1CC0NOW70FJoGARRHbyKmG7dc0klnUZ9Dd9hS6N/POPWhKhMLCEuNN5nXEY5agmlFtH562vqhQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.FileExtensions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "EJzSNO9oaAXnTdtdNO6npPRsIIeZCBSNmdQ091VDO7fBiOtJAAeEq6dtrVXIi3ZyjC5XRSAtVvF8SzcneRHqKQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Json": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "L89DLNuimOghjV3tLx0ArFDwVEJD6+uGB3BMCMX01kaLzXkaXHb2021xOMl2QOxUxbdePKUZsUY7n2UUkycjRg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "BmANAnR5Xd4Oqw7yQ75xOAYODybZQRzdeNucg7kS5wWKd2PNnMdYtJ2Vciy0QLylRmv42DGl5+AFL9izA6F1Rw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "3iE7UF7MQkCv1cxzCahz+Y/guQbTqieyxyaWKhrRO91itI9cOKO76OHeQDahqG4MmW5umr3CcCvGmK92lWNlbg==" + }, + "Microsoft.Extensions.Features": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "0zMsmVIfuu9AP3pgIbHt3SOdEHHdGZSbRlTl8+ysZkNLbbZ0B2tm0Y6kYfuw/VsuAuKHy0IOOgobm3maYRQCIg==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "4x+pzsQEbqxhNf1QYRr5TDkLP9UsLT3A6MdRKDDEgrW7h1ljiEPgTNhKYUhNCCAaVpQECVQ+onA91PTPnIp6Lw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Logging.Abstractions": "8.0.2", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "8.0.3", + "contentHash": "dL0QGToTxggRLMYY4ZYX5AMwBb+byQBd/5dMiZE07Nv73o6I5Are3C7eQTh7K2+A4ct0PVISSr7TZANbiNb2yQ==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.2" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "dWGKvhFybsaZpGmzkGCbNNwBD1rVlWzrZKANLW/CcbFJpCEceMCGzT7zZwHOGBCbwM0SzBuceMj5HN1LKV1QqA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "bXJEZrW9ny8vjMF1JV253WeLhpEVzFo1lyaZu1vQ4ZxWUlVvknZ/+ftFgVheLubb4eZPSwwxBeqS1JkCOjxd8g==" + }, + "Microsoft.JSInterop": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "6N3e6a5YHcV53/jU63XBvLEOEV3ctWSFZi+hNl0HNRHYd3aJrTSA9Wl6tq7/9piO+pYRat4V6wPB2NEWMe3TnA==" + }, + "Microsoft.JSInterop.WebAssembly": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "aPT2wbEYTKwFYwSGGNEoX0af5jrAPIG8zzMuZ02Hfh4+6+0lFAdRcZ3GEHljoVbE491WSLgoeyMQTcUKx3zYTQ==", + "dependencies": { + "Microsoft.JSInterop": "8.0.29" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "FHNOatmUq0sqJOkTx+UF/9YK1f180cnW5FVqnQMvYUN0elp6wFzbtPSiqbo1/ru8ICp43JM1i7kKkk6GsNGHlA==" + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" + } + }, + "net8.0/browser-wasm": {} + } +} \ No newline at end of file diff --git a/src/server/SmartBotBlazorApp.Tests/RobotMeasurementThrottleTests.cs b/src/server/SmartBotBlazorApp.Tests/RobotMeasurementThrottleTests.cs new file mode 100644 index 0000000..b4a5f4c --- /dev/null +++ b/src/server/SmartBotBlazorApp.Tests/RobotMeasurementThrottleTests.cs @@ -0,0 +1,50 @@ +using SmartBotBlazorApp.Data; + +namespace SmartBotBlazorApp.Tests; + +public class RobotMeasurementThrottleTests +{ + private static readonly TimeSpan Interval = TimeSpan.FromSeconds(1); + + [Fact] + public void ThrottleIsIndependentForEachRobot() + { + var timeProvider = new ManualTimeProvider(); + var throttle = new RobotMeasurementThrottle(timeProvider); + + Assert.True(throttle.TryAcquire("robot-a", Interval, out _)); + Assert.False(throttle.TryAcquire("robot-a", Interval, out _)); + Assert.True(throttle.TryAcquire("robot-b", Interval, out _)); + + timeProvider.Advance(Interval); + + Assert.True(throttle.TryAcquire("robot-a", Interval, out var timestamp)); + Assert.Equal(timeProvider.GetUtcNow(), timestamp); + } + + [Fact] + public void ConcurrentAttemptsAllowOnlyOneWrite() + { + var throttle = new RobotMeasurementThrottle(new ManualTimeProvider()); + var successes = 0; + + Parallel.For(0, 100, iteration => + { + if (throttle.TryAcquire("robot-a", Interval, out _)) + { + Interlocked.Increment(ref successes); + } + }); + + Assert.Equal(1, successes); + } + + private sealed class ManualTimeProvider : TimeProvider + { + private DateTimeOffset _utcNow = new(2026, 7, 15, 10, 0, 0, TimeSpan.Zero); + + public override DateTimeOffset GetUtcNow() => _utcNow; + + public void Advance(TimeSpan duration) => _utcNow += duration; + } +} diff --git a/src/server/SmartBotBlazorApp.Tests/RobotMessageValidatorTests.cs b/src/server/SmartBotBlazorApp.Tests/RobotMessageValidatorTests.cs index dde785a..b1d0a95 100644 --- a/src/server/SmartBotBlazorApp.Tests/RobotMessageValidatorTests.cs +++ b/src/server/SmartBotBlazorApp.Tests/RobotMessageValidatorTests.cs @@ -40,4 +40,11 @@ public void InvalidTelemetryShapeOrValuesAreRejected() measurements[0] = double.NaN; Assert.Throws(() => RobotMessageValidator.ValidateTelemetry("Robot_KI", measurements, new ushort[64])); } + + [Fact] + public void RobotIdentifierLongerThanDatabaseColumnIsRejected() + { + Assert.Throws(() => + RobotMessageValidator.ValidateTelemetry(new string('r', 51), new double[7], new ushort[64])); + } } diff --git a/src/server/SmartBotBlazorApp.Tests/SignalHubAccessTests.cs b/src/server/SmartBotBlazorApp.Tests/SignalHubAccessTests.cs index 4bd6e51..b79d167 100644 --- a/src/server/SmartBotBlazorApp.Tests/SignalHubAccessTests.cs +++ b/src/server/SmartBotBlazorApp.Tests/SignalHubAccessTests.cs @@ -1,4 +1,5 @@ using System.Security.Claims; +using Microsoft.AspNetCore.DataProtection; namespace SmartBotBlazorApp.Tests; @@ -12,6 +13,7 @@ public void AuthenticatedUserDoesNotNeedRobotKey() var identity = new ClaimsIdentity([new Claim(ClaimTypes.Name, "operator")], "test"); Assert.True(SignalHubAccess.IsAllowed(new ClaimsPrincipal(identity), null, null)); + Assert.True(SignalHubAccess.IsOperator(new ClaimsPrincipal(identity))); } [Fact] @@ -34,4 +36,39 @@ public void ShortConfiguredKeyIsRejected() { Assert.False(SignalHubAccess.IsAllowed(new ClaimsPrincipal(), "short", "short")); } + + [Fact] + public void RobotPrincipalCannotActAsOperator() + { + var principal = SignalHubAccess.CreateRobotPrincipal(); + + Assert.True(SignalHubAccess.IsRobot(principal)); + Assert.False(SignalHubAccess.IsOperator(principal)); + } + + [Fact] + public void UnauthenticatedRobotClaimIsRejected() + { + var identity = new ClaimsIdentity( + [new Claim(SignalHubAccess.ClientTypeClaim, SignalHubAccess.RobotClientType)]); + + Assert.False(SignalHubAccess.IsRobot(new ClaimsPrincipal(identity))); + } + + [Fact] + public void OperatorTokenRoundTripsAndRejectsTampering() + { + var service = new SignalHubTokenService(new EphemeralDataProtectionProvider()); + var identity = new ClaimsIdentity( + [new Claim(ClaimTypes.NameIdentifier, "operator-1")], + "test"); + + var token = service.CreateOperatorToken(new ClaimsPrincipal(identity)); + var principal = service.TryValidateOperatorToken(token); + + Assert.NotNull(principal); + Assert.True(SignalHubAccess.IsOperator(principal)); + Assert.Equal("operator-1", principal.FindFirstValue(ClaimTypes.NameIdentifier)); + Assert.Null(service.TryValidateOperatorToken(token + "tampered")); + } } diff --git a/src/server/SmartBotBlazorApp.Tests/SmartBotBlazorApp.Tests.csproj b/src/server/SmartBotBlazorApp.Tests/SmartBotBlazorApp.Tests.csproj index 2561f3e..73d5104 100644 --- a/src/server/SmartBotBlazorApp.Tests/SmartBotBlazorApp.Tests.csproj +++ b/src/server/SmartBotBlazorApp.Tests/SmartBotBlazorApp.Tests.csproj @@ -14,8 +14,8 @@ runtime; build; native; contentfiles; analyzers; buildtransitive all - - + + runtime; build; native; contentfiles; analyzers; buildtransitive all diff --git a/src/server/SmartBotBlazorApp.Tests/packages.lock.json b/src/server/SmartBotBlazorApp.Tests/packages.lock.json new file mode 100644 index 0000000..fdecf4e --- /dev/null +++ b/src/server/SmartBotBlazorApp.Tests/packages.lock.json @@ -0,0 +1,879 @@ +{ + "version": 1, + "dependencies": { + "net8.0": { + "coverlet.collector": { + "type": "Direct", + "requested": "[10.0.1, )", + "resolved": "10.0.1", + "contentHash": "27jXSV/0DbVqF5jDrAxuQFZ9oaz6gmG03p8ttxAFk+X0M4woFYj7MoWDLCna5EGLb0CE6OE7X6ZH3Wt5smTtaA==" + }, + "Microsoft.NET.Test.Sdk": { + "type": "Direct", + "requested": "[18.8.1, )", + "resolved": "18.8.1", + "contentHash": "dknJL3/9Y3t4XuCBqnc0PevPxgLsUMmVhjwup/b1HNovA8zWcj3XsfIf7c6p05363DWcqL7X/YhDL9B+Zymv1w==", + "dependencies": { + "Microsoft.CodeCoverage": "18.8.1", + "Microsoft.TestPlatform.TestHost": "18.8.1" + } + }, + "xunit.runner.visualstudio": { + "type": "Direct", + "requested": "[3.1.5, )", + "resolved": "3.1.5", + "contentHash": "tKi7dSTwP4m5m9eXPM2Ime4Kn7xNf4x4zT9sdLO/G4hZVnQCRiMTWoSZqI/pYTVeI27oPPqHBKYI/DjJ9GsYgA==" + }, + "xunit.v3": { + "type": "Direct", + "requested": "[3.2.2, )", + "resolved": "3.2.2", + "contentHash": "L+4/4y0Uqcg8/d6hfnxhnwh4j9FaeULvefTwrk30rr1o4n/vdPfyUQ8k0yzH8VJx7bmFEkDdcRfbtbjEHlaYcA==", + "dependencies": { + "xunit.v3.mtp-v1": "[3.2.2]" + } + }, + "Azure.Core": { + "type": "Transitive", + "resolved": "1.50.0", + "contentHash": "GBNKZEhdIbTXxedvD3R7I/yDVFX9jJJEz02kCziFSJxspSQ5RMHc3GktulJ1s7+ffXaXD7kMgrtdQTaggyInLw==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "8.0.0", + "System.ClientModel": "1.8.0", + "System.Memory.Data": "8.0.1" + } + }, + "Azure.Identity": { + "type": "Transitive", + "resolved": "1.17.1", + "contentHash": "MSZkBrctcpiGxs9Cvr2VKKoN6qFLZlP3I6xuCWJ9iTgitI5Rgxtk5gfOSpXPZE3+CJmZ/mnqpQyGyjawFn5Vvg==", + "dependencies": { + "Azure.Core": "1.50.0", + "Microsoft.Identity.Client": "4.78.0", + "Microsoft.Identity.Client.Extensions.Msal": "4.78.0" + } + }, + "Microsoft.ApplicationInsights": { + "type": "Transitive", + "resolved": "2.23.0", + "contentHash": "nWArUZTdU7iqZLycLKWe0TDms48KKGE6pONH2terYNa8REXiqixrMOkf1sk5DHGMaUTqONU2YkS4SAXBhLStgw==", + "dependencies": { + "System.Diagnostics.DiagnosticSource": "5.0.0" + } + }, + "Microsoft.AspNetCore.Authorization": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "IMVrMqYF7LASYMWVt/sL9f5vkA8qtfvsLEaxSchEc1Pk/zxdQt1fP1W3hN6Wxm0+wJjAKO+DhF/1mi22AtAfCQ==", + "dependencies": { + "Microsoft.AspNetCore.Metadata": "8.0.29", + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.Components": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1ZNdFYtEORG9LOYFJf0AtNMSAtkQ8WQ5XEGQXdEDvRMYBp4MS5t6mPAiWGVMb5aKpPfaeXOGHQqDcZHP3QfuAA==", + "dependencies": { + "Microsoft.AspNetCore.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components.Analyzers": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Analyzers": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "AoGUtJ3CgKhihjGCga7vNCawzWUHb7QNMtxzBJKjTYYhM9HwkGE/xmg6sZNO3Tw5W+ke5PoUO411Squ//jgiTQ==" + }, + "Microsoft.AspNetCore.Components.Authorization": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1zf+E8B8BZod/1POB4c/YnHKPXaj/zkoFeT079iwJHWMBXxB/Y75Dug2KstusYEZBHyiHdN7UUD+Fh2edLEVvg==", + "dependencies": { + "Microsoft.AspNetCore.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Forms": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "GXmEG6N30oDLZHvyxUmwKDPh/iQkcsktjUb3wffSV3Qi4DD1O37Zzz4EBIsgLQwTr4WtqjQ94yprJtKy+YSE1g==", + "dependencies": { + "Microsoft.AspNetCore.Components": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.Web": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "1El7nDceNvO07z3Wr8uYj9J5Y7KdtIEgpbyfb9r88BYFVuZxaDDA2F4n907mWib1iLbw+XoV25XbNcPH2rne/A==", + "dependencies": { + "Microsoft.AspNetCore.Components": "8.0.29", + "Microsoft.AspNetCore.Components.Forms": "8.0.29", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Primitives": "8.0.0", + "Microsoft.JSInterop": "8.0.29", + "System.IO.Pipelines": "8.0.0" + } + }, + "Microsoft.AspNetCore.Components.WebAssembly": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "wAPYLWm1Y2ikdUY0OgsWOJ0A1iQ0GJIvwsgbQKXTBUP/9r5rK3DvmJnZy9a0yEMslJPxvYesACNYDmLz2sTcxQ==", + "dependencies": { + "Microsoft.AspNetCore.Components.Web": "8.0.29", + "Microsoft.Extensions.Configuration.Binder": "8.0.2", + "Microsoft.Extensions.Configuration.Json": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1", + "Microsoft.JSInterop.WebAssembly": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.WebAssembly.Authentication": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "rs3U4TsemB1lqnpBVtLlQbQM3ewtAImIy3OjlhM7YjxJb/1AEXmIno1Wm8S3HPScYmLZtwLrTG5//uNlYzlRag==", + "dependencies": { + "Microsoft.AspNetCore.Components.Authorization": "8.0.29", + "Microsoft.AspNetCore.Components.Web": "8.0.29" + } + }, + "Microsoft.AspNetCore.Components.WebAssembly.Server": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "mF8RihuRK1PqMDDXCmD53f14Q1zp6N51UFwGLDjwiKpGEf4MWUknbRIglPIZf3Lt6c/af2pNSz1fLYXcymzNCg==" + }, + "Microsoft.AspNetCore.Connections.Abstractions": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "jq7oQyQE4EgWNeK6sHQn/XGyDHQ2pB5JzU4Bam9m1PQ9UtxLI/4AFqXW5Yl9VDZkTf8hkRLcJ1AbkBNCy/NiGQ==", + "dependencies": { + "Microsoft.Extensions.Features": "8.0.29", + "System.IO.Pipelines": "8.0.0" + } + }, + "Microsoft.AspNetCore.Cryptography.Internal": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "RAknfruzMmottkLWOxKzCrqOE5hp88Avr8qJU9YtxYsiJ1aH+Ij2SVcwS9Tx3VXuUesJqPADK6gZsG/bX4h6XA==" + }, + "Microsoft.AspNetCore.Cryptography.KeyDerivation": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "DIEnc7iZJHoNIar8pz+HHtm9XvshFrCSq9GtS+KLQn6AA98c9PeeoSPCwTBwvfY47KpuTUr6zNYIy/EERMzf3w==", + "dependencies": { + "Microsoft.AspNetCore.Cryptography.Internal": "8.0.29" + } + }, + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "S2oPwtyDpmRQTjPY7M/8kDqH2Eujd8FpkIav4tdgYdTM6LeM5ab+L2IklpQ+TUbtbdyItIooKHVEzbuk1pxUDg==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Relational": "8.0.29" + } + }, + "Microsoft.AspNetCore.Http.Connections.Client": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "ZnUtm+OPtOOKnnF+ZQucdPb/oBix5gyznn+XUztW7Z5c5TpWkwx4NNJVxJGoazMdpQu3EUsXF3anN2nOSK7pNg==", + "dependencies": { + "Microsoft.AspNetCore.Http.Connections.Common": "8.0.29", + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.Http.Connections.Common": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "JBJI5k7nXefp2pdlk2cgdQp1zdweCcKzzeXjIalEQDuFdkJ4nMZ/Lzt3NA2XhqCKzKzKSh+EfKMytkYkxdK0NA==", + "dependencies": { + "Microsoft.AspNetCore.Connections.Abstractions": "8.0.29" + } + }, + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "TYM50l/64ZShlAE2jChEQapK0KPg969yYKGR8w8KGxVtktRlaNC/aN43bggoYwswiXhQ7dU2zqmMu6UH2pVbYQ==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Relational": "8.0.29", + "Microsoft.Extensions.Identity.Stores": "8.0.29" + } + }, + "Microsoft.AspNetCore.Metadata": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "5Oyb4tncDGft/tXVJoyO7iWy1fnz1AzgycQfzPPSJqafmp3J+xLhgfDSTB+hzVVyG9mcb9z/8m9RDEx7bCj3Kw==" + }, + "Microsoft.AspNetCore.SignalR.Client": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "GeNFUL39i+NZ+Z8tGFLyqYpdMIwolMfrE7qUbw6ipt864yF4gEDRb/vBoOJhRRaJU6KVdXVuKwUX1s+Atvsprw==", + "dependencies": { + "Microsoft.AspNetCore.Http.Connections.Client": "8.0.29", + "Microsoft.AspNetCore.SignalR.Client.Core": "8.0.29" + } + }, + "Microsoft.AspNetCore.SignalR.Client.Core": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "T7RADZHU0G093e037prxlYIjV09mxIaVXcSip4tcpMMivawMBAR9WIJc9mqhkmAhO8RxmFKaK8BloOzLPuk/9Q==", + "dependencies": { + "Microsoft.AspNetCore.SignalR.Common": "8.0.29", + "Microsoft.AspNetCore.SignalR.Protocols.Json": "8.0.29", + "Microsoft.Extensions.DependencyInjection": "8.0.1", + "Microsoft.Extensions.Logging": "8.0.1", + "System.Threading.Channels": "8.0.0" + } + }, + "Microsoft.AspNetCore.SignalR.Common": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "silO++Rqw7ssetrLnSPTauWwJUwU/sgITKsYpuvJtDrqwZnXLYqvMflKkdS118oPLrh5GgZspvakJoQffbin4Q==", + "dependencies": { + "Microsoft.AspNetCore.Connections.Abstractions": "8.0.29", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.AspNetCore.SignalR.Protocols.Json": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "lS8j3Awf+kwG0lGHNIHXJFiCEogdTroLhmRxQ4+T68aJUaXIu0LxVAZL9hjm16LoohL4jVmTPwgQHF7mYKo4Ow==", + "dependencies": { + "Microsoft.AspNetCore.SignalR.Common": "8.0.29" + } + }, + "Microsoft.Bcl.AsyncInterfaces": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "3WA9q9yVqJp222P3x1wYIGDAkpjAku0TMUaaQV22g6L67AI0LdOIrVS7Ht2vJfLHGSPVuqN94vIr15qn+HEkHw==" + }, + "Microsoft.CodeCoverage": { + "type": "Transitive", + "resolved": "18.8.1", + "contentHash": "Eclse/ZZjr4lmWzZFNN9h/OluhKL+SK/QbUyKUewgX139aGeyMEO/DkMPwuFs2MixvanTnz6891rF8UHDg+W4Q==" + }, + "Microsoft.Data.SqlClient": { + "type": "Transitive", + "resolved": "6.1.6", + "contentHash": "6abRPXrjjEWxcNkTomBIzBdGolYnwD0ykP+6YAynaEEfKlGe94ZSQd58pggucusp28xUA7wLo9XcvzU92ZuF6Q==", + "dependencies": { + "Azure.Core": "1.50.0", + "Azure.Identity": "1.17.1", + "Microsoft.Data.SqlClient.SNI.runtime": "6.0.2", + "Microsoft.Extensions.Caching.Memory": "8.0.1", + "Microsoft.Identity.Client": "4.84.2", + "Microsoft.Identity.Client.Broker": "4.84.2", + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Protocols.OpenIdConnect": "7.7.1", + "Microsoft.SqlServer.Server": "1.0.0", + "System.Configuration.ConfigurationManager": "8.0.1", + "System.Diagnostics.DiagnosticSource": "8.0.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1", + "System.Security.Cryptography.Pkcs": "8.0.1" + } + }, + "Microsoft.Data.SqlClient.SNI.runtime": { + "type": "Transitive", + "resolved": "6.0.2", + "contentHash": "f+pRODTWX7Y67jXO3T5S2dIPZ9qMJNySjlZT/TKmWVNWe19N8jcWmHaqHnnchaq3gxEKv1SWVY5EFzOD06l41w==" + }, + "Microsoft.EntityFrameworkCore": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "ByxJvHZwP1QWLXmPLNClJ4mVAgzAjzdKlK/pb2E9qbyuQdhwGTy/yfTDsPlwYtXlwnDes9/2p4mOP/+Cbo4pFA==", + "dependencies": { + "Microsoft.EntityFrameworkCore.Abstractions": "9.0.18", + "Microsoft.EntityFrameworkCore.Analyzers": "9.0.18", + "Microsoft.Extensions.Caching.Memory": "9.0.18", + "Microsoft.Extensions.Logging": "9.0.18" + } + }, + "Microsoft.EntityFrameworkCore.Abstractions": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "4nD2ZtEG/fNyHT4bo0MovOw6wDVv2xunhmRm448AKbX3y2ohEZkkxI4Nm+JHBZmluzsV6HHWFRWawFj8VuNltg==" + }, + "Microsoft.EntityFrameworkCore.Analyzers": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "KI+qKZHU1OfEUjQEpQEh/EXo9wN8DP+Jt1aReNJe/MezR/cVTr79c4VeMv4cyizki7YWW3DDDWZCcy/Eiay6dg==" + }, + "Microsoft.EntityFrameworkCore.Relational": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "kn6DongUAVevGsydWJdJUB0N6QamtwyDjhwrbV8Yrfs84i5rcEj5SY+3eyPzAInzd1icrZBd7A+r0yEpULkjEg==", + "dependencies": { + "Microsoft.EntityFrameworkCore": "9.0.18", + "Microsoft.Extensions.Caching.Memory": "9.0.18", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.18", + "Microsoft.Extensions.Logging": "9.0.18" + } + }, + "Microsoft.EntityFrameworkCore.SqlServer": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "ahPFWSNFE13PlCF9E7Hu2oUHydCItn4j4S71P00vV56PDKnY59nlg3gpSNTblYUvi5mwOPWtIAOud8hZOBfrQA==", + "dependencies": { + "Microsoft.Data.SqlClient": "5.1.6", + "Microsoft.EntityFrameworkCore.Relational": "9.0.18", + "Microsoft.Extensions.Caching.Memory": "9.0.18", + "Microsoft.Extensions.Configuration.Abstractions": "9.0.18", + "Microsoft.Extensions.Logging": "9.0.18", + "System.Formats.Asn1": "9.0.18", + "System.Text.Json": "9.0.18" + } + }, + "Microsoft.Extensions.Caching.Abstractions": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "Y8PnPKq+ASBazn0QA5d98/dWT0MAfv9CJYV6zPZ/TisZpAUe5zWgKldJLXkrmUuIzvUpQS7/SF7+1dld3OP/EQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "9.0.18" + } + }, + "Microsoft.Extensions.Caching.Memory": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "ZQ+x93CRR8DOGT+YPP4YXvwTAJ0MfvAghs5cwCSvtZFiORSfprAw9f67d0QDhf6PCIYyFsMKFB+PI3p9lpiMUQ==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "9.0.18", + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.18", + "Microsoft.Extensions.Logging.Abstractions": "9.0.18", + "Microsoft.Extensions.Options": "9.0.18", + "Microsoft.Extensions.Primitives": "9.0.18" + } + }, + "Microsoft.Extensions.Configuration": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "0J/9YNXTMWSZP2p2+nvl8p71zpSwokZXZuJW+VjdErkegAnFdO1XlqtA62SJtgVYHdKu3uPxJHcMR/r35HwFBA==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Abstractions": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "jgC5SZeK94t8DXl836ifIM5gScNqknkOwISrY503eWg7AHBrv+fnwty+C9n35H4WvBjs8OY21jPlRRf7ESBK/g==", + "dependencies": { + "Microsoft.Extensions.Primitives": "9.0.18" + } + }, + "Microsoft.Extensions.Configuration.Binder": { + "type": "Transitive", + "resolved": "8.0.2", + "contentHash": "7IQhGK+wjyGrNsPBjJcZwWAr+Wf6D4+TwOptUt77bWtgNkiV8tDEbhFS+dDamtQFZ2X7kWG9m71iZQRj2x3zgQ==", + "dependencies": { + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.FileExtensions": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "EJzSNO9oaAXnTdtdNO6npPRsIIeZCBSNmdQ091VDO7fBiOtJAAeEq6dtrVXIi3ZyjC5XRSAtVvF8SzcneRHqKQ==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileProviders.Physical": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.Configuration.Json": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "L89DLNuimOghjV3tLx0ArFDwVEJD6+uGB3BMCMX01kaLzXkaXHb2021xOMl2QOxUxbdePKUZsUY7n2UUkycjRg==", + "dependencies": { + "Microsoft.Extensions.Configuration": "8.0.0", + "Microsoft.Extensions.Configuration.Abstractions": "8.0.0", + "Microsoft.Extensions.Configuration.FileExtensions": "8.0.1", + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0" + } + }, + "Microsoft.Extensions.DependencyInjection": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "xPoYhpBypsweLpZ29GPp6Kv6g1fZMUwJ800D/xO7ASuNn5zx0BNIP600wXXhbPNeO8kKngFRtoWplRffxBUDgw==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.18" + } + }, + "Microsoft.Extensions.DependencyInjection.Abstractions": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "eSUdaLUP+pj1J7SpCsUYQP6dNk0w9g0KGu4ovPYBnlfqomW1u+1fF8ZIjMVuHY6Z3p30yL0SxND9JTS6i3NolQ==" + }, + "Microsoft.Extensions.Features": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "0zMsmVIfuu9AP3pgIbHt3SOdEHHdGZSbRlTl8+ysZkNLbbZ0B2tm0Y6kYfuw/VsuAuKHy0IOOgobm3maYRQCIg==" + }, + "Microsoft.Extensions.FileProviders.Abstractions": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ZbaMlhJlpisjuWbvXr4LdAst/1XxH3vZ6A0BsgTphZ2L4PGuxRLz7Jr/S7mkAAnOn78Vu0fKhEgNF5JO3zfjqQ==", + "dependencies": { + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileProviders.Physical": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "UboiXxpPUpwulHvIAVE36Knq0VSHaAmfrFkegLyBZeaADuKezJ/AIXYAW8F5GBlGk/VaibN2k/Zn1ca8YAfVdA==", + "dependencies": { + "Microsoft.Extensions.FileProviders.Abstractions": "8.0.0", + "Microsoft.Extensions.FileSystemGlobbing": "8.0.0", + "Microsoft.Extensions.Primitives": "8.0.0" + } + }, + "Microsoft.Extensions.FileSystemGlobbing": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "OK+670i7esqlQrPjdIKRbsyMCe9g5kSLpRRQGSr4Q58AOYEe/hCnfLZprh7viNisSUUQZmMrbbuDaIrP+V1ebQ==" + }, + "Microsoft.Extensions.Identity.Core": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "os0Bq475TseOIY+ieTPW/0Iyoe9B+qEr+ahipj9ojpvPgA95tRZXYGaEHSvjv71/AqRgFdN+gSi3AExT3wih7g==", + "dependencies": { + "Microsoft.AspNetCore.Cryptography.KeyDerivation": "8.0.29", + "Microsoft.Extensions.Logging": "8.0.1", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.Extensions.Identity.Stores": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "AbZ/yMoGstUaDucifJ25/Dm344GuQv8LYLrIsPTkGZ/H+Nb1/oyfJXV+acQ3Gon6uNqvXso4W/xqqiSTkUqsvQ==", + "dependencies": { + "Microsoft.Extensions.Caching.Abstractions": "8.0.0", + "Microsoft.Extensions.Identity.Core": "8.0.29", + "Microsoft.Extensions.Logging": "8.0.1" + } + }, + "Microsoft.Extensions.Localization": { + "type": "Transitive", + "resolved": "8.0.8", + "contentHash": "n32ZGmc2UOv9R/xsBHQPOxBsqCSAAJSoMtFqoQ8zOegB2P+H6+773OyCWg4jRBkO/3dmCyBJXB0yLAOVW2/C/w==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "8.0.1", + "Microsoft.Extensions.Localization.Abstractions": "8.0.8", + "Microsoft.Extensions.Logging.Abstractions": "8.0.1", + "Microsoft.Extensions.Options": "8.0.2" + } + }, + "Microsoft.Extensions.Localization.Abstractions": { + "type": "Transitive", + "resolved": "8.0.8", + "contentHash": "WYIsqP/A6dH/LWJznrvgoNPc7Q+CUJD0E78765GL3aonBtyFK1BKtPzBvvlnrr3SVqSO2r6xJCLgCEiCMG1gfA==" + }, + "Microsoft.Extensions.Logging": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "LuOCZhcJ4TeCLE99TRqI1FHReB29G7bAPInrAAG3E85/S+E4mcrmaoeoXLnOUi6DEosx87pauyFNICdiFIFqkA==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection": "9.0.18", + "Microsoft.Extensions.Logging.Abstractions": "9.0.18", + "Microsoft.Extensions.Options": "9.0.18" + } + }, + "Microsoft.Extensions.Logging.Abstractions": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "uzNHNdNZJTHACwFkWclx8s5GXLjGacJj4QwBQZ/6BeixTJjlHmNESIK738iPFLPkO8jWsENLUcUW/kAPe0b8ew==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.18", + "System.Diagnostics.DiagnosticSource": "9.0.18" + } + }, + "Microsoft.Extensions.Options": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "HiA/R0jGR10TGuR6coM8KMUdJ5YlP3bhGxqEdGLkxFdBV1EFNdZMAajSEZHwkex4X/iMQwRCQVotqpElcxOImg==", + "dependencies": { + "Microsoft.Extensions.DependencyInjection.Abstractions": "9.0.18", + "Microsoft.Extensions.Primitives": "9.0.18" + } + }, + "Microsoft.Extensions.Primitives": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "hfHudMC5zDlwMrC0HiHOJesSHMvM+CdqjomjcV/YVzFq5dfSpBRvyRLm1n1Bfh41ZpQnyJzqX+YEo95BAmcDAQ==" + }, + "Microsoft.Identity.Client": { + "type": "Transitive", + "resolved": "4.84.2", + "contentHash": "Va9FjmABSgj/lcUfHH0pBNQkmS7SNyepz2ERV7Yynp6QgEYpFdSqR6Vzy1WWipN8GS5pBHuXoZbqaDWuARCrHQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "8.14.0", + "System.Diagnostics.DiagnosticSource": "6.0.1" + } + }, + "Microsoft.Identity.Client.Broker": { + "type": "Transitive", + "resolved": "4.84.2", + "contentHash": "928ySLeGz1xtvydwq6h9tv7TbxrtA4ZzavLKUqRJh0PW6BGcEJwpI8W8vf2PlQdYemGm/oyGjdzYzdY/I8r/4A==", + "dependencies": { + "Microsoft.Identity.Client": "4.84.2", + "Microsoft.Identity.Client.NativeInterop": "0.20.6" + } + }, + "Microsoft.Identity.Client.Extensions.Msal": { + "type": "Transitive", + "resolved": "4.78.0", + "contentHash": "DYU9o+DrDQuyZxeq91GBA9eNqBvA3ZMkLzQpF7L9dTk6FcIBM1y1IHXWqiKXTvptPF7CZE59upbyUoa+FJ5eiA==", + "dependencies": { + "Microsoft.Identity.Client": "4.78.0", + "System.Security.Cryptography.ProtectedData": "4.5.0" + } + }, + "Microsoft.Identity.Client.NativeInterop": { + "type": "Transitive", + "resolved": "0.20.6", + "contentHash": "noyfdMfVxyWpM6xUDmlW6gUvZ5ci24z7Qoy15JvynTQfZV5vTD2NEdsnT5Gy4ngViwgdIp5iRjRy10jAKXFAgw==" + }, + "Microsoft.IdentityModel.Abstractions": { + "type": "Transitive", + "resolved": "8.14.0", + "contentHash": "iwbCpSjD3ehfTwBhtSNEtKPK0ICun6ov7Ibx6ISNA9bfwIyzI2Siwyi9eJFCJBwxowK9xcA1mj+jBWiigeqgcQ==" + }, + "Microsoft.IdentityModel.JsonWebTokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "3Izi75UCUssvo8LPx3OVnEeZay58qaFicrtSnbtUt7q8qQi0gy46gh4V8VUTkMVMKXV6VMyjBVmeNNgeCUJuIw==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Logging": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "BZNgSq/o8gsKExdYoBKPR65fdsxW0cTF8PsdqB8y011AGUJJW300S/ZIsEUD0+sOmGc003Gwv3FYbjrVjvsLNQ==", + "dependencies": { + "Microsoft.IdentityModel.Abstractions": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "h+fHHBGokepmCX+QZXJk4Ij8OApCb2n2ktoDkNX5CXteXsOxTHMNgjPGpAwdJMFvAL7TtGarUnk3o97NmBq2QQ==", + "dependencies": { + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "Microsoft.IdentityModel.Protocols.OpenIdConnect": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "yT2Hdj8LpPbcT9C9KlLVxXl09C8zjFaVSaApdOwuecMuoV4s6Sof/mnTDz/+F/lILPIBvrWugR9CC7iRVZgbfQ==", + "dependencies": { + "Microsoft.IdentityModel.Protocols": "7.7.1", + "System.IdentityModel.Tokens.Jwt": "7.7.1" + } + }, + "Microsoft.IdentityModel.Tokens": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "fQ0VVCba75lknUHGldi3iTKAYUQqbzp1Un8+d9cm9nON0Gs8NAkXddNg8iaUB0qi/ybtAmNWizTR4avdkCJ9pQ==", + "dependencies": { + "Microsoft.IdentityModel.Logging": "7.7.1" + } + }, + "Microsoft.JSInterop": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "6N3e6a5YHcV53/jU63XBvLEOEV3ctWSFZi+hNl0HNRHYd3aJrTSA9Wl6tq7/9piO+pYRat4V6wPB2NEWMe3TnA==" + }, + "Microsoft.JSInterop.WebAssembly": { + "type": "Transitive", + "resolved": "8.0.29", + "contentHash": "aPT2wbEYTKwFYwSGGNEoX0af5jrAPIG8zzMuZ02Hfh4+6+0lFAdRcZ3GEHljoVbE491WSLgoeyMQTcUKx3zYTQ==", + "dependencies": { + "Microsoft.JSInterop": "8.0.29" + } + }, + "Microsoft.NETCore.Platforms": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "VyPlqzH2wavqquTcYpkIIAQ6WdenuKoFN0BdYBbCWsclXacSOHNQn66Gt4z5NBqEYW0FAPm5rlvki9ZiCij5xQ==" + }, + "Microsoft.SqlServer.Server": { + "type": "Transitive", + "resolved": "1.0.0", + "contentHash": "N4KeF3cpcm1PUHym1RmakkzfkEv3GRMyofVv40uXsQhCQeglr2OHNcUk2WOG51AKpGO8ynGpo9M/kFXSzghwug==" + }, + "Microsoft.Testing.Extensions.Telemetry": { + "type": "Transitive", + "resolved": "1.9.1", + "contentHash": "No5AudZMmSb+uNXjlgL2y3/stHD2IT4uxqc5yHwkE+/nNux9jbKcaJMvcp9SwgP4DVD8L9/P3OUz8mmmcvEIdQ==", + "dependencies": { + "Microsoft.ApplicationInsights": "2.23.0", + "Microsoft.Testing.Platform": "1.9.1" + } + }, + "Microsoft.Testing.Extensions.TrxReport.Abstractions": { + "type": "Transitive", + "resolved": "1.9.1", + "contentHash": "AL46Xe1WBi85Ntd4mNPvat5ZSsZ2uejiVqoKCypr8J3wK0elA5xJ3AN4G/Q4GIwzUFnggZoH/DBjnr9J18IO/g==", + "dependencies": { + "Microsoft.Testing.Platform": "1.9.1" + } + }, + "Microsoft.Testing.Platform": { + "type": "Transitive", + "resolved": "1.9.1", + "contentHash": "QafNtNSmEI0zazdebnsIkDKmFtTSpmx/5PLOjURWwozcPb3tvRxzosQSL8xwYNM1iPhhKiBksXZyRSE2COisrA==" + }, + "Microsoft.Testing.Platform.MSBuild": { + "type": "Transitive", + "resolved": "1.9.1", + "contentHash": "oTUtyR4X/s9ytuiNA29FGsNCCH0rNmY5Wdm14NCKLjTM1cT9edVSlA+rGS/mVmusPqcP0l/x9qOnMXg16v87RQ==", + "dependencies": { + "Microsoft.Testing.Platform": "1.9.1" + } + }, + "Microsoft.TestPlatform.ObjectModel": { + "type": "Transitive", + "resolved": "18.8.1", + "contentHash": "qLbktNB1+b1XZLNJBTzaWVVJAd6PEzD7cgD406geMb6PcFZhp3EDNa1tctWx1+mtMU6MP/6ozVvFPC9vs2a9rw==", + "dependencies": { + "System.Reflection.Metadata": "8.0.0" + } + }, + "Microsoft.TestPlatform.TestHost": { + "type": "Transitive", + "resolved": "18.8.1", + "contentHash": "FaQHPDTUOcE+SFTjssNPfrub2lT9Zyon4J2W/KLHt/efLJACb1TCeWXyOgh0D/4Q1e4n+S3E6mOKud+9nLZlEA==", + "dependencies": { + "Microsoft.TestPlatform.ObjectModel": "18.8.1" + } + }, + "Microsoft.Win32.Registry": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dDoKi0PnDz31yAyETfRntsLArTlVAVzUzCIvvEDsDsucrl33Dl8pIJG06ePTJTI3tGpeyHS9Cq7Foc/s4EeKcg==", + "dependencies": { + "System.Security.AccessControl": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "MudBlazor": { + "type": "Transitive", + "resolved": "7.16.0", + "contentHash": "68bEFn7MLCyOB4yYxtvZG+AA+bZbxBDcIOhnSVFrHrAg8LLXVw1LxHCp9EyRktlREpnoAO1JxINp+5WeHc9Z4w==", + "dependencies": { + "Microsoft.AspNetCore.Components": "8.0.8", + "Microsoft.AspNetCore.Components.Web": "8.0.8", + "Microsoft.Extensions.Localization": "8.0.8" + } + }, + "Newtonsoft.Json": { + "type": "Transitive", + "resolved": "13.0.4", + "contentHash": "pdgNNMai3zv51W5aq268sujXUyx7SNdE2bj1wZcWjAQrKMFZV260lbqYop1d2GM67JI1huLRwxo9ZqnfF/lC6A==" + }, + "SixLabors.ImageSharp": { + "type": "Transitive", + "resolved": "3.1.12", + "contentHash": "iAg6zifihXEFS/t7fiHhZBGAdCp3FavsF4i2ZIDp0JfeYeDVzvmlbY1CNhhIKimaIzrzSi5M/NBFcWvZT2rB/A==" + }, + "System.ClientModel": { + "type": "Transitive", + "resolved": "1.8.0", + "contentHash": "AqRzhn0v29GGGLj/Z6gKq4lGNtvPHT4nHdG5PDJh9IfVjv/nYUVmX11hwwws1vDFeIAzrvmn0dPu8IjLtu6fAw==", + "dependencies": { + "Microsoft.Extensions.Logging.Abstractions": "8.0.3", + "System.Memory.Data": "8.0.1" + } + }, + "System.Collections.Immutable": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "AurL6Y5BA1WotzlEvVaIDpqzpIPvYnnldxru8oXJU2yFxFUy3+pNXjXd1ymO+RA0rq0+590Q8gaz2l3Sr7fmqg==" + }, + "System.Configuration.ConfigurationManager": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "gPYFPDyohW2gXNhdQRSjtmeS6FymL2crg4Sral1wtvEJ7DUqFCDWDVbbLobASbzxfic8U1hQEdC7hmg9LHncMw==", + "dependencies": { + "System.Diagnostics.EventLog": "8.0.1", + "System.Security.Cryptography.ProtectedData": "8.0.0" + } + }, + "System.Diagnostics.DiagnosticSource": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "zXv17I0lirlmcrLyvSYUHYpXDh/pJ54QfKI96/132KEMsgaG2m61UisI9CJrayZq1mRQL1u4T2ri6eVM6auhPg==" + }, + "System.Diagnostics.EventLog": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "n1ZP7NM2Gkn/MgD8+eOT5MulMj6wfeQMNS2Pizvq5GHCZfjlFMXV2irQlQmJhwA2VABC57M0auudO89Iu2uRLg==" + }, + "System.Formats.Asn1": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "FHZkK31ffB8aVfqhh24E2p96Ezihj2d2kE8Ksf6hcPb0uP1kRW9XTAFHa5Y3Ph4kKCdl2TGH8dCr/cHG7TDK6g==" + }, + "System.IdentityModel.Tokens.Jwt": { + "type": "Transitive", + "resolved": "7.7.1", + "contentHash": "rQkO1YbAjLwnDJSMpRhRtrc6XwIcEOcUvoEcge+evurpzSZM3UNK+MZfD3sKyTlYsvknZ6eJjSBfnmXqwOsT9Q==", + "dependencies": { + "Microsoft.IdentityModel.JsonWebTokens": "7.7.1", + "Microsoft.IdentityModel.Tokens": "7.7.1" + } + }, + "System.IO.Pipelines": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "9AcBFLF9KZpCiv+xTN8emSsiF1FEq/DdswZrJgqlf37dKThJSXwCQ1QUfH24+k9X89C80CI0IQCZatdg0yj3Jw==" + }, + "System.Memory.Data": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "BVYuec3jV23EMRDeR7Dr1/qhx7369dZzJ9IWy2xylvb4YfXsrUxspWc4UWYid/tj4zZK58uGZqn2WQiaDMhmAg==" + }, + "System.Reflection.Metadata": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "ptvgrFh7PvWI8bcVqG5rsA/weWM09EnthFHR5SCnS6IN+P4mj6rE1lBDC4U8HL9/57htKAqy4KQ3bBj84cfYyQ==", + "dependencies": { + "System.Collections.Immutable": "8.0.0" + } + }, + "System.Security.AccessControl": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "dagJ1mHZO3Ani8GH0PHpPEe/oYO+rVdbQjvjJkBRNQkX4t0r1iaeGn8+/ybkSLEan3/slM0t59SVdHzuHf2jmw==", + "dependencies": { + "Microsoft.NETCore.Platforms": "5.0.0", + "System.Security.Principal.Windows": "5.0.0" + } + }, + "System.Security.Cryptography.Pkcs": { + "type": "Transitive", + "resolved": "8.0.1", + "contentHash": "CoCRHFym33aUSf/NtWSVSZa99dkd0Hm7OCZUxORBjRB16LNhIEOf8THPqzIYlvKM0nNDAPTRBa1FxEECrgaxxA==" + }, + "System.Security.Cryptography.ProtectedData": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "+TUFINV2q2ifyXauQXRwy4CiBhqvDEDZeVJU7qfxya4aRYOKzVBpN+4acx25VcPB9ywUN6C0n8drWl110PhZEg==" + }, + "System.Security.Principal.Windows": { + "type": "Transitive", + "resolved": "5.0.0", + "contentHash": "t0MGLukB5WAVU9bO3MGzvlGnyJPgUlcwerXn1kzBRjwLKixT96XV0Uza41W49gVd8zEMFu9vQEFlv0IOrytICA==" + }, + "System.Text.Encodings.Web": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "Uqybp2r2zFvSDKckcr30TbXRrjW16ihRFzdHVC8Jo8DwkRDJfBuPkXS7hqcUwRYE3ItHKeyfcbq/SpExNPuE2Q==" + }, + "System.Text.Json": { + "type": "Transitive", + "resolved": "9.0.18", + "contentHash": "/xX8vajlGUp1FoGSNUJBJS+E/2TQjmcMoUzHePa+coPdLnFGPcolRHlybSZhKyAKj+sNDSFlLNYYLe8aEOElfA==", + "dependencies": { + "System.IO.Pipelines": "9.0.18", + "System.Text.Encodings.Web": "9.0.18" + } + }, + "System.Threading.Channels": { + "type": "Transitive", + "resolved": "8.0.0", + "contentHash": "CMaFr7v+57RW7uZfZkPExsPB6ljwzhjACWW1gfU35Y56rk72B/Wu+sTqxVmGSk4SFUlPc3cjeKND0zktziyjBA==" + }, + "xunit.analyzers": { + "type": "Transitive", + "resolved": "1.27.0", + "contentHash": "y/pxIQaLvk/kxAoDkZW9GnHLCEqzwl5TW0vtX3pweyQpjizB9y3DXhb9pkw2dGeUqhLjsxvvJM1k89JowU6z3g==" + }, + "xunit.v3.assert": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "BPciBghgEEaJN/JG00QfCYDfEfnLgQhfnYEy+j1izoeHVNYd5+3Wm8GJ6JgYysOhpBPYGE+sbf75JtrRc7jrdA==" + }, + "xunit.v3.common": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "Hj775PEH6GTbbg0wfKRvG2hNspDCvTH9irXhH4qIWgdrOSV1sQlqPie+DOvFeigsFg2fxSM3ZAaaCDQs+KreFA==", + "dependencies": { + "Microsoft.Bcl.AsyncInterfaces": "6.0.0" + } + }, + "xunit.v3.core.mtp-v1": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "Ga5aA2Ca9ktz+5k3g5ukzwfexwoqwDUpV6z7atSEUvqtd6JuybU1XopHqg1oFd78QdTfZgZE9h5sHpO4qYIi5w==", + "dependencies": { + "Microsoft.Testing.Extensions.Telemetry": "1.9.1", + "Microsoft.Testing.Extensions.TrxReport.Abstractions": "1.9.1", + "Microsoft.Testing.Platform": "1.9.1", + "Microsoft.Testing.Platform.MSBuild": "1.9.1", + "xunit.v3.extensibility.core": "[3.2.2]", + "xunit.v3.runner.inproc.console": "[3.2.2]" + } + }, + "xunit.v3.extensibility.core": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "srY8z/oMPvh/t8axtO2DwrHajhFMH7tnqKildvYrVQIfICi8fOn3yIBWkVPAcrKmHMwvXRJ/XsQM3VMR6DOYfQ==", + "dependencies": { + "xunit.v3.common": "[3.2.2]" + } + }, + "xunit.v3.mtp-v1": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "O41aAzYKBT5PWqATa1oEWVNCyEUypFQ4va6K0kz37dduV3EKzXNMaV2UnEhufzU4Cce1I33gg0oldS8tGL5I0A==", + "dependencies": { + "xunit.analyzers": "1.27.0", + "xunit.v3.assert": "[3.2.2]", + "xunit.v3.core.mtp-v1": "[3.2.2]" + } + }, + "xunit.v3.runner.common": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "/hkHkQCzGrugelOAehprm7RIWdsUFVmIVaD6jDH/8DNGCymTlKKPTbGokD5czbAfqfex47mBP0sb0zbHYwrO/g==", + "dependencies": { + "Microsoft.Win32.Registry": "[5.0.0]", + "xunit.v3.common": "[3.2.2]" + } + }, + "xunit.v3.runner.inproc.console": { + "type": "Transitive", + "resolved": "3.2.2", + "contentHash": "ulWOdSvCk+bPXijJZ73bth9NyoOHsAs1ZOvamYbCkD4DNLX/Bd29Ve2ZNUwBbK0MqfIYWXHZViy/HKrdEC/izw==", + "dependencies": { + "xunit.v3.extensibility.core": "[3.2.2]", + "xunit.v3.runner.common": "[3.2.2]" + } + }, + "smartbotblazorapp": { + "type": "Project", + "dependencies": { + "Microsoft.AspNetCore.Components.WebAssembly.Server": "[8.0.29, )", + "Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore": "[8.0.29, )", + "Microsoft.AspNetCore.Identity.EntityFrameworkCore": "[8.0.29, )", + "Microsoft.AspNetCore.SignalR.Client": "[8.0.29, )", + "Microsoft.Data.SqlClient": "[6.1.6, )", + "Microsoft.EntityFrameworkCore.SqlServer": "[9.0.18, )", + "MudBlazor": "[7.16.0, )", + "Newtonsoft.Json": "[13.0.4, )", + "SixLabors.ImageSharp": "[3.1.12, )", + "SmartBotBlazorApp.Client": "[1.0.0, )" + } + }, + "smartbotblazorapp.client": { + "type": "Project", + "dependencies": { + "Microsoft.AspNetCore.Components.WebAssembly": "[8.0.29, )", + "Microsoft.AspNetCore.Components.WebAssembly.Authentication": "[8.0.29, )", + "Microsoft.AspNetCore.SignalR.Client": "[8.0.29, )" + } + } + } + } +} \ No newline at end of file diff --git a/src/server/SmartBotBlazorApp/AccountAccessOptions.cs b/src/server/SmartBotBlazorApp/AccountAccessOptions.cs new file mode 100644 index 0000000..17b9735 --- /dev/null +++ b/src/server/SmartBotBlazorApp/AccountAccessOptions.cs @@ -0,0 +1,10 @@ +namespace SmartBotBlazorApp; + +public sealed class AccountAccessOptions +{ + public const string SectionName = "AccountAccess"; + + public bool AllowRegistration { get; set; } + + public bool ShowSelfConfirmationLink { get; set; } +} diff --git a/src/server/SmartBotBlazorApp/Components/Account/Pages/Register.razor b/src/server/SmartBotBlazorApp/Components/Account/Pages/Register.razor index b18be84..949253a 100644 --- a/src/server/SmartBotBlazorApp/Components/Account/Pages/Register.razor +++ b/src/server/SmartBotBlazorApp/Components/Account/Pages/Register.razor @@ -14,45 +14,55 @@ @inject ILogger Logger @inject NavigationManager NavigationManager @inject IdentityRedirectManager RedirectManager +@inject Microsoft.Extensions.Options.IOptions AccountAccess Register

Register

-
-
- - - -

Create a new account.

-
- -
- - - -
-
- - - -
-
- - - -
- - +@if (!AccountAccess.Value.AllowRegistration) +{ +
+ Public account registration is disabled. Ask the administrator to create or enable an account.
-
-
-

Use another service to register.

-
- -
+} +else +{ +
+
+ + + +

Create a new account.

+
+ +
+ + + +
+
+ + + +
+
+ + + +
+ + +
+
+
+

Use another service to register.

+
+ +
+
-
+} @code { private IEnumerable? identityErrors; @@ -67,6 +77,19 @@ public async Task RegisterUser(EditContext editContext) { + if (!AccountAccess.Value.AllowRegistration) + { + identityErrors = + [ + new IdentityError + { + Code = "RegistrationDisabled", + Description = "Public account registration is disabled." + } + ]; + return; + } + var user = CreateUser(); await UserStore.SetUserNameAsync(user, Input.Email, CancellationToken.None); diff --git a/src/server/SmartBotBlazorApp/Components/Account/Pages/RegisterConfirmation.razor b/src/server/SmartBotBlazorApp/Components/Account/Pages/RegisterConfirmation.razor index 9654fe6..3459d99 100644 --- a/src/server/SmartBotBlazorApp/Components/Account/Pages/RegisterConfirmation.razor +++ b/src/server/SmartBotBlazorApp/Components/Account/Pages/RegisterConfirmation.razor @@ -9,6 +9,7 @@ @inject IEmailSender EmailSender @inject NavigationManager NavigationManager @inject IdentityRedirectManager RedirectManager +@inject Microsoft.Extensions.Options.IOptions AccountAccess Register confirmation @@ -25,7 +26,7 @@ } else { -

Please check your email to confirm your account.

+

If the account exists, follow the confirmation instructions sent by the application administrator.

} @code { @@ -51,12 +52,10 @@ else var user = await UserManager.FindByEmailAsync(Email); if (user is null) { - HttpContext.Response.StatusCode = StatusCodes.Status404NotFound; - statusMessage = "Error finding user for unspecified email"; + statusMessage = "Unable to prepare account confirmation."; } - else if (EmailSender is IdentityNoOpEmailSender) + else if (EmailSender is IdentityNoOpEmailSender && AccountAccess.Value.ShowSelfConfirmationLink) { - // Once you add a real email sender, you should remove this code that lets you confirm the account var userId = await UserManager.GetUserIdAsync(user); var code = await UserManager.GenerateEmailConfirmationTokenAsync(user); code = WebEncoders.Base64UrlEncode(Encoding.UTF8.GetBytes(code)); diff --git a/src/server/SmartBotBlazorApp/Components/App.razor b/src/server/SmartBotBlazorApp/Components/App.razor index 4ead12d..8abf03f 100644 --- a/src/server/SmartBotBlazorApp/Components/App.razor +++ b/src/server/SmartBotBlazorApp/Components/App.razor @@ -8,7 +8,6 @@ - diff --git a/src/server/SmartBotBlazorApp/Components/Layout/MainLayout.razor b/src/server/SmartBotBlazorApp/Components/Layout/MainLayout.razor index e0b16a2..0557815 100644 --- a/src/server/SmartBotBlazorApp/Components/Layout/MainLayout.razor +++ b/src/server/SmartBotBlazorApp/Components/Layout/MainLayout.razor @@ -7,16 +7,16 @@
- - Akadamia Tarnowska + + Akademia Tarnowska - - Github + + GitHub - - + + .NET
diff --git a/src/server/SmartBotBlazorApp/Components/Pages/ImageReceiver_server.razor b/src/server/SmartBotBlazorApp/Components/Pages/ImageReceiver_server.razor index 0ee5718..ea22753 100644 --- a/src/server/SmartBotBlazorApp/Components/Pages/ImageReceiver_server.razor +++ b/src/server/SmartBotBlazorApp/Components/Pages/ImageReceiver_server.razor @@ -1,6 +1,8 @@ @page "/image-receiver-server" @rendermode InteractiveServer @inject NavigationManager Navigation +@inject AuthenticationStateProvider AuthenticationStateProvider +@inject SignalHubTokenService SignalHubTokens @implements IAsyncDisposable @attribute [Authorize] @using RobotMovementInput @@ -9,12 +11,13 @@ Live View Image
-
+
@if (_imageSrc == null) { - Test Image