Skip to content

Node.js based forum software built for the modern web

test: fix more picture tests

Barış Soner Uşaklı446539fb29a3
diff --git a/src/api/users.js b/src/api/users.js
index b962968882..a65c50e24b 100644
--- a/src/api/users.js
+++ b/src/api/users.js
@@ -636,7 +636,15 @@ usersAPI.changePicture = async (caller, data) => {
picture = '';
}
} else if (type === 'external' && url) {
- picture = validator.escape(url);
+ const isUrl = validator.isURL(String(url).trim(), {
+ require_protocol: true,
+ require_valid_protocol: true,
+ require_tld: true,
+ });
+ if (!isUrl) {
+ throw new Error('[[error:invalid-url]]');
+ }
+ picture = String(url || '').trim();
} else {
const returnData = await plugins.hooks.fire('filter:user.getPicture', {
uid: caller.uid,
diff --git a/src/user/picture.js b/src/user/picture.js
index c60c95b721..facf5d7cb6 100644
--- a/src/user/picture.js
+++ b/src/user/picture.js
@@ -224,7 +224,7 @@ module.exports = function (User) {
};
User.removeProfileImage = async function (uid, picture) {
- const userData = await User.getUserFields(uid, ['uploadedpicture', 'picture']);
+ const userData = await db.getObjectFields(`user:${uid}`, ['uploadedpicture', 'picture']);
if (!picture) {
picture = userData.uploadedpicture;
}
diff --git a/test/user.js b/test/user.js
index cd0ba94e57..a865666ac9 100644
--- a/test/user.js
+++ b/test/user.js
@@ -1031,7 +1031,7 @@ describe('User', () => {
await db.sortedSetAdd(`uid:${uid}:profile:pictures`, Date.now(), '/test');
await apiUser.changePicture({ uid: uid }, { type: 'uploaded', picture: '/test', uid: uid });
const picture = await User.getUserField(uid, 'picture');
- assert.equal(picture, `${nconf.get('relative_path')}/test`);
+ assert.equal(picture, `${nconf.get('relative_path')}/test`);
});
it('should return error if profile image uploads disabled', (done) => {