Force lowercase in the name of new rooms

RocketChat · Aug 24, 2015 · 571917c · 571917c
1 parent 901dd39
commit 571917c
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/client/views/app/sideNav/createChannelFlex.coffee b/client/views/app/sideNav/createChannelFlex.coffee
@@ -77,7 +77,7 @@ Template.createChannelFlex.events
 
 	'click .save-channel': (e, instance) ->
 		err = SideNav.validate()
-		name = instance.find('#channel-name').value
+		name = instance.find('#channel-name').value.toLowerCase().trim()
 		instance.roomName.set name
 		if not err
 			Meteor.call 'createChannel', name, instance.selectedUsers.get(), (err, result) ->

diff --git a/client/views/app/sideNav/privateGroupsFlex.coffee b/client/views/app/sideNav/privateGroupsFlex.coffee
@@ -73,7 +73,7 @@ Template.privateGroupsFlex.events
 
 	'click .save-pvt-group': (e, instance) ->
 		err = SideNav.validate()
-		name = instance.find('#pvt-group-name').value
+		name = instance.find('#pvt-group-name').value.toLowerCase().trim()
 		instance.groupName.set name
 		if not err
 			Meteor.call 'createPrivateGroup', name, instance.selectedUsers.get(), (err, result) ->

diff --git a/server/methods/createChannel.coffee b/server/methods/createChannel.coffee
@@ -3,7 +3,7 @@ Meteor.methods
 		if not Meteor.userId()
 			throw new Meteor.Error 'invalid-user', "[methods] createChannel -> Invalid user"
 
-		if not /^[0-9a-z-_]+$/i.test name
+		if not /^[0-9a-z-_]+$/.test name
 			throw new Meteor.Error 'name-invalid'
 
 		console.log '[methods] createChannel -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments

diff --git a/server/methods/createPrivateGroup.coffee b/server/methods/createPrivateGroup.coffee
@@ -5,7 +5,7 @@ Meteor.methods
 
 		console.log '[methods] createPrivateGroup -> '.green, 'userId:', Meteor.userId(), 'arguments:', arguments
 
-		if not /^[0-9a-z-_]+$/i.test name
+		if not /^[0-9a-z-_]+$/.test name
 			throw new Meteor.Error 'name-invalid'
 
 		now = new Date()