Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
G
gitlab-ce
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
1
Merge Requests
1
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
nexedi
gitlab-ce
Commits
bed49331
Commit
bed49331
authored
Mar 22, 2022
by
Catalin Irimie
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove geo_token_user_authentication feature flag
Changelog: other EE: true
parent
68e27596
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
0 additions
and
21 deletions
+0
-21
config/feature_flags/development/geo_token_user_authentication.yml
...ature_flags/development/geo_token_user_authentication.yml
+0
-8
ee/lib/ee/gitlab/auth/auth_finders.rb
ee/lib/ee/gitlab/auth/auth_finders.rb
+0
-1
ee/spec/lib/ee/gitlab/auth/auth_finders_spec.rb
ee/spec/lib/ee/gitlab/auth/auth_finders_spec.rb
+0
-12
No files found.
config/feature_flags/development/geo_token_user_authentication.yml
deleted
100644 → 0
View file @
68e27596
---
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
ee/lib/ee/gitlab/auth/auth_finders.rb
View file @
bed49331
...
...
@@ -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
...
...
ee/spec/lib/ee/gitlab/auth/auth_finders_spec.rb
View file @
bed49331
...
...
@@ -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
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment