Skip to content

Commit

Permalink
fix: remove user email verification
Browse files Browse the repository at this point in the history
  • Loading branch information
adamcooke committed Mar 4, 2024
1 parent e1bae60 commit e05f0b3
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 36 deletions.
21 changes: 1 addition & 20 deletions app/controllers/user_controller.rb
Original file line number Diff line number Diff line change
Expand Up @@ -67,30 +67,11 @@ def update
return
end

email_changed = @user.email_address_changed?

if @user.save
if email_changed
redirect_to_with_json verify_path(return_to: settings_path),
notice: "Your settings have been updated successfully. As you've changed, your e-mail " \
"address you'll need to verify it before you can continue."
else
redirect_to_with_json settings_path, notice: "Your settings have been updated successfully."
end
redirect_to_with_json settings_path, notice: "Your settings have been updated successfully."
else
render_form_errors "edit", @user
end
end

def verify
return unless request.post?

if params[:code].to_s.strip == current_user.email_verification_token.to_s || (Rails.env.development? && params[:code].to_s.strip == "123456")
current_user.verify!
redirect_to_with_json [:return_to, root_path], notice: "Thanks - your e-mail address has been verified successfully."
else
flash_now :alert, "The code you've entered isn't correct. Please check and try again."
end
end

end
16 changes: 0 additions & 16 deletions app/mailers/app_mailer.rb
Original file line number Diff line number Diff line change
Expand Up @@ -2,22 +2,6 @@

class AppMailer < ApplicationMailer

def verify_email_address(user)
@user = user
mail to: @user.email_address, subject: "Verify your new e-mail address"
end

def new_user(user)
@user = user
mail to: @user.email_address, subject: "Welcome to Postal"
end

def user_invite(user_invite, organization)
@user_invite = user_invite
@organization = organization
mail to: @user_invite.email_address, subject: "Access the #{organization.name} organization on Postal"
end

def verify_domain(domain, email_address, user)
@domain = domain
@email_address = email_address
Expand Down

0 comments on commit e05f0b3

Please sign in to comment.