Reduce remaining diff with EE in app/services

Signed-off-by: Rémy Coutable <remy@rymai.me>

2 files changed, 7 insertions, 7 deletions

diff --git a/app/services/emails/base_service.rb b/app/services/emails/base_service.rb
index 988215ffc78..99324638300 100644
--- a/app/services/emails/base_service.rb
+++ b/app/services/emails/base_service.rb
@@ -2,10 +2,11 @@
 
 module Emails
   class BaseService
-    attr_reader :current_user
+    attr_reader :current_user, :params, :user
 
     def initialize(current_user, params = {})
-      @current_user, @params = current_user, params.dup
+      @current_user = current_user
+      @params = params.dup
       @user = params.delete(:user)
     end
   end
diff --git a/app/services/emails/create_service.rb b/app/services/emails/create_service.rb
index 56925a724fe..dc06a5caa40 100644
--- a/app/services/emails/create_service.rb
+++ b/app/services/emails/create_service.rb
@@ -3,12 +3,11 @@
 module Emails
   class CreateService < ::Emails::BaseService
     def execute(extra_params = {})
-      skip_confirmation = @params.delete(:skip_confirmation)
+      skip_confirmation = params.delete(:skip_confirmation)
 
-      email = @user.emails.create(@params.merge(extra_params))
-
-      email&.confirm if skip_confirmation && current_user.admin?
-      email
+      user.emails.create(params.merge(extra_params)).tap do |email|
+        email&.confirm if skip_confirmation && current_user.admin?
+      end
     end
   end
 end