FEATURE: phase 1 of supporting multiple email addresses #4977
Conversation
|
You've signed the CLA, tgxworld. Thank you! This pull request is ready for review. |
tgxworld
force-pushed
the
LeoMcA-alternate-emails-phase-1
branch
9 times, most recently
from
1d35b91
to
ba39643
Compare
|
This pull request has been mentioned on Discourse Meta. There might be relevant details there: https://meta.discourse.org/t/additional-email-support/59847/6 |
|
Main ruby tests are passing but our plugin tests are broken. |
app/models/invite.rb
Outdated
| @@ -32,7 +32,7 @@ class UserExists < StandardError; end | |||
| def user_doesnt_already_exist | |||
| @email_already_exists = false | |||
| return if email.blank? | |||
| u = User.find_by("email = ?", Email.downcase(email)) | |||
| u = User.find_by_email(Email.downcase(email)) | |||
There was a problem hiding this comment.
Why are we doing Email.downcase two times ? (multiple instances of this in the commit)
https://github.com/discourse/discourse/blob/master/app/models/user.rb#L235
| @@ -98,11 +98,9 @@ def self.create_invite_by_email(email, invited_by, opts=nil) | |||
| group_ids = opts[:group_ids] | |||
| send_email = opts[:send_email].nil? ? true : opts[:send_email] | |||
| custom_message = opts[:custom_message] | |||
|
|
|||
| lower_email = Email.downcase(email) | |||
There was a problem hiding this comment.
Shouldn’t be needed? (see other comments)
There was a problem hiding this comment.
This is needed for the subsequent queries
app/models/email_token.rb
Outdated
| @@ -71,7 +71,7 @@ def self.confirm(token) | |||
| end | |||
|
|
|||
| if user | |||
| return User.find_by(email: Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present? | |||
| return User.find_by_email(Email.downcase(user.email)) if Invite.redeem_from_email(user.email).present? | |||
There was a problem hiding this comment.
Email.downcase probably not needed here
tgxworld
force-pushed
the
LeoMcA-alternate-emails-phase-1
branch
5 times, most recently
from
3c7f60c
to
e7a5eb7
Compare
tgxworld
force-pushed
the
LeoMcA-alternate-emails-phase-1
branch
from
e7a5eb7
to
d0b027d
Compare
|
This pull request has been mentioned on Discourse Meta. There might be relevant details there: https://meta.discourse.org/t/the-github-linkback-plugin/66081/7 |
No description provided.