Merge pull request #94 from Brixel/improve-debug-config

feat: Improved local debug config
Brixel · Nov 4, 2023 · 5877413 · 5877413
2 parents 7eeff7e + 41a7c81
commit 5877413
Show file tree

Hide file tree

Showing 12 changed files with 2,507 additions and 44 deletions.
diff --git a/.gitignore b/.gitignore
@@ -514,4 +514,6 @@ healthchecksdb
 # Backup folder for Package Reference Convert tool in Visual Studio 2017
 MigrationBackup/
 
-# End of https://www.gitignore.io/api/angular,aspnetcore,visualstudio,visualstudiocode
+# End of https://www.gitignore.io/api/angular,aspnetcore,visualstudio,visualstudiocode
+
+.dev/
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -25,11 +25,6 @@
             "sourceFileMap": {
                 "/Views": "${workspaceFolder}/Views"
             }
-        },
-        {
-            "name": ".NET Core Attach",
-            "type": "coreclr",
-            "request": "attach"
         }
     ]
 }
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -12,30 +12,6 @@
                 "/consoleloggerparameters:NoSummary"
             ],
             "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "publish",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "publish",
-                "${workspaceFolder}/API/DoorRequest.API/DoorRequest.API.csproj",
-                "/property:GenerateFullPaths=true",
-                "/consoleloggerparameters:NoSummary"
-            ],
-            "problemMatcher": "$msCompile"
-        },
-        {
-            "label": "watch",
-            "command": "dotnet",
-            "type": "process",
-            "args": [
-                "watch",
-                "run",
-                "--project",
-                "${workspaceFolder}/API/DoorRequest.API/DoorRequest.API.csproj"
-            ],
-            "problemMatcher": "$msCompile"
         }
     ]
 }
diff --git a/API/DoorRequest.API/Program.cs b/API/DoorRequest.API/Program.cs
@@ -48,6 +48,7 @@
     }).AddJwtBearer(o =>
     {
         o.Authority = authOptions.Authority;
+        o.RequireHttpsMetadata = !authOptions.Authority.Contains("localhost");
         o.TokenValidationParameters = new TokenValidationParameters
         {
             ValidateIssuer = true,

diff --git a/API/DoorRequest.API/appsettings.Development.json b/API/DoorRequest.API/appsettings.Development.json
@@ -17,5 +17,14 @@
         }
       }
     ]
+  },
+  "Authentication": {
+    "Authority": "http://localhost:5302/realms/DevRealm"
+  },
+  "MQTTDoorConfiguration": {
+    "Server": "localhost",
+    "Port": 5303,
+    "UseSSL": false,
+    "Topic": "some/topic"
   }
 }
diff --git a/DoorRequest.sln b/DoorRequest.sln
@@ -1,10 +1,27 @@
-
+
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.6.33723.286
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "DoorRequest.API", "API\DoorRequest.API\DoorRequest.API.csproj", "{263FC65F-673F-42AF-BBDC-7D194BCF58AC}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution items", "Solution items", "{CC45F04F-0025-46C0-B8D9-5072C68FD717}"
+	ProjectSection(SolutionItems) = preProject
+		docker-compose.yml = docker-compose.yml
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Infrastructure", "Infrastructure", "{1CD813E1-F654-4340-8DCA-0935FBBA9EE2}"
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Keycloak", "Keycloak", "{C695FD5A-7CC3-4226-A8C4-7C89EA489FA6}"
+	ProjectSection(SolutionItems) = preProject
+		Infrastructure\Keycloak\DevRealm.json = Infrastructure\Keycloak\DevRealm.json
+	EndProjectSection
+EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Mosquitto", "Mosquitto", "{13A6DFE6-8ADB-4493-91C3-48803473E3E1}"
+	ProjectSection(SolutionItems) = preProject
+		Infrastructure\Mosquitto\config\mosquitto.conf = Infrastructure\Mosquitto\config\mosquitto.conf
+	EndProjectSection
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU