Skip to content

Bug: captcha_validation_performed is false even though reCAPTCHA was performed #12142

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

Merged
jmdembe merged 1 commit into from
May 7, 2025
Merged

Bug: captcha_validation_performed is false even though reCAPTCHA was performed #12142

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 6 additions & 2 deletions app/controllers/users/sessions_controller.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,9 +115,13 @@ def recaptcha_assessment_id
end

def recaptcha_form
return @recaptcha_form if defined?(@recaptcha_form)
existing_device = User.find_with_confirmed_email(auth_params[:email])&.devices&.exists?(
cookie_uuid: cookies[:device],
)

@recaptcha_form ||= SignInRecaptchaForm.new(
email: auth_params[:email],
device_cookie: cookies[:device],
existing_device: existing_device,
ab_test_bucket: ab_test_bucket(:RECAPTCHA_SIGN_IN, user: user_from_params),
**recaptcha_form_args,
)
Expand Down
16 changes: 6 additions & 10 deletions app/forms/sign_in_recaptcha_form.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,20 +5,20 @@ class SignInRecaptchaForm

RECAPTCHA_ACTION = 'sign_in'

attr_reader :form_class, :form_args, :email, :recaptcha_token, :device_cookie, :ab_test_bucket,
attr_reader :form_class, :form_args, :recaptcha_token, :ab_test_bucket,
:assessment_id

attr_writer :existing_device

validate :validate_recaptcha_result

def initialize(
email:,
device_cookie:,
existing_device:,
ab_test_bucket:,
form_class: RecaptchaForm,
**form_args
)
@email = email
@device_cookie = device_cookie
@existing_device = existing_device
@ab_test_bucket = ab_test_bucket
@form_class = form_class
@form_args = form_args
Expand All @@ -34,7 +34,7 @@ def submit(recaptcha_token:)
def exempt?
IdentityConfig.store.sign_in_recaptcha_score_threshold.zero? ||
ab_test_bucket != :sign_in_recaptcha ||
device.present?
@existing_device
end

private
Expand All @@ -44,10 +44,6 @@ def validate_recaptcha_result
errors.merge!(recaptcha_form) if !recaptcha_response.success?
end

def device
User.find_with_confirmed_email(email)&.devices&.find_by(cookie_uuid: device_cookie)
end

def score_threshold
if exempt?
0.0
Expand Down
17 changes: 5 additions & 12 deletions spec/forms/sign_in_recaptcha_form_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,15 +5,13 @@
let(:user) { create(:user, :with_authenticated_device) }
let(:score_threshold_config) { 0.2 }
let(:analytics) { FakeAnalytics.new }
let(:email) { user.email }
let(:existing_device) { false }
let(:ab_test_bucket) { :sign_in_recaptcha }
let(:recaptcha_token) { 'token' }
let(:device_cookie) { Random.hex }
let(:score) { 1.0 }
subject(:form) do
described_class.new(
email:,
device_cookie:,
existing_device:,
ab_test_bucket:,
form_class: RecaptchaMockForm,
analytics:,
Expand Down Expand Up @@ -45,8 +43,7 @@
context 'with custom recaptcha form class' do
subject(:form) do
described_class.new(
email:,
device_cookie:,
existing_device:,
ab_test_bucket:,
analytics:,
form_class: RecaptchaForm,
Expand Down Expand Up @@ -74,8 +71,6 @@
let(:ab_test_bucket) { nil }

it { is_expected.to eq(true) }

it { expect(queries_database?).to eq(false) }
end

context 'score threshold configured at zero' do
Expand All @@ -87,11 +82,9 @@
end

context 'existing device for user' do
let(:device_cookie) { user.devices.first.cookie_uuid }
let(:existing_device) { true }

it { is_expected.to eq(true) }

it { expect(queries_database?).to eq(true) }
end

def queries_database?
Expand All @@ -108,7 +101,7 @@ def queries_database?
let(:score) { 0.0 }

context 'existing device for user' do
let(:device_cookie) { user.devices.first.cookie_uuid }
let(:existing_device) { true }

it 'is successful' do
expect(response.to_h).to eq(success: true)
Expand Down