Merge branch 'main' into glitch-soc/merge-upstream

2021-03-31 10:34:29 +02:00
parent a2a85d5ae0 f5bcc6bc65
commit 15efa32cca
12 changed files with 382 additions and 325 deletions
--- a/app/controllers/api/v1/emails/confirmations_controller.rb
+++ b/app/controllers/api/v1/emails/confirmations_controller.rb
@ -5,7 +5,11 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController
  before_action :require_user_owned_by_application!

  def create
-    current_user.resend_confirmation_instructions if current_user.unconfirmed_email.present?
+    if !current_user.confirmed? && current_user.unconfirmed_email.present?
+      current_user.update!(email: params[:email]) if params.key?(:email)
+      current_user.resend_confirmation_instructions
+    end
+
    render_empty
  end