Blazor webapp

.dockerignore

@@ -1,20 +1,25 @@
+**/.classpath
 **/.dockerignore
 **/.env
 **/.git
 **/.gitignore
+**/.project
+**/.settings
+**/.toolstarget
 **/.vs
 **/.vscode
 **/*.*proj.user
+**/*.dbmdl
+**/*.jfm
 **/azds.yaml
-**/charts
 **/bin
+**/charts
+**/docker-compose*
+**/Dockerfile*
+**/node_modules
+**/npm-debug.log
 **/obj
-**/Dockerfile
-**/Dockerfile.develop
-**/docker-compose.yml
-**/docker-compose.*.yml
-**/*.dbmdl
-**/*.jfm
 **/secrets.dev.yaml
 **/values.dev.yaml
-**/.toolstarget
+LICENSE
+README.md

WebApp/doorrequest/.editorconfig → .editorconfig

@@ -119,13 +119,13 @@ csharp_prefer_static_local_function = true:warning
 csharp_preferred_modifier_order = public, private, protected, internal, static, extern, new, virtual, abstract, sealed, override, readonly, unsafe, volatile, async
 
 # Code-block preferences
-csharp_prefer_simple_using_statement = true
+csharp_prefer_simple_using_statement = true:suggestion
 csharp_prefer_braces = when_multiline:warning
 
 # Expression-level preferences
 csharp_prefer_simple_default_expression = true:warning
 csharp_style_deconstructed_variable_declaration = true
-csharp_style_implicit_object_creation_when_type_is_apparent = true
+csharp_style_implicit_object_creation_when_type_is_apparent = true:suggestion
 csharp_style_inlined_variable_declaration = false
 csharp_style_pattern_local_over_anonymous_function = true:warning
 csharp_style_prefer_index_operator = true:warning
@@ -264,3 +264,31 @@ dotnet_naming_style.generic_parameter_style.required_prefix = T
 dotnet_naming_style.generic_parameter_style.required_suffix =
 dotnet_naming_style.generic_parameter_style.word_separator =
 dotnet_naming_style.generic_parameter_style.capitalization = pascal_case
+csharp_style_prefer_method_group_conversion = true:silent
+csharp_style_prefer_top_level_statements = true:silent
+csharp_style_prefer_primary_constructors = true:suggestion
+csharp_style_prefer_null_check_over_type_check = true:suggestion
+csharp_style_prefer_local_over_anonymous_function = true:suggestion
+csharp_style_prefer_tuple_swap = true:suggestion
+csharp_style_prefer_utf8_string_literals = true:suggestion
+
+[*.{cs,vb}]
+dotnet_style_coalesce_expression = true:warning
+dotnet_style_null_propagation = true:warning
+dotnet_style_prefer_is_null_check_over_reference_equality_method = true:warning
+dotnet_style_prefer_auto_properties = true:suggestion
+dotnet_style_object_initializer = true:warning
+dotnet_style_collection_initializer = true:warning
+dotnet_style_prefer_simplified_boolean_expressions = true:warning
+dotnet_style_prefer_conditional_expression_over_assignment = true:suggestion
+dotnet_style_prefer_conditional_expression_over_return = true:suggestion
+dotnet_style_explicit_tuple_names = true:warning
+dotnet_style_prefer_inferred_tuple_names = true:suggestion
+dotnet_style_prefer_inferred_anonymous_type_member_names = true:suggestion
+dotnet_style_prefer_compound_assignment = true:suggestion
+dotnet_style_prefer_simplified_interpolation = true:warning
+dotnet_style_namespace_match_folder = true:suggestion
+dotnet_style_operator_placement_when_wrapping = beginning_of_line
+tab_width = 4
+indent_size = 4
+end_of_line = crlf

.github/workflows/docker-image.yml

@@ -3,15 +3,21 @@ on:
   push:
     branches: [master]
 
-env:
-  REGISTRY: ghcr.io
-
 jobs:
   publish:
+    name: Publish ${{ matrix.image }}
     runs-on: ubuntu-latest
     permissions:
       contents: write
       packages: write
+    strategy:
+      fail-fast: false
+      matrix:
+        include:
+          - dockerfile: ./API/DoorRequest.API/Dockerfile
+            image: ghcr.io/brixel/door-request-api
+          - dockerfile: ./Web/Dockerfile
+            image: ghcr.io/brixel/door-request-web
     steps:
       - name: Checkout
         uses: actions/checkout@v4
@@ -20,7 +26,7 @@ jobs:
       - name: Log in to the Container registry
         uses: docker/login-action@v3
         with:
-          registry: ${{ env.REGISTRY }}
+          registry: ghcr.io
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
       - name: Install GitVersion
@@ -34,14 +40,14 @@ jobs:
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ env.REGISTRY }}/brixel/door-request-api
+          images: ${{ matrix.image }}
           tags: type=semver,pattern={{version}},value=${{ steps.gitversion.outputs.semVer }}
-      - name: Build and push
-        id: docker_build
+      - name: Build and push docker image
+        id: docker_build_api
         uses: docker/build-push-action@v5
         with:
           context: .
           push: true
-          file: API/DoorRequest.API/Dockerfile
+          file: ${{ matrix.dockerfile }}
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}

API/DoorRequest.API/Controllers/DoorRequestController.cs

@@ -1,9 +1,13 @@
-using DoorRequest.API.Config;
+using System.Threading.Tasks;
+
+using DoorRequest.API.Config;
 using DoorRequest.API.Services;
+
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.Options;
-using System.Threading.Tasks;
+
+using Shared.Authorization;
 
 namespace DoorRequest.API.Controllers;
 
@@ -12,24 +16,24 @@ namespace DoorRequest.API.Controllers;
 [Authorize]
 public class DoorRequestController : ControllerBase
 {
-    private readonly IDoorRequestService _doorRequestService;
+    private readonly IDoorService _doorService;
     private readonly LockConfiguration _lockConfiguration;
 
-    public DoorRequestController(IDoorRequestService doorRequestService, IOptions<LockConfiguration> lockConfiguration)
+    public DoorRequestController(IDoorService doorService, IOptions<LockConfiguration> lockConfiguration)
     {
-        _doorRequestService = doorRequestService;
+        _doorService = doorService ?? throw new System.ArgumentNullException(nameof(doorService));
         _lockConfiguration = lockConfiguration.Value;
     }
 
     [HttpPost("open")]
-    [Authorize(Roles = Authorization.Roles.TwentyFourSevenAccess)]
+    [Authorize(Roles = Roles.TwentyFourSevenAccess)]
     public async Task<bool> OpenDoorRequest()
     {
-        return await _doorRequestService.OpenDoor();
+        return await _doorService.OpenDoor();
     }
 
     [HttpGet("code")]
-    [Authorize(Roles = Authorization.Roles.KeyVaultCodeAccess)]
+    [Authorize(Roles = Roles.KeyVaultCodeAccess)]
     public int GetLockCode()
     {
         return _lockConfiguration.Code;

API/DoorRequest.API/DoorRequest.API.csproj

@@ -22,6 +22,10 @@
     <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />  
   </ItemGroup>
 
+  <ItemGroup>
+    <ProjectReference Include="..\..\Shared\Shared.csproj" />
+  </ItemGroup>
+
   <ProjectExtensions><VisualStudio><UserProperties appsettings_1development_1json__JsonSchema="jlgkcxgvknbm v,nmzl ,mznoo534oi5powsjddmg;dms" /></VisualStudio></ProjectExtensions>
 
 </Project>

API/DoorRequest.API/Health.http

@@ -0,0 +1,6 @@
+# For more info on HTTP files go to https://aka.ms/vs/httpfile
+@rootUrl=https://localhost:5001
+
+HEAD {{rootUrl}}/healthz
+
+# HEAD {{rootUrl}}/healthz

API/DoorRequest.API/Program.cs

@@ -1,6 +1,9 @@
-using DoorRequest.API.Authorization;
+using System;
+using System.IdentityModel.Tokens.Jwt;
+
 using DoorRequest.API.Config;
 using DoorRequest.API.Services;
+
 using Microsoft.AspNetCore.Authentication.JwtBearer;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Builder;
@@ -9,10 +12,11 @@
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Microsoft.IdentityModel.Tokens;
+
 using Serilog;
 using Serilog.Events;
-using System;
-using System.IdentityModel.Tokens.Jwt;
+
+using Shared.Authorization;
 
 Log.Logger = new LoggerConfiguration()
     .MinimumLevel.Debug()
@@ -33,6 +37,7 @@
     builder.Services.AddSwaggerGen();
 
     builder.Services.AddControllers();
+    builder.Services.AddHealthChecks();
 
     var authOptions = builder.Configuration.GetSection(AuthenticationConfiguration.SectionName).Get<AuthenticationConfiguration>();
 
@@ -68,22 +73,12 @@
             .Build();
     });
 
-    builder.Services.AddCors(options =>
-    {
-        //TODO: Fix CORS
-        options.AddPolicy("CorsPolicy", builder =>
-            builder.AllowAnyOrigin()
-                .AllowAnyMethod()
-                .AllowAnyHeader());
-    });
-
     builder.Services.AddOptions<DoorConfiguration>()
         .Bind(builder.Configuration.GetSection(DoorConfiguration.SectionName))
         .ValidateDataAnnotations()
         .ValidateOnStart();
 
-    builder.Services.AddScoped<IBrixelOpenDoorClient, BrixelOpenDoorClient>();
-    builder.Services.AddScoped<IDoorRequestService, DoorRequestService>();
+    builder.Services.AddScoped<IDoorService, DoorService>();
     builder.Services.Configure<LockConfiguration>(builder.Configuration.GetSection(nameof(LockConfiguration)));
 
     var app = builder.Build();
@@ -96,12 +91,17 @@
     }
 
     app.UseHttpsRedirection();
-    app.UseCors("CorsPolicy");
+    app.UseCors(builder =>
+        //TODO: Fix CORS
+        builder.AllowAnyOrigin()
+            .AllowAnyMethod()
+            .AllowAnyHeader());
 
     app.UseAuthentication();
     app.UseAuthorization();
 
     app.MapControllers();
+    app.MapHealthChecks("/healthz");
 
     app.Run();
 }

API/DoorRequest.API/Properties/launchSettings.json

@@ -1,22 +1,5 @@
 {
-  "iisSettings": {
-    "windowsAuthentication": false,
-    "anonymousAuthentication": true,
-    "iisExpress": {
-      "applicationUrl": "http://localhost:63559",
-      "sslPort": 44300
-    }
-  },
-  "$schema": "http://json.schemastore.org/launchsettings.json",
   "profiles": {
-    "IIS Express": {
-      "commandName": "IISExpress",
-      "launchBrowser": true,
-      "launchUrl": "api/values",
-      "environmentVariables": {
-        "ASPNETCORE_ENVIRONMENT": "Development"
-      }
-    },
     "DoorRequest.API": {
       "commandName": "Project",
       "launchUrl": "api/values",
@@ -37,5 +20,14 @@
       "useSSL": true,
       "sslPort": 44301
     }
+  },
+  "$schema": "http://json.schemastore.org/launchsettings.json",
+  "iisSettings": {
+    "windowsAuthentication": false,
+    "anonymousAuthentication": true,
+    "iisExpress": {
+      "applicationUrl": "http://localhost:63559",
+      "sslPort": 44300
+    }
   }
 }

API/DoorRequest.API/Services/BrixelOpenDoorClient.cs → API/DoorRequest.API/Services/DoorService.cs

@@ -1,5 +1,6 @@
 
 using DoorRequest.API.Config;
+using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using MQTTnet;
 using MQTTnet.Client;
@@ -11,12 +12,13 @@
 
 namespace DoorRequest.API.Services;
 
-public class BrixelOpenDoorClient : IBrixelOpenDoorClient
+public class DoorService : IDoorService
 {
     private readonly string _topic;
     private readonly MqttClientOptions _options;
+    private readonly ILogger<DoorService> _logger;
 
-    public BrixelOpenDoorClient(IOptions<DoorConfiguration> options)
+    public DoorService(IOptions<DoorConfiguration> options, ILogger<DoorService> logger)
     {
         _topic = options.Value.Topic;
         var optionsBuilder = new MqttClientOptionsBuilder()
@@ -44,10 +46,12 @@ public BrixelOpenDoorClient(IOptions<DoorConfiguration> options)
         }
 
         _options = optionsBuilder.Build();
+        _logger = logger ?? throw new System.ArgumentNullException(nameof(logger));
     }
 
     public async Task<bool> OpenDoor()
     {
+        _logger.LogInformation("Sending request to open the door via MQTT");
         using var mqttClient = new MqttFactory().CreateMqttClient();
         await mqttClient.ConnectAsync(_options, CancellationToken.None);
         var message = new MqttApplicationMessageBuilder()

API/DoorRequest.API/Services/IDoorRequestService.cs → API/DoorRequest.API/Services/IDoorService.cs

@@ -2,7 +2,7 @@
 
 namespace DoorRequest.API.Services;
 
-public interface IDoorRequestService
+public interface IDoorService
 {
     Task<bool> OpenDoor();
 }