FEATURE: redeem Invite when user sign up

This commit is contained in:
Arpit Jalan 2014-07-04 01:36:49 +05:30
parent 0de564f598
commit b301391116
3 changed files with 14 additions and 0 deletions

View File

@ -57,6 +57,8 @@ class EmailToken < ActiveRecord::Base
user.save!
end
end
# redeem invite, if available
Invite.redeem_from_email(user.email)
user
rescue ActiveRecord::RecordInvalid
# If the user's email is already taken, just return nil (failure)

View File

@ -130,6 +130,14 @@ class Invite < ActiveRecord::Base
i
end
def self.redeem_from_email(email)
invite = Invite.find_by(email: Email.downcase(email))
if invite
InviteRedeemer.new(invite).redeem
end
invite
end
def self.base_directory
File.join(Rails.root, "public", "csv", RailsMultisite::ConnectionManagement.current_db)
end

View File

@ -19,6 +19,10 @@ InviteRedeemer = Struct.new(:invite) do
# extracted from User cause it is very specific to invites
def self.create_user_from_invite(invite)
user_exists = User.find_by_email(invite.email)
return user if user_exists
username = UserNameSuggester.suggest(invite.email)
DiscourseHub.username_operation do