Mirrored_Repos/crafty-4
1
0
Fork 0
mirror of https://gitlab.com/crafty-controller/crafty-4.git synced 2024-08-30 18:23:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add human readable error for getting server files

Browse Source
This commit is contained in:
amcmanu3
2024-08-06 12:55:07 -04:00
parent 332f19c212
commit 7ae7c0f50d
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
app/classes/web/routes/api/crafty/imports/index.py
View File

@ -13,10 +13,14 @@ logger = logging.getLogger(__name__)
files_get_schema = {
"type": "object",
"properties": {
"page": {"type": "string", "minLength": 1},
"folder": {"type": "string"},
"upload": {"type": "boolean", "default": "False"},
"unzip": {"type": "boolean", "default": "True"},
"page": {
"type": "string",
"minLength": 1,
"error": "filesPageLen",
},
"folder": {"type": "string", "error": "typeString"},
"upload": {"type": "boolean", "default": "False", "error": "typeBool"},
"unzip": {"type": "boolean", "default": "True", "error": "typeBool"},
},
"additionalProperties": False,
"minProperties": 1,
@ -47,13 +51,19 @@ class ApiImportFilesIndexHandler(BaseApiHandler):
)
try:
validate(data, files_get_schema)
except ValidationError as e:
except ValidationError as why:
offending_key = why.path[0] if why.path else None
err = f"""{self.translator.translate(
"validators",
why.schema.get("error"),
self.controller.users.get_user_lang_by_id(auth_data[4]["user_id"]),
)} {offending_key}"""
return self.finish_json(
400,
{
"status": "error",
"error": "INVALID_JSON_SCHEMA",
"error_data": str(e),
"error_data": f"{str(err)}",
},
)
# TODO: limit some columns for specific permissions?

5
app/translations/en_EN.json
View File

@ -668,11 +668,12 @@
"uses": "Number of uses allowed (-1==No Limit)"
},
"validators": {
"filesPageLen": "Length must be greater than 1 for property ",
"passLength": "Password Too Short. Minimum Length: 8",
"typeBool": "Type error: True or False required for ",
"typeInteger": "Type error: Integer required for ",
"typeList": "Type error: List required for ",
"typeString": "Type error: String required for ",
"passLength": "Password Too Short. Minimum Length: 8"
"typeString": "Type error: String required for "
},
"webhooks": {
"areYouSureDel": "Are you sure you want to delete this webhook?",