From 202bb31bd304b8dd96b25ad0b8e4109265d2bef4 Mon Sep 17 00:00:00 2001
From: Marcos Spessatto Defendi <marcos.defendi@ulbra.inf.br>
Date: Mon, 21 May 2018 19:12:25 -0300
Subject: [PATCH] Fix REST /me regression (#10833)
Fix: Regression in REST API endpoint `/me`
---
packages/rocketchat-api/server/helpers/getUserInfo.js | 9 +++++++--
1 file changed, 7 insertions(+), 2 deletions(-)
diff --git a/packages/rocketchat-api/server/helpers/getUserInfo.js b/packages/rocketchat-api/server/helpers/getUserInfo.js
index 8c14657417e..0ab30a33ab4 100644
--- a/packages/rocketchat-api/server/helpers/getUserInfo.js
+++ b/packages/rocketchat-api/server/helpers/getUserInfo.js
@@ -30,7 +30,12 @@ const getInfoFromUserObject = (user) => {
RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(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 defaultUserSettingPrefix = 'Accounts_Default_User_Preferences_';
const allDefaultUserSettings = RocketChat.settings.get(new RegExp(`^${ defaultUserSettingPrefix }.*$`));
@@ -41,7 +46,7 @@ RocketChat.API.helperMethods.set('getUserInfo', function _getUserInfo(user) {
return accumulator;
}, {});
};
-
+ const verifiedEmail = isVerifiedEmail();
me.email = verifiedEmail ? verifiedEmail.address : undefined;
me.settings = {
preferences: getUserPreferences()
--
GitLab