Merge pull request #41045 from nextcloud/fix/openapi/provisioning_api…

…/quota-fields fix(provisioning_api): Fix quota fields in OpenAPI
nextcloud · Oct 23, 2023 · 06b3580 · 06b3580
2 parents 6114364 + d019392
commit 06b3580
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 12 deletions.
diff --git a/apps/provisioning_api/lib/ResponseDefinitions.php b/apps/provisioning_api/lib/ResponseDefinitions.php
@@ -27,11 +27,11 @@
 
 /**
  * @psalm-type ProvisioningApiUserDetailsQuota = array{
- *     free?: float,
+ *     free?: float|int,
  *     quota?: float|int|string,
- *     relative?: float,
- *     total?: float,
- *     used?: float,
+ *     relative?: float|int,
+ *     total?: float|int,
+ *     used?: float|int,
  * }
  *
  * @psalm-type ProvisioningApiUserDetails = array{

diff --git a/apps/provisioning_api/openapi.json b/apps/provisioning_api/openapi.json
@@ -507,8 +507,16 @@
                 "type": "object",
                 "properties": {
                     "free": {
-                        "type": "number",
-                        "format": "float"
+                        "oneOf": [
+                            {
+                                "type": "number",
+                                "format": "float"
+                            },
+                            {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        ]
                     },
                     "quota": {
                         "oneOf": [
@@ -526,16 +534,40 @@
                         ]
                     },
                     "relative": {
-                        "type": "number",
-                        "format": "float"
+                        "oneOf": [
+                            {
+                                "type": "number",
+                                "format": "float"
+                            },
+                            {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        ]
                     },
                     "total": {
-                        "type": "number",
-                        "format": "float"
+                        "oneOf": [
+                            {
+                                "type": "number",
+                                "format": "float"
+                            },
+                            {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        ]
                     },
                     "used": {
-                        "type": "number",
-                        "format": "float"
+                        "oneOf": [
+                            {
+                                "type": "number",
+                                "format": "float"
+                            },
+                            {
+                                "type": "integer",
+                                "format": "int64"
+                            }
+                        ]
                     }
                 }
             }