Fix POST /api/v1/emails/confirmations not being available after sign-up (#17743)

This commit is contained in:
Eugen Rochko 2022-03-12 04:14:25 +01:00 committed by GitHub
parent 1745b71840
commit bc320d6cec
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 66 additions and 2 deletions

View file

@ -1,7 +1,7 @@
# frozen_string_literal: true # frozen_string_literal: true
class Api::V1::Emails::ConfirmationsController < Api::BaseController class Api::V1::Emails::ConfirmationsController < Api::BaseController
before_action :doorkeeper_authorize! before_action -> { doorkeeper_authorize! :write, :'write:accounts' }
before_action :require_user_owned_by_application! before_action :require_user_owned_by_application!
before_action :require_user_not_confirmed! before_action :require_user_not_confirmed!
@ -19,6 +19,6 @@ class Api::V1::Emails::ConfirmationsController < Api::BaseController
end end
def require_user_not_confirmed! 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? render json: { error: 'This method is only available while the e-mail is awaiting confirmation' }, status: :forbidden unless !current_user.confirmed? || current_user.unconfirmed_email.present?
end end
end end

View file

@ -0,0 +1,64 @@
require 'rails_helper'
RSpec.describe Api::V1::Emails::ConfirmationsController, type: :controller do
let(:confirmed_at) { nil }
let(:user) { Fabricate(:user, confirmed_at: confirmed_at) }
let(:app) { Fabricate(:application) }
let(:token) { Fabricate(:accessible_access_token, resource_owner_id: user.id, scopes: scopes, application: app) }
let(:scopes) { 'write' }
describe '#create' do
context 'with an oauth token' do
before do
allow(controller).to receive(:doorkeeper_token) { token }
end
context 'from a random app' do
it 'returns http forbidden' do
post :create
expect(response).to have_http_status(:forbidden)
end
end
context 'from an app that created the account' do
before do
user.update(created_by_application: token.application)
end
context 'when the account is already confirmed' do
let(:confirmed_at) { Time.now.utc }
it 'returns http forbidden' do
post :create
expect(response).to have_http_status(:forbidden)
end
context 'but user changed e-mail and has not confirmed it' do
before do
user.update(email: 'foo@bar.com')
end
it 'returns http success' do
post :create
expect(response).to have_http_status(:success)
end
end
end
context 'when the account is unconfirmed' do
it 'returns http success' do
post :create
expect(response).to have_http_status(:success)
end
end
end
end
context 'without an oauth token' do
it 'returns http unauthorized' do
post :create
expect(response).to have_http_status(:unauthorized)
end
end
end
end