Merge pull request #4799 from RocketChat/add-users-to-default-channel…

…-from-api Add users to default channels when using REST API
RocketChat · Oct 31, 2016 · 951e5bc · 951e5bc
2 parents 048a017 + 7c3a445
commit 951e5bc
Showing 1 changed file with 6 additions and 1 deletion.
diff --git a/packages/rocketchat-api/server/routes.coffee b/packages/rocketchat-api/server/routes.coffee
@@ -168,8 +168,13 @@ RocketChat.API.v1.addRoute 'users.create', authRequired: true,
 			if @bodyParams.customFields?
 				RocketChat.saveCustomFields(newUserId, @bodyParams.customFields)
 
+			user = RocketChat.models.Users.findOneById(newUserId)
+
+			if typeof @bodyParams.joinDefaultChannels is 'undefined' or @bodyParams.joinDefaultChannels
+				RocketChat.addUserToDefaultChannels(user)
+
 			return RocketChat.API.v1.success
-				user: RocketChat.models.Users.findOneById(newUserId)
+				user: user
 		catch e
 			return RocketChat.API.v1.failure e.name + ': ' + e.message