Skip to content

Commit 58c72db

Browse files
committed
Fix bug that prevented admins added messages from emailing to the user. Fixes helpyio#35
1 parent 9063c46 commit 58c72db

File tree

3 files changed

+14
-13
lines changed

3 files changed

+14
-13
lines changed

app/controllers/admin_controller.rb

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -116,15 +116,14 @@ def create_ticket
116116

117117
@user = @topic.build_user
118118

119-
# generate user password
120-
source_characters = "0124356789abcdefghijk"
121-
password = ""
122-
1.upto(8) { password += source_characters[rand(source_characters.length),1] }
119+
@token, enc = Devise.token_generator.generate(User, :reset_password_token)
120+
@user.reset_password_token = enc
121+
@user.reset_password_sent_at = Time.now.utc
123122

124123
@user.name = params[:topic][:user][:name]
125124
@user.login = params[:topic][:user][:email].split("@")[0]
126125
@user.email = params[:topic][:user][:email]
127-
@user.password = password
126+
@user.password = User.create_password
128127

129128
else
130129
@topic.user_id = @user.id
@@ -142,7 +141,7 @@ def create_ticket
142141
:screenshots => params[:topic][:screenshots])
143142

144143
# Send email
145-
UserMailer.new_user(@user).deliver_now
144+
UserMailer.new_user(@user, @token).deliver_now
146145

147146
# track event in GA
148147
@tracker.event(category: 'Request', action: 'Post', label: 'New Topic')

config/settings/test.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
send_email: true
1+
send_email: false
2+
site_name: Helpy Support

lib/email_processor.rb

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -60,18 +60,19 @@ def process
6060
end
6161

6262
def create_user
63-
# generate user password
64-
source_characters = "0124356789abcdefghijk"
65-
password = ""
66-
1.upto(8) { password += source_characters[rand(source_characters.length),1] }
6763

6864
# create user
6965
@user = User.new
66+
67+
@token, enc = Devise.token_generator.generate(User, :reset_password_token)
68+
@user.reset_password_token = enc
69+
@user.reset_password_sent_at = Time.now.utc
70+
7071
@user.email = @email.from[:email]
7172
@user.name = @email.from[:name].blank? ? @email.from[:token] : @email.from[:name]
72-
@user.password = password
73+
@user.password = User.create_password
7374
if @user.save
74-
UserMailer.new_user(@user).deliver_now
75+
UserMailer.new_user(@user, @token).deliver_now
7576
end
7677

7778
end

0 commit comments

Comments
 (0)