Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Override password reset email send when creating user if SMTP not set up #2206

Merged
merged 5 commits into from
Oct 6, 2024
Merged

Override password reset email send when creating user if SMTP not set up #2206

Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1133015
comment out password reset email instructions
jhs-panda Sep 15, 2024
0aff723
Merge branch 'master' into override_smtp
jhs-panda Sep 15, 2024
d385ce4
Catch SMTP Error to flash message if new user email send doesn't work.
jhs-panda Sep 29, 2024
1047d65
Clean up readability of code.
jhs-panda Sep 29, 2024
19a4659
Clarified error message.
jhs-panda Oct 6, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 14 additions & 3 deletions app/controllers/users_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,9 +117,20 @@ def create
save_worked = false
end
if save_worked
@user.send_reset_password_instructions
flash[:success] = "Successfully created user."
redirect_to(users_path) && return
begin
@user.send_reset_password_instructions
flash[:success] = "Successfully created user."
rescue Net::SMTPFatalError
flash[:success] = "Successfully created user but reset password instructions were not sent:
Net::SMTPFatalError"
rescue StandardError => e
error_message = e.message
flash[:error] = "Failed to create user: Incorrectly configured SMTP config:
#{error_message}"
@user.destroy
ensure
redirect_to(users_path)
end
else
render action: "new"
end
Expand Down