Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix e-mail confirmations API not working correctly #16348

Merged
merged 2 commits into from Jun 2, 2021
Merged

Fix e-mail confirmations API not working correctly #16348

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
73a484c
Fix e-mail confirmations API not working correctly
Gargron Jun 1, 2021
b7e65fe
Fix typo
Gargron Jun 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
11 changes: 7 additions & 4 deletions app/controllers/api/v1/emails/confirmations_controller.rb
View file
Open in desktop
Expand Up @@ -3,12 +3,11 @@
class Api::V1::Emails::ConfirmationsController < Api::BaseController
before_action :doorkeeper_authorize!
before_action :require_user_owned_by_application!
before_action :require_user_not_confirmed!

def create
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
current_user.update!(email: params[:email]) if params.key?(:email)
current_user.resend_confirmation_instructions

render_empty
end
Expand All @@ -18,4 +17,8 @@ def create
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
end

def require_user_not_confirmed!
render json: { error: 'Thus method is only available while the e-mail is awaiting confirmation' }, status: :forbidden if current_user.confirmed? || current_user.unconfirmed_email.blank?
Gargron marked this conversation as resolved.
Show resolved Hide resolved
end
end