Merge pull request #9183 from RocketChat/fix/api-me-only-return-verified

Fix/api me only return verified # Conflicts: # packages/rocketchat-api/server/v1/misc.js
RocketChat · Dec 20, 2017 · a013e68 · a013e68
1 parent 2c5da35
commit a013e68
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/packages/rocketchat-api/server/v1/misc.js b/packages/rocketchat-api/server/v1/misc.js
@@ -20,7 +20,7 @@ RocketChat.API.v1.addRoute('info', { authRequired: false }, {
 
 RocketChat.API.v1.addRoute('me', { authRequired: true }, {
 	get() {
-		return RocketChat.API.v1.success(_.pick(this.user, [
+		const me = RocketChat.API.v1.success(_.pick(this.user, [
 			'_id',
 			'name',
 			'emails',
@@ -31,6 +31,12 @@ RocketChat.API.v1.addRoute('me', { authRequired: true }, {
 			'active',
 			'language'
 		]));
+
+		const verifiedEmail = me.emails.find((email) => email.verified);
+
+		me.email = verifiedEmail ? verifiedEmail.address : undefined;
+
+		return RocketChat.API.v1.success(me);
 	}
 });