Skip to content
Snippets Groups Projects
Commit 202bb31b authored by Marcos Spessatto Defendi's avatar Marcos Spessatto Defendi Committed by Rodrigo Nascimento
Browse files

Fix REST /me regression (#10833)

Fix: Regression in REST API endpoint `/me` 
parent 4ed57e01
No related branches found
No related tags found
No related merge requests found
...@@ -30,7 +30,12 @@ const getInfoFromUserObject = (user) => { ...@@ -30,7 +30,12 @@ const getInfoFromUserObject = (user) => {
RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) { RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) {
const me = getInfoFromUserObject(user); const me = getInfoFromUserObject(user);
const verifiedEmail = me.emails.find((email) => email.verified); const isVerifiedEmail = () => {
if (me && me.emails && Array.isArray(me.emails)) {
return me.emails.find((email) => email.verified);
}
return false;
};
const getUserPreferences = () => { const getUserPreferences = () => {
const defaultUserSettingPrefix = 'Accounts_Default_User_Preferences_'; const defaultUserSettingPrefix = 'Accounts_Default_User_Preferences_';
const allDefaultUserSettings = RocketChat.settings.get(new RegExp(`^${ defaultUserSettingPrefix }.*$`)); const allDefaultUserSettings = RocketChat.settings.get(new RegExp(`^${ defaultUserSettingPrefix }.*$`));
...@@ -41,7 +46,7 @@ RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) { ...@@ -41,7 +46,7 @@ RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) {
return accumulator; return accumulator;
}, {}); }, {});
}; };
const verifiedEmail = isVerifiedEmail();
me.email = verifiedEmail ? verifiedEmail.address : undefined; me.email = verifiedEmail ? verifiedEmail.address : undefined;
me.settings = { me.settings = {
preferences: getUserPreferences() preferences: getUserPreferences()
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment