From 6d221dc82c98de85f86133ea7c4e6a144a62bb9e Mon Sep 17 00:00:00 2001
From: Justin Ahn <justin@soonahn.ca>
Date: Sat, 5 Sep 2015 00:13:25 -0700
Subject: [PATCH 1/3] changing username by admin

---
 client/views/admin/users/adminUserEdit.coffee            | 3 ++-
 client/views/admin/users/adminUserEdit.html              | 4 ++++
 packages/rocketchat-lib/server/methods/updateUser.coffee | 4 ++++
 3 files changed, 10 insertions(+), 1 deletion(-)

diff --git a/client/views/admin/users/adminUserEdit.coffee b/client/views/admin/users/adminUserEdit.coffee
index 569d7a668307..c14fc4d1e49f 100644
--- a/client/views/admin/users/adminUserEdit.coffee
+++ b/client/views/admin/users/adminUserEdit.coffee
@@ -23,12 +23,13 @@ Template.adminUserEdit.onCreated ->
 	@save = ->
 		userData = { _id: Template.currentData()._id }
 		userData.name = $("#name", ".edit-form").val()
+		userData.username = $("#username", ".edit-form").val()
 
 		unless userData._id and userData.name
 			toastr.error TAPi18next.t 'project:The_field_is_required', TAPi18next.t 'project:Name'
 		else
 			Meteor.call 'updateUser', userData, (error, result) ->
-				if result 
+				if result
 					toastr.success t('User_updated_successfully')
 					instance.cancel()
 				if error
diff --git a/client/views/admin/users/adminUserEdit.html b/client/views/admin/users/adminUserEdit.html
index f74026430b50..d00a9875e0c0 100644
--- a/client/views/admin/users/adminUserEdit.html
+++ b/client/views/admin/users/adminUserEdit.html
@@ -6,6 +6,10 @@ <h3>{{name}}</h3>
 				<label for="name">{{_ "Name"}}</label>
 				<input type="text" id="name" autocomplete="off" value="{{name}}">
 			</div>
+			<div class="input-line">
+				<label for="username">{{_ "Username"}}</label>
+				<input type="text" id="username" autocomplete="off" value="{{username}}">
+			</div>
 		</form>
 	</div>
 	<nav>
diff --git a/packages/rocketchat-lib/server/methods/updateUser.coffee b/packages/rocketchat-lib/server/methods/updateUser.coffee
index adbda89a168b..92af42910c47 100644
--- a/packages/rocketchat-lib/server/methods/updateUser.coffee
+++ b/packages/rocketchat-lib/server/methods/updateUser.coffee
@@ -16,5 +16,9 @@ Meteor.methods
 		unless userData.name
 			throw new Meteor.Error 'name-is-required', 'Name field is required'
 
+		unless userData.username
+			throw new Meteor.Error 'user-name-is-required', 'Username field is required'
+
 		Meteor.users.update { _id: userData._id }, { $set: { name: userData.name } }
+		Meteor.users.update { _id: userData._id }, { $set: { username: userData.username } }
 		return true
\ No newline at end of file

From 70fddc8373d993c4d0a11f2b3da06287febd37a0 Mon Sep 17 00:00:00 2001
From: Justin Ahn <justin@soonahn.ca>
Date: Sat, 5 Sep 2015 10:00:09 -0700
Subject: [PATCH 2/3] one line of changing the username

---
 packages/rocketchat-lib/server/methods/updateUser.coffee | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/methods/updateUser.coffee b/packages/rocketchat-lib/server/methods/updateUser.coffee
index 92af42910c47..f98f5dbb137c 100644
--- a/packages/rocketchat-lib/server/methods/updateUser.coffee
+++ b/packages/rocketchat-lib/server/methods/updateUser.coffee
@@ -1,3 +1,4 @@
+
 Meteor.methods
 	updateUser: (userData) ->
 		if not Meteor.userId()
@@ -19,6 +20,5 @@ Meteor.methods
 		unless userData.username
 			throw new Meteor.Error 'user-name-is-required', 'Username field is required'
 
-		Meteor.users.update { _id: userData._id }, { $set: { name: userData.name } }
-		Meteor.users.update { _id: userData._id }, { $set: { username: userData.username } }
+		Meteor.users.update { _id: userData._id }, { $set: { name: userData.name, username: userData.username } }
 		return true
\ No newline at end of file

From 6fff770046c4846af4bf8bc5e87ec2eec544a81f Mon Sep 17 00:00:00 2001
From: Justin Ahn <justin@soonahn.ca>
Date: Sat, 5 Sep 2015 23:15:36 -0700
Subject: [PATCH 3/3] setting the username via the seUsername method and the
 runAsUser method to ensure it's the correct user

---
 packages/rocketchat-lib/server/methods/updateUser.coffee | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/rocketchat-lib/server/methods/updateUser.coffee b/packages/rocketchat-lib/server/methods/updateUser.coffee
index f98f5dbb137c..981560219a12 100644
--- a/packages/rocketchat-lib/server/methods/updateUser.coffee
+++ b/packages/rocketchat-lib/server/methods/updateUser.coffee
@@ -1,4 +1,3 @@
-
 Meteor.methods
 	updateUser: (userData) ->
 		if not Meteor.userId()
@@ -20,5 +19,9 @@ Meteor.methods
 		unless userData.username
 			throw new Meteor.Error 'user-name-is-required', 'Username field is required'
 
-		Meteor.users.update { _id: userData._id }, { $set: { name: userData.name, username: userData.username } }
+		Meteor.users.update { _id: userData._id }, { $set: { name: userData.name } }
+
+		Meteor.runAsUser userData._id, ->
+			Meteor.call 'setUsername', userData.username
+
 		return true
\ No newline at end of file