about summary refs log tree commit diff
path: root/app/controllers/api
diff options
context:
space:
mode:
authorClaire <claire.github-309c@sitedethib.com>2021-03-31 10:34:29 +0200
committerClaire <claire.github-309c@sitedethib.com>2021-03-31 10:34:29 +0200
commit15efa32cca5c2d7dfc32b101a38081add1b3af40 (patch)
tree8b75038d0c2d6a6bc4f8b38de6a13ddc9bedbff0 /app/controllers/api
parenta2a85d5ae03282c6f9cbf452b9b8f7d948a9f380 (diff)
parentf5bcc6bc65dee332542195e807ecff446cea0ae4 (diff)
Merge branch 'main' into glitch-soc/merge-upstream
Diffstat (limited to 'app/controllers/api')
-rw-r--r--app/controllers/api/v1/emails/confirmations_controller.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/app/controllers/api/v1/emails/confirmations_controller.rb b/app/controllers/api/v1/emails/confirmations_controller.rb
index 03ab5de8c..4a7aa9c32 100644
--- 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