more refactoring based on feedback

3 files changed, 2 insertions, 12 deletions

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index 0f8617c08bb..8810f6d8803 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -5,11 +5,5 @@ module Emails
       @user = user
       @email = opts[:email]
     end
-
-    private
-
-    def can_manage_emails?
-      @current_user == @user || @current_user.admin?
-    end
   end
 end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index ea65b82e418..b6491ee9804 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -1,8 +1,6 @@
 module Emails
   class CreateService < ::Emails::BaseService
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
-
+    def execute
       @user.emails.create(email: @email)
     end
   end
diff --git a/app/services/emails/destroy_service.rb b/app/services/emails/destroy_service.rb
index 8150918986c..94e4167d88b 100644
--- a/app/services/emails/destroy_service.rb
+++ b/app/services/emails/destroy_service.rb
@@ -1,8 +1,6 @@
 module Emails
   class DestroyService < ::Emails::BaseService
-    def execute(skip_authorization: false)
-      raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
-
+    def execute
       Email.find_by_email(@email).destroy && update_secondary_emails!
     end