Skip to content

Node.js based forum software built for the modern web

refactor: one owner for custom user field value parsing (#14862)

palmoni5eb0f0ecab4bf
diff --git a/src/controllers/accounts/helpers.js b/src/controllers/accounts/helpers.js
index 3af83bbfd8..86515ee91f 100644
--- a/src/controllers/accounts/helpers.js
+++ b/src/controllers/accounts/helpers.js
@@ -189,11 +189,7 @@ helpers.getCustomUserFields = async function (callerUID, userData) {
fields.forEach((f) => {
let userValue = userData[f.key];
if (f.type === 'select-multi' && userValue) {
- try {
- userValue = JSON.parse(userValue);
- } catch (err) {
- userValue = [];
- }
+ userValue = user.customFields.parseValue(f, userValue) || [];
}
if (f.type === 'input-link' && userValue) {
userValue = utils.isSafeHref(userValue) ? userValue : '';
diff --git a/src/user/custom-fields.js b/src/user/custom-fields.js
index 631cd938a0..ae7edc10af 100644
--- a/src/user/custom-fields.js
+++ b/src/user/custom-fields.js
@@ -36,6 +36,20 @@ CustomFields.getOptions = function (field) {
return (field['select-options'] || '').split('\n').filter(Boolean);
};
+CustomFields.parseValue = function (field, value) {
+ if (field.type !== 'select-multi') {
+ return value;
+ }
+
+ let values;
+ try {
+ values = JSON.parse(value || '[]');
+ } catch (err) {
+ return null;
+ }
+ return Array.isArray(values) ? values : null;
+};
+
CustomFields.validate = function (field, value) {
const { type } = field;
@@ -76,13 +90,8 @@ CustomFields.validate = function (field, value) {
}
} else if (type === 'select-multi') {
const opts = CustomFields.getOptions(field);
- let values;
- try {
- values = JSON.parse(value || '[]');
- } catch (err) {
- values = null;
- }
- if (!Array.isArray(values) || !values.every(value => opts.includes(value))) {
+ const values = CustomFields.parseValue(field, value);
+ if (!values || !values.every(value => opts.includes(value))) {
throw new Error(tx.compile(
'error:custom-user-field-select-value-invalid', field.name
));
diff --git a/test/user/custom-fields.js b/test/user/custom-fields.js
index 8c662d7311..9aefd366a9 100644
--- a/test/user/custom-fields.js
+++ b/test/user/custom-fields.js
@@ -144,4 +144,21 @@ describe('custom user fields', () => {
const { body } = await request.get(`${nconf.get('url')}/api/user/highrepuser`);
assert.strictEqual(body.website, 'https://nodebb.org');
});
+
+ it('should render a select-multi field from its stored json', async () => {
+ const { body } = await request.get(`${nconf.get('url')}/api/user/highrepuser`);
+ const field = body.customUserFields.find(f => f.key === 'favouriteLanguages');
+ assert.strictEqual(field.value, 'Javascript, Python');
+ assert.deepStrictEqual(
+ field['select-options'].filter(opt => opt.selected).map(opt => opt.value),
+ ['Javascript', 'Python']
+ );
+ });
+
+ it('should render a select-multi field unselected if the stored value is malformed', async () => {
+ await db.setObjectField(`user:${highRepUid}`, 'favouriteLanguages', 'not json');
+ const { body } = await request.get(`${nconf.get('url')}/api/user/highrepuser`);
+ const field = body.customUserFields.find(f => f.key === 'favouriteLanguages');
+ assert.ok(field['select-options'].every(opt => !opt.selected));
+ });
});