Fixed merging conflicts with main.

leepeuker · Feb 25, 2024 · 6d34481 · 6d34481
1 parent 3b32135
commit 6d34481
Showing 1 changed file with 15 additions and 19 deletions.
diff --git a/docs/openapi.json b/docs/openapi.json
@@ -174,7 +174,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -237,7 +237,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -291,7 +291,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       }
@@ -427,7 +427,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -477,7 +477,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -527,7 +527,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       }
@@ -677,7 +677,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -745,7 +745,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -813,7 +813,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       },
@@ -871,7 +871,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       }
@@ -980,7 +980,7 @@
         },
         "security": [
           {
-            "authToken": []
+            "token": []
           }
         ]
       }
@@ -1082,20 +1082,16 @@
                   "type": "object",
                   "properties": {
                     "authenticated": {
-                      "type": "boolean",
+                      "type": "string",
                       "description": "True if authenticated, false if unauthenticated."
                     },
                     "username": {
                       "type": "string",
                       "description": "The username of the authenticated user. It's empty if the user is unauthenticated."
                     },
                     "userId": {
-                      "type": "integer",
+                      "type": "string",
                       "description": "The ID of the authenticated user. It's empty if the user is unauthenticated."
-                    },
-                    "isAdmin": {
-                      "type": "boolean",
-                      "description": "True if the user is an admin, False if the user isn't."
                     }
                   }
                 }
@@ -1409,12 +1405,12 @@
       }
     },
     "securitySchemes": {
-      "authToken": {
+      "token": {
         "type": "apiKey",
         "name": "X-Auth-Token",
         "in": "header"
       },
-      "cookieauth": {
+      "cookie": {
         "type": "apiKey",
         "name": "id",
         "in": "cookie"