From 548f3cd692f8a11337ec711744284479debd2719 Mon Sep 17 00:00:00 2001
From: Bradley Hilton <graywolf336@craftyn.com>
Date: Mon, 31 Jul 2017 18:34:35 -0500
Subject: [PATCH] Fix #7509, allow the username to be passed into the setAvatar

---
 packages/rocketchat-api/server/v1/users.js | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/packages/rocketchat-api/server/v1/users.js b/packages/rocketchat-api/server/v1/users.js
index 924eca1b5701..d2fdd1349f49 100644
--- a/packages/rocketchat-api/server/v1/users.js
+++ b/packages/rocketchat-api/server/v1/users.js
@@ -195,7 +195,11 @@ RocketChat.API.v1.addRoute('users.resetAvatar', { authRequired: true }, {
 
 RocketChat.API.v1.addRoute('users.setAvatar', { authRequired: true }, {
 	post() {
-		check(this.bodyParams, { avatarUrl: Match.Maybe(String), userId: Match.Maybe(String) });
+		check(this.bodyParams, Match.ObjectIncluding({
+			avatarUrl: Match.Maybe(String),
+			userId: Match.Maybe(String),
+			username: Match.Maybe(String)
+		}));
 
 		let user;
 		if (this.isUserFromParams()) {