monorail
/
mastodon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix e-mail confirmations API not working correctly (#16348) 

* Fix e-mail confirmations API not working correctly

* Fix typo
This commit is contained in:
Eugen Rochko 2021-06-02 21:07:50 +02:00 committed by GitHub
parent 11d3c065a5
commit 1410dffdf4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/api/v1/emails/confirmations_controller.rb
View File

@ -3,12 +3,11 @@
class Api::V1::Emails::ConfirmationsController < Api::BaseController class Api::V1::Emails::ConfirmationsController < Api::BaseController
before_action :doorkeeper_authorize! before_action :doorkeeper_authorize!
before_action :require_user_owned_by_application! before_action :require_user_owned_by_application!
before_action :require_user_not_confirmed!
def create def create
if !current_user.confirmed? && current_user.unconfirmed_email.present? current_user.update!(email: params[:email]) if params.key?(:email)
current_user.update!(email: params[:email]) if params.key?(:email) current_user.resend_confirmation_instructions
current_user.resend_confirmation_instructions
end
render_empty render_empty
end end
@ -18,4 +17,8 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController
def require_user_owned_by_application! def require_user_owned_by_application!
render json: { error: 'This method is only available to the application the user originally signed-up with' }, status: :forbidden unless current_user && current_user.created_by_application_id == doorkeeper_token.application_id render json: { error: 'This method is only available to the application the user originally signed-up with' }, status: :forbidden unless current_user && current_user.created_by_application_id == doorkeeper_token.application_id
end end
def require_user_not_confirmed!
render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden if current_user.confirmed? || current_user.unconfirmed_email.blank?
end
end end