From d78ff9b017935a6293a45d56321991bef4807470 Mon Sep 17 00:00:00 2001
From: Imre Farkas <ifarkas@gitlab.com>
Date: Fri, 10 Jun 2022 11:02:52 +0200
Subject: [PATCH] Remove require_auth_for_graphql_user_resolver feature flag
Changelog: changed
---
app/graphql/resolvers/user_resolver.rb | 2 --
app/graphql/resolvers/users_resolver.rb | 9 +--------
.../require_auth_for_graphql_user_resolver.yml | 8 --------
spec/graphql/resolvers/user_resolver_spec.rb | 12 ------------
spec/graphql/resolvers/users_resolver_spec.rb | 16 ----------------
5 files changed, 1 insertion(+), 46 deletions(-)
delete mode 100644 config/feature_flags/development/require_auth_for_graphql_user_resolver.yml
diff --git a/app/graphql/resolvers/user_resolver.rb b/app/graphql/resolvers/user_resolver.rb
index d2e8aa514693c..f0fd60e9cbb73 100644
--- a/app/graphql/resolvers/user_resolver.rb
+++ b/app/graphql/resolvers/user_resolver.rb
@@ -45,8 +45,6 @@ def batch_load(username)
end
def authorize!
- return unless Feature.enabled?(:require_auth_for_graphql_user_resolver)
-
raise_resource_not_available_error! unless context[:current_user].present?
end
end
diff --git a/app/graphql/resolvers/users_resolver.rb b/app/graphql/resolvers/users_resolver.rb
index 12555f4e56565..b0d704d09fc4c 100644
--- a/app/graphql/resolvers/users_resolver.rb
+++ b/app/graphql/resolvers/users_resolver.rb
@@ -47,14 +47,7 @@ def ready?(**args)
end
def authorize!(usernames)
- if Feature.enabled?(:require_auth_for_graphql_user_resolver)
- authorized = context[:current_user].present?
- else
- authorized = Ability.allowed?(context[:current_user], :read_users_list)
- authorized &&= usernames.present? if context[:current_user].blank?
- end
-
- raise_resource_not_available_error! unless authorized
+ raise_resource_not_available_error! unless context[:current_user].present?
end
private
diff --git a/config/feature_flags/development/require_auth_for_graphql_user_resolver.yml b/config/feature_flags/development/require_auth_for_graphql_user_resolver.yml
deleted file mode 100644
index 7dd6c7ecd957e..0000000000000
--- a/config/feature_flags/development/require_auth_for_graphql_user_resolver.yml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-name: require_auth_for_graphql_user_resolver
-introduced_by_url: https://gitlab.com/gitlab-org/gitlab/-/merge_requests/88020
-rollout_issue_url: https://gitlab.com/gitlab-org/gitlab/-/issues/362953
-milestone: '15.1'
-type: development
-group: group::authentication and authorization
-default_enabled: false
diff --git a/spec/graphql/resolvers/user_resolver_spec.rb b/spec/graphql/resolvers/user_resolver_spec.rb
index 32a9b1776293a..d57b015b70531 100644
--- a/spec/graphql/resolvers/user_resolver_spec.rb
+++ b/spec/graphql/resolvers/user_resolver_spec.rb
@@ -26,18 +26,6 @@
resolve_user(args)
end
end
-
- context 'require_auth_for_graphql_user_resolver feature flag is disabled' do
- before do
- stub_feature_flags(require_auth_for_graphql_user_resolver: false)
- end
-
- it 'returns the correct user' do
- expect(
- resolve_user(args)
- ).to eq(user)
- end
- end
end
end
diff --git a/spec/graphql/resolvers/users_resolver_spec.rb b/spec/graphql/resolvers/users_resolver_spec.rb
index 5f7a096a14b8c..dda15303676c3 100644
--- a/spec/graphql/resolvers/users_resolver_spec.rb
+++ b/spec/graphql/resolvers/users_resolver_spec.rb
@@ -76,22 +76,6 @@
resolve_users(args: { usernames: [user1.username] })
end
end
-
- context 'require_auth_for_graphql_user_resolver feature flag is disabled' do
- before do
- stub_feature_flags(require_auth_for_graphql_user_resolver: false)
- end
-
- it 'prohibits search without usernames passed' do
- expect_graphql_error_to_be_created(Gitlab::Graphql::Errors::ResourceNotAvailable) do
- resolve_users
- end
- end
-
- it 'allows to search by username' do
- expect(resolve_users(args: { usernames: [user1.username] })).to contain_exactly(user1)
- end
- end
end
end
--
GitLab