مراية لـ
https://github.com/postalserver/postal.git
تم المزامنة 2025-12-01 05:43:04 +00:00
fix: remove user email verification
هذا الالتزام موجود في:
@@ -67,30 +67,11 @@ class UserController < ApplicationController
|
|||||||
return
|
return
|
||||||
end
|
end
|
||||||
|
|
||||||
email_changed = @user.email_address_changed?
|
|
||||||
|
|
||||||
if @user.save
|
if @user.save
|
||||||
if email_changed
|
redirect_to_with_json settings_path, notice: "Your settings have been updated successfully."
|
||||||
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
|
|
||||||
else
|
else
|
||||||
render_form_errors "edit", @user
|
render_form_errors "edit", @user
|
||||||
end
|
end
|
||||||
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
|
end
|
||||||
|
|||||||
@@ -2,22 +2,6 @@
|
|||||||
|
|
||||||
class AppMailer < ApplicationMailer
|
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)
|
def verify_domain(domain, email_address, user)
|
||||||
@domain = domain
|
@domain = domain
|
||||||
@email_address = email_address
|
@email_address = email_address
|
||||||
|
|||||||
المرجع في مشكلة جديدة
حظر مستخدم