Commit 3bab585b authored by James Lopez's avatar James Lopez

update to use emails destroy service

parent ad44af2f
...@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController ...@@ -152,7 +152,7 @@ class Admin::UsersController < Admin::ApplicationController
def remove_email def remove_email
email = user.emails.find(params[:email_id]) email = user.emails.find(params[:email_id])
email.destroy Emails::DestroyService.new(current_user, self, email: email.email).execute
result = Users::UpdateService.new(current_user, @user).execute do |user| result = Users::UpdateService.new(current_user, @user).execute do |user|
user.update_secondary_emails! user.update_secondary_emails!
......
...@@ -18,7 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController ...@@ -18,7 +18,7 @@ class Profiles::EmailsController < Profiles::ApplicationController
def destroy def destroy
@email = current_user.emails.find(params[:id]) @email = current_user.emails.find(params[:id])
@email.destroy Emails::DestroyService.new(self, self, email: @email.email).execute
Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! } Users::UpdateService.new(current_user, current_user).execute { |user| user.update_secondary_emails! }
......
...@@ -494,7 +494,7 @@ class User < ActiveRecord::Base ...@@ -494,7 +494,7 @@ class User < ActiveRecord::Base
def update_emails_with_primary_email def update_emails_with_primary_email
primary_email_record = emails.find_by(email: email) primary_email_record = emails.find_by(email: email)
if primary_email_record if primary_email_record
primary_email_record.destroy Emails::DestroyService.new(self, self, email: email).execute
emails.create(email: email_was) emails.create(email: email_was)
update_secondary_emails! update_secondary_emails!
......
...@@ -3,7 +3,7 @@ module Emails ...@@ -3,7 +3,7 @@ module Emails
def execute(skip_authorization: false) def execute(skip_authorization: false)
raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails? raise Gitlab::Access::AccessDeniedError unless skip_authorization || can_manage_emails?
Email.find_by_email(@email).destroy! Email.find_by_email(@email).destroy
end end
end end
end end
...@@ -276,7 +276,7 @@ module API ...@@ -276,7 +276,7 @@ module API
email = user.emails.find_by(id: params[:email_id]) email = user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email not_found!('Email') unless email
email.destroy Emails::DestroyService.new(current_user, self, email: email.email).execute
::Users::UpdateService.new(current_user, user).execute do |user| ::Users::UpdateService.new(current_user, user).execute do |user|
user.update_secondary_emails! user.update_secondary_emails!
...@@ -510,7 +510,8 @@ module API ...@@ -510,7 +510,8 @@ module API
email = current_user.emails.find_by(id: params[:email_id]) email = current_user.emails.find_by(id: params[:email_id])
not_found!('Email') unless email not_found!('Email') unless email
email.destroy Emails::DestroyService.new(current_user, self, email: email.email).execute
::Users::UpdateService.new(current_user, current_user).execute do |user| ::Users::UpdateService.new(current_user, current_user).execute do |user|
user.update_secondary_emails! user.update_secondary_emails!
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