Merge remote-tracking branch 'origin/master' into feature/oauth

# Conflicts: # src/Web/Endpoints/Users.cs
2024-06-16 10:03:00 -04:00
parent 66bfeea3ee 1c6fbed405
commit 3902511e68
13 changed files with 676 additions and 32 deletions
--- a/src/Web/wwwroot/api/specification.json
+++ b/src/Web/wwwroot/api/specification.json
@@ -251,12 +251,20 @@
          {
            "name": "UserId",
            "in": "query",
-            "required": true,
            "schema": {
              "type": "string",
              "nullable": true
            },
            "x-position": 1
+          },
+          {
+            "name": "UserName",
+            "in": "query",
+            "schema": {
+              "type": "string",
+              "nullable": true
+            },
+            "x-position": 2
          }
        ],
        "responses": {