Escape regexp on checking email availability; change type of input to email

pull/1962/head
Marcelo Schmidt 9 years ago
parent 4fdfcf713d
commit 07141ff9d9
  1. 2
      packages/rocketchat-lib/server/functions/checkEmailAvailability.coffee
  2. 4
      packages/rocketchat-ui-account/account/accountProfile.html
  3. 2
      packages/rocketchat-ui-admin/admin/users/adminUserEdit.html

@ -1,2 +1,2 @@
RocketChat.checkEmailAvailability = (email) -> RocketChat.checkEmailAvailability = (email) ->
return not Meteor.users.findOne({ "emails.address": { $regex : new RegExp("^" + s.trim(email) + "$", "i") } }) return not Meteor.users.findOne({ "emails.address": { $regex : new RegExp("^" + s.trim(s.escapeRegExp(email)) + "$", "i") } })

@ -29,9 +29,9 @@
<label for="email">{{_ "E-mail"}}</label> <label for="email">{{_ "E-mail"}}</label>
<div> <div>
{{#if allowEmailChange}} {{#if allowEmailChange}}
<input type="text" name="email" id="email" placeholder="{{email}}" /> <input type="email" name="email" id="email" placeholder="{{email}}" />
{{else}} {{else}}
<input type="text" name="email" id="email" placeholder="{{email}}" disabled="disabled" title="{{emailChangeDisabled}}" /> <input type="email" name="email" id="email" placeholder="{{email}}" disabled="disabled" title="{{emailChangeDisabled}}" />
{{/if}} {{/if}}
</div> </div>
</div> </div>

@ -15,7 +15,7 @@
</div> </div>
<div class="input-line"> <div class="input-line">
<label for="email">{{_ "E-mail"}}</label> <label for="email">{{_ "E-mail"}}</label>
<input type="text" id="email" autocomplete="off" value="{{email}}"> <input type="email" id="email" autocomplete="off" value="{{email}}">
</div> </div>
{{#if hasPermission 'edit-other-user-password'}} {{#if hasPermission 'edit-other-user-password'}}
<div class="input-line"> <div class="input-line">

Loading…
Cancel
Save