@digione/node-custom-api 0.2.0-beta3 → 0.2.0-beta5
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/package.json +1 -1
- package/utils/stream.js +5 -3
- package/utils/validator.js +2 -1
package/package.json
CHANGED
package/utils/stream.js
CHANGED
|
@@ -486,8 +486,10 @@ class StreamUtil {
|
|
|
486
486
|
}
|
|
487
487
|
return Object.assign({ field_slug: i['lang_code'], field_name: `${convert_option ? (0, i18n_1.__)({ phrase: item['field_name'], locale: lang_code }) : item['field_name']} (${i['lang_code']})`, field_type: item['field_type'], field_name_raw: item['field_name'] ? item['field_name'] : "", is_required: item['is_required'] }, include);
|
|
488
488
|
});
|
|
489
|
-
|
|
490
|
-
|
|
489
|
+
if (item['field_type'] != "stream") {
|
|
490
|
+
fields.push(Object.assign(Object.assign({}, item), { field_data }));
|
|
491
|
+
continue;
|
|
492
|
+
}
|
|
491
493
|
}
|
|
492
494
|
if (convert_option) {
|
|
493
495
|
let obj_value = {};
|
|
@@ -683,7 +685,7 @@ class StreamUtil {
|
|
|
683
685
|
if (field_data['choose_stream']) {
|
|
684
686
|
let stream = yield stream_1.StreamModel.schema(this.ref, "_").findOne({ where: { id: field_data['choose_stream'] }, raw: true, attributes: ['stream_slug', 'stream_namespace'] });
|
|
685
687
|
if (stream) {
|
|
686
|
-
item['stream'] = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { field_only: true, convert_option: true });
|
|
688
|
+
item['stream'] = yield this.findField(stream['stream_slug'], stream['stream_namespace'], { option, lang_code, field_only: true, convert_option: true });
|
|
687
689
|
}
|
|
688
690
|
}
|
|
689
691
|
}
|
package/utils/validator.js
CHANGED
|
@@ -104,8 +104,9 @@ const fileService = (setup, { userfiles = false, required = false, fileSize = 0,
|
|
|
104
104
|
}
|
|
105
105
|
let option = setup(validate);
|
|
106
106
|
let upload = userfiles ? option.array("userfiles", maxCount) : option.any();
|
|
107
|
+
let schema = userfiles ? { tags: Joi.array().allow('', null).items(Joi.object().keys({ slug: Joi.string(), type: Joi.string() })) } : { tags: Joi.any() };
|
|
107
108
|
return upload(req, res, (err) => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
108
|
-
return (0, exports.validateService)(Joi.object().keys(
|
|
109
|
+
return (0, exports.validateService)(Joi.object().keys(schema).unknown(), { field_omit: [] })(req, res, () => tslib_1.__awaiter(void 0, void 0, void 0, function* () {
|
|
109
110
|
try {
|
|
110
111
|
let field = userfiles ? "userfiles" : undefined;
|
|
111
112
|
if (err) {
|