Commit 86e3a049 authored by Matthias Käppler's avatar Matthias Käppler

Merge branch 'cat-remove-geo-token-auth-ff' into 'master'

Remove geo_token_user_authentication feature flag

See merge request gitlab-org/gitlab!83405
parents 7e21e61f bed49331
---
name: geo_token_user_authentication
introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/79431
rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/351450
milestone: '14.8'
type: development
group: group::geo
default_enabled: true
......@@ -8,7 +8,6 @@ module EE
extend ::Gitlab::Utils::Override
def find_user_from_geo_token
return unless ::Feature.enabled?(:geo_token_user_authentication, default_enabled: :yaml)
return unless geo_api_request?
token = current_request.authorization
......
......@@ -105,17 +105,5 @@ RSpec.describe EE::Gitlab::Auth::AuthFinders do
expect { subject }.to raise_error(::Gitlab::Auth::UnauthorizedError)
end
end
context 'when the geo_token_user_authentication feature flag is disabled' do
before do
stub_feature_flags(geo_token_user_authentication: false)
end
it 'returns immediately' do
expect(::Gitlab::Geo::JwtRequestDecoder).not_to receive(:geo_auth_attempt?)
expect(::Gitlab::Geo::JwtRequestDecoder).not_to receive(:new)
expect(subject).to be_nil
end
end
end
end
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment